cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r431335

Browse Source 
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
Approved by:	ports-secteam (junovitch)
This commit is contained in:
Jan Beich 2017-01-19 05:12:03 +00:00
parent 254d9fa1f3
commit 01ce712d67
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2017Q1/; revision=431842
4 changed files with 66 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lang/spidermonkey170/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= spidermonkey170
PORTVERSION= 17.0.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= lang
MASTER_SITES= MOZILLA/js
DISTNAME= mozjs${PORTVERSION}

32
lang/spidermonkey170/files/patch-bug1012971 Normal file
View File

@ -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 *

2
lang/spidermonkey24/Makefile
View File

@ -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/

32
lang/spidermonkey24/files/patch-bug1012971 Normal file
View File

@ -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 *