svn commit: r431335 - in head/lang: spidermonkey170 spidermonkey170/files spidermonkey24 spidermonkey24/files
Jan Beich
jbeich at FreeBSD.org
Fri Jan 13 01:42:47 UTC 2017
Author: jbeich
Date: Fri Jan 13 01:42:45 2017
New Revision: 431335
URL: https://svnweb.freebsd.org/changeset/ports/431335
Log:
lang/spidermonkey170: unbreak with clang 4.0
Fix quoting failure handling in JSOP_CALLPROP and JSOP_STRING.
jsopcode.cpp:6070:45: error: ordered comparison between pointer and zero ('char *' and 'int')
return QuoteString(&sprinter, s, quote) >= 0;
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~
PR: 215861
Regressed by: https://github.com/llvm-mirror/clang/commit/4b6ad14285f3
Obtained from: upstream (only the specific fix)
Approved by: portmgr blanket
MFH: 2017Q1 (changes existing behavior)
Added:
head/lang/spidermonkey170/files/patch-bug1012971 (contents, props changed)
head/lang/spidermonkey24/files/patch-bug1012971 (contents, props changed)
Modified:
head/lang/spidermonkey170/Makefile (contents, props changed)
head/lang/spidermonkey24/Makefile (contents, props changed)
Modified: head/lang/spidermonkey170/Makefile
==============================================================================
--- head/lang/spidermonkey170/Makefile Fri Jan 13 01:30:27 2017 (r431334)
+++ head/lang/spidermonkey170/Makefile Fri Jan 13 01:42:45 2017 (r431335)
@@ -3,7 +3,7 @@
PORTNAME= spidermonkey170
PORTVERSION= 17.0.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= lang
MASTER_SITES= MOZILLA/js
DISTNAME= mozjs${PORTVERSION}
Added: head/lang/spidermonkey170/files/patch-bug1012971
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/spidermonkey170/files/patch-bug1012971 Fri Jan 13 01:42:45 2017 (r431335)
@@ -0,0 +1,32 @@
+commit ad6d8397a05a
+Author: Dan Gohman <sunfish at mozilla.com>
+Date: Thu May 22 11:15:06 2014 -0700
+
+ Bug 1012971 - SpiderMonkey: Fix various warnings. r=nbp
+---
+ js/public/RootingAPI.h | 4 +++-
+ js/src/configure.in | 1 +
+ js/src/jit/IonFrames.h | 17 ++++++++---------
+ js/src/jit/MIR.h | 12 +++++-------
+ js/src/jit/PerfSpewer.cpp | 12 ++++++------
+ js/src/jit/RegisterSets.h | 2 +-
+ js/src/jscntxt.h | 2 +-
+ js/src/jsgcinlines.h | 4 ++--
+ js/src/jsopcode.cpp | 2 +-
+ js/src/jsscript.cpp | 6 +++---
+ js/src/shell/js.cpp | 2 +-
+ js/src/vm/ArrayBufferObject.h | 16 ++++++++--------
+ js/src/vm/TypedArrayObject.cpp | 26 +++++++++++++-------------
+ 13 files changed, 53 insertions(+), 53 deletions(-)
+
+--- jsopcode.cpp.orig 2013-02-11 22:33:23 UTC
++++ jsopcode.cpp
+@@ -6067,7 +6067,7 @@ ExpressionDecompiler::write(JSString *s)
+ bool
+ ExpressionDecompiler::quote(JSString *s, uint32_t quote)
+ {
+- return QuoteString(&sprinter, s, quote) >= 0;
++ return QuoteString(&sprinter, s, quote) != NULL;
+ }
+
+ JSAtom *
Modified: head/lang/spidermonkey24/Makefile
==============================================================================
--- head/lang/spidermonkey24/Makefile Fri Jan 13 01:30:27 2017 (r431334)
+++ head/lang/spidermonkey24/Makefile Fri Jan 13 01:42:45 2017 (r431335)
@@ -3,7 +3,7 @@
PORTNAME= spidermonkey24
PORTVERSION= 24.2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= lang
MASTER_SITES= MOZILLA/js
#http://people.mozilla.org/~sstangl/
Added: head/lang/spidermonkey24/files/patch-bug1012971
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/spidermonkey24/files/patch-bug1012971 Fri Jan 13 01:42:45 2017 (r431335)
@@ -0,0 +1,32 @@
+commit ad6d8397a05a
+Author: Dan Gohman <sunfish at mozilla.com>
+Date: Thu May 22 11:15:06 2014 -0700
+
+ Bug 1012971 - SpiderMonkey: Fix various warnings. r=nbp
+---
+ js/public/RootingAPI.h | 4 +++-
+ js/src/configure.in | 1 +
+ js/src/jit/IonFrames.h | 17 ++++++++---------
+ js/src/jit/MIR.h | 12 +++++-------
+ js/src/jit/PerfSpewer.cpp | 12 ++++++------
+ js/src/jit/RegisterSets.h | 2 +-
+ js/src/jscntxt.h | 2 +-
+ js/src/jsgcinlines.h | 4 ++--
+ js/src/jsopcode.cpp | 2 +-
+ js/src/jsscript.cpp | 6 +++---
+ js/src/shell/js.cpp | 2 +-
+ js/src/vm/ArrayBufferObject.h | 16 ++++++++--------
+ js/src/vm/TypedArrayObject.cpp | 26 +++++++++++++-------------
+ 13 files changed, 53 insertions(+), 53 deletions(-)
+
+--- jsopcode.cpp.orig 2013-02-11 22:33:23 UTC
++++ jsopcode.cpp
+@@ -6067,7 +6067,7 @@ ExpressionDecompiler::write(JSString *s)
+ bool
+ ExpressionDecompiler::quote(JSString *s, uint32_t quote)
+ {
+- return QuoteString(&sprinter, s, quote) >= 0;
++ return QuoteString(&sprinter, s, quote) != NULL;
+ }
+
+ JSAtom *
More information about the svn-ports-head
mailing list