svn commit: r431842 - in branches/2017Q1/lang: spidermonkey170 spidermonkey170/files spidermonkey24 spidermonkey24/files

[Jan Beich]

Author: jbeich
Date: Thu Jan 19 05:12:03 2017
New Revision: 431842
URL: https://svnweb.freebsd.org/changeset/ports/431842

Log:
  MFH: r431335
  
  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)

Added:
  branches/2017Q1/lang/spidermonkey170/files/patch-bug1012971
     - copied unchanged from r431335, head/lang/spidermonkey170/files/patch-bug1012971
  branches/2017Q1/lang/spidermonkey24/files/patch-bug1012971
     - copied unchanged from r431335, head/lang/spidermonkey24/files/patch-bug1012971
Modified:
  branches/2017Q1/lang/spidermonkey170/Makefile
  branches/2017Q1/lang/spidermonkey24/Makefile
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/lang/spidermonkey170/Makefile
==============================================================================
--- branches/2017Q1/lang/spidermonkey170/Makefile	Thu Jan 19 05:09:48 2017	(r431841)
+++ branches/2017Q1/lang/spidermonkey170/Makefile	Thu Jan 19 05:12:03 2017	(r431842)
@@ -3,7 +3,7 @@
 
 PORTNAME=		spidermonkey170
 PORTVERSION=		17.0.0
-PORTREVISION=		3
+PORTREVISION=		4
 CATEGORIES=		lang
 MASTER_SITES=		MOZILLA/js
 DISTNAME=		mozjs${PORTVERSION}

Copied: branches/2017Q1/lang/spidermonkey170/files/patch-bug1012971 (from r431335, head/lang/spidermonkey170/files/patch-bug1012971)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q1/lang/spidermonkey170/files/patch-bug1012971	Thu Jan 19 05:12:03 2017	(r431842, copy of r431335, head/lang/spidermonkey170/files/patch-bug1012971)
@@ -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: branches/2017Q1/lang/spidermonkey24/Makefile
==============================================================================
--- branches/2017Q1/lang/spidermonkey24/Makefile	Thu Jan 19 05:09:48 2017	(r431841)
+++ branches/2017Q1/lang/spidermonkey24/Makefile	Thu Jan 19 05:12:03 2017	(r431842)
@@ -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/

Copied: branches/2017Q1/lang/spidermonkey24/files/patch-bug1012971 (from r431335, head/lang/spidermonkey24/files/patch-bug1012971)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q1/lang/spidermonkey24/files/patch-bug1012971	Thu Jan 19 05:12:03 2017	(r431842, copy of r431335, head/lang/spidermonkey24/files/patch-bug1012971)
@@ -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 *