diff options
| author | jbeich <jbeich@FreeBSD.org> | 2017-01-13 01:42:45 +0000 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2017-01-13 01:42:45 +0000 |
| commit | 2a174fbe33ede553b00cb5d8a1c96551d2daa92c (patch) | |
| tree | 0465df4db50585728474c555726391c6a3c74f04 | |
| parent | 90fc46007caaa688bc0365e51d5457fcab8d5f38 (diff) | |
| download | FreeBSD-ports-2a174fbe33ede553b00cb5d8a1c96551d2daa92c.zip FreeBSD-ports-2a174fbe33ede553b00cb5d8a1c96551d2daa92c.tar.gz | |
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)
| -rw-r--r-- | lang/spidermonkey170/Makefile | 2 | ||||
| -rw-r--r-- | lang/spidermonkey170/files/patch-bug1012971 | 32 | ||||
| -rw-r--r-- | lang/spidermonkey24/Makefile | 2 | ||||
| -rw-r--r-- | lang/spidermonkey24/files/patch-bug1012971 | 32 |
4 files changed, 66 insertions, 2 deletions
diff --git a/lang/spidermonkey170/Makefile b/lang/spidermonkey170/Makefile index 904e35e..aad5bf4 100644 --- a/lang/spidermonkey170/Makefile +++ b/lang/spidermonkey170/Makefile @@ -3,7 +3,7 @@ PORTNAME= spidermonkey170 PORTVERSION= 17.0.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang MASTER_SITES= MOZILLA/js DISTNAME= mozjs${PORTVERSION} diff --git a/lang/spidermonkey170/files/patch-bug1012971 b/lang/spidermonkey170/files/patch-bug1012971 new file mode 100644 index 0000000..10dae0e --- /dev/null +++ b/lang/spidermonkey170/files/patch-bug1012971 @@ -0,0 +1,32 @@ +commit ad6d8397a05a +Author: Dan Gohman <sunfish@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 * diff --git a/lang/spidermonkey24/Makefile b/lang/spidermonkey24/Makefile index 228d91c..c78bd75 100644 --- a/lang/spidermonkey24/Makefile +++ b/lang/spidermonkey24/Makefile @@ -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/ diff --git a/lang/spidermonkey24/files/patch-bug1012971 b/lang/spidermonkey24/files/patch-bug1012971 new file mode 100644 index 0000000..10dae0e --- /dev/null +++ b/lang/spidermonkey24/files/patch-bug1012971 @@ -0,0 +1,32 @@ +commit ad6d8397a05a +Author: Dan Gohman <sunfish@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 * |
