From owner-svn-ports-all@freebsd.org Sat Apr 2 15:51:20 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3B534AEB0B6; Sat, 2 Apr 2016 15:51:20 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 16CAD1C4A; Sat, 2 Apr 2016 15:51:20 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u32FpJsJ039993; Sat, 2 Apr 2016 15:51:19 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u32FpJBe039990; Sat, 2 Apr 2016 15:51:19 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201604021551.u32FpJBe039990@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 2 Apr 2016 15:51:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412412 - head/www/node/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Apr 2016 15:51:20 -0000 Author: dim (src committer) Date: Sat Apr 2 15:51:18 2016 New Revision: 412412 URL: https://svnweb.freebsd.org/changeset/ports/412412 Log: During the exp-run in bug 208158, it was found that www/node gives errors with libc++ 3.8.0 [1]: /usr/include/c++/v1/map:837:5: error: static_assert failed "Allocator::value_type must be same type as value_type" static_assert((is_same::value), ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../deps/v8/src/compiler/js-type-feedback.h:41:21: note: in instantiation of template class 'std::__1::map, v8::internal::zone_allocator >' requested here TypeFeedbackIdMap type_feedback_id_map_; ^ This is because libc++ 3.8.0 has added these sanity checks for custom std::map allocators, which *must* be of the type std::pair. I fixed the few std::map instances in the node source by adding this to their allocator types. Approved by: linpct@gmail.com (maintainer) PR: 208270 MFH: 2016Q2 Added: head/www/node/files/patch-deps_v8_src_compiler_instruction.h (contents, props changed) head/www/node/files/patch-deps_v8_src_compiler_js-type-feedback.h (contents, props changed) head/www/node/files/patch-deps_v8_src_zone-containers.h (contents, props changed) Added: head/www/node/files/patch-deps_v8_src_compiler_instruction.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/node/files/patch-deps_v8_src_compiler_instruction.h Sat Apr 2 15:51:18 2016 (r412412) @@ -0,0 +1,11 @@ +--- deps/v8/src/compiler/instruction.h.orig 2016-03-16 21:22:58.000000000 +0100 ++++ deps/v8/src/compiler/instruction.h 2016-03-24 23:27:23.004854000 +0100 +@@ -1011,7 +1011,7 @@ class InstructionBlock final : public Zo + + typedef ZoneDeque ConstantDeque; + typedef std::map, +- zone_allocator > > ConstantMap; ++ zone_allocator > > ConstantMap; + + typedef ZoneDeque InstructionDeque; + typedef ZoneDeque ReferenceMapDeque; Added: head/www/node/files/patch-deps_v8_src_compiler_js-type-feedback.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/node/files/patch-deps_v8_src_compiler_js-type-feedback.h Sat Apr 2 15:51:18 2016 (r412412) @@ -0,0 +1,15 @@ +--- deps/v8/src/compiler/js-type-feedback.h.orig 2016-03-16 21:22:58.000000000 +0100 ++++ deps/v8/src/compiler/js-type-feedback.h 2016-03-24 22:54:54.529827000 +0100 +@@ -33,9 +33,10 @@ class JSTypeFeedbackTable : public ZoneO + private: + friend class JSTypeFeedbackSpecializer; + typedef std::map, +- zone_allocator > TypeFeedbackIdMap; ++ zone_allocator > > ++ TypeFeedbackIdMap; + typedef std::map, +- zone_allocator > ++ zone_allocator > > + FeedbackVectorICSlotMap; + + TypeFeedbackIdMap type_feedback_id_map_; Added: head/www/node/files/patch-deps_v8_src_zone-containers.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/node/files/patch-deps_v8_src_zone-containers.h Sat Apr 2 15:51:18 2016 (r412412) @@ -0,0 +1,18 @@ +--- deps/v8/src/zone-containers.h.orig 2016-03-16 21:22:58.000000000 +0100 ++++ deps/v8/src/zone-containers.h 2016-03-24 23:34:37.741885000 +0100 +@@ -114,12 +114,12 @@ class ZoneSet : public std::set> + class ZoneMap +- : public std::map>> { ++ : public std::map>> { + public: + // Constructs an empty map. + explicit ZoneMap(Zone* zone) +- : std::map>>( +- Compare(), zone_allocator>(zone)) {} ++ : std::map>>( ++ Compare(), zone_allocator>(zone)) {} + }; + +