GNOME.org
 

[gnome-continuous] patches/mozjs38-*: convert patches to git format

commit d72fe81d5d21c4a0fc4a1acb125d51bf3fc10e77
Author: Javier Jardón <jjardon gnome org>
Date:   Wed Feb 15 21:06:04 2017 +0000

    patches/mozjs38-*: convert patches to git format

 patches/mozjs38-1269317.patch            |   28 +++++--
 patches/mozjs38-fix-tracelogger.patch    |  129 ++++++++++++++----------------
 patches/mozjs38-pkg-config-version.patch |   19 ++++-
 patches/mozjs38-release-number.patch     |   21 +++++-
 patches/mozjs38-shell-version.patch      |   49 +++++++-----
 5 files changed, 145 insertions(+), 101 deletions(-)
---
diff --git a/patches/mozjs38-1269317.patch b/patches/mozjs38-1269317.patch
index a3a57d5..94b91ed 100644
--- a/patches/mozjs38-1269317.patch
+++ b/patches/mozjs38-1269317.patch
@@ -1,5 +1,16 @@
---- a/js/src/jit/RegisterSets.h        2017-02-10 17:33:06.210702431 -0800
-+++ b/js/src/jit/RegisterSets.h        2017-02-10 17:43:52.877514146 -0800
+From 077a238b003963f1b7ab0e393be9b58af44a469e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon gnome org>
+Date: Wed, 15 Feb 2017 20:48:32 +0000
+Subject: [PATCH 1/5] mozjs38-1269317
+
+---
+ js/src/jit/RegisterSets.h | 53 ++++++++++++++---------------------------------
+ 1 file changed, 16 insertions(+), 37 deletions(-)
+
+diff --git a/js/src/jit/RegisterSets.h b/js/src/jit/RegisterSets.h
+index 70c57cd9..fc5d5130 100644
+--- a/js/src/jit/RegisterSets.h
++++ b/js/src/jit/RegisterSets.h
 @@ -7,7 +7,6 @@
  #ifndef jit_RegisterSets_h
  #define jit_RegisterSets_h
@@ -8,7 +19,7 @@
  #include "mozilla/MathAlgorithms.h"
  
  #include "jit/JitAllocPolicy.h"
-@@ -26,8 +25,8 @@
+@@ -26,8 +25,8 @@ struct AnyRegister {
      Code code_;
  
    public:
@@ -19,7 +30,7 @@
      explicit AnyRegister(Register gpr) {
          code_ = gpr.code();
      }
-@@ -156,7 +155,7 @@
+@@ -156,7 +155,7 @@ class ValueOperand
      }
  #endif
  
@@ -28,7 +39,7 @@
  };
  
  // Registers to hold either either a typed or untyped value.
-@@ -165,46 +164,25 @@
+@@ -165,46 +164,25 @@ class TypedOrValueRegister
      // Type of value being stored.
      MIRType type_;
  
@@ -80,7 +91,7 @@
      }
  
      MIRType type() const {
-@@ -220,11 +198,13 @@
+@@ -220,11 +198,13 @@ class TypedOrValueRegister
      }
  
      AnyRegister typedReg() const {
@@ -96,7 +107,7 @@
      }
  
      AnyRegister scratchReg() {
-@@ -240,19 +220,18 @@
+@@ -240,19 +220,18 @@ class ConstantOrRegister
      // Whether a constant value is being stored.
      bool constant_;
  
@@ -120,3 +131,6 @@
      }
  
    public:
+-- 
+2.11.1
+
diff --git a/patches/mozjs38-fix-tracelogger.patch b/patches/mozjs38-fix-tracelogger.patch
index 6798d24..0450c01 100644
--- a/patches/mozjs38-fix-tracelogger.patch
+++ b/patches/mozjs38-fix-tracelogger.patch
@@ -1,68 +1,56 @@
-# === Fix the SM38 tracelogger ===
-# This patch is a squashed version of several patches that were adapted
-# to fix failing hunks.
-#
-# Applied in the following order, they are:
-# * https://bugzilla.mozilla.org/show_bug.cgi?id=1223767
-#    Assertion failure: i < size_, at js/src/vm/TraceLoggingTypes.h:210 
-#    Also fix stop-information to make reduce.py work correctly.
-# * https://bugzilla.mozilla.org/show_bug.cgi?id=1227914
-#    Limit the memory tracelogger can take.
-#    This causes tracelogger to flush data to the disk regularly and prevents out of 
-#    memory issues if a lot of data gets logged.
-# * https://bugzilla.mozilla.org/show_bug.cgi?id=1155618
-#    Fix tracelogger destructor that touches possibly uninitialised hash table.
-# * https://bugzilla.mozilla.org/show_bug.cgi?id=1223636
-#    Don't treat extraTextId as containing only extra ids.
-#    This fixes an assertion failure: id == nextTextId at js/src/vm/TraceLoggingGraph.cpp
-# * https://bugzilla.mozilla.org/show_bug.cgi?id=1227028
-#    Fix when to keep the payload of a TraceLogger event.
-#    This fixes an assertion failure: textId < uint32_t(1 << 31) at js/src/vm/TraceLoggingGraph.h
-# * https://bugzilla.mozilla.org/show_bug.cgi?id=1266649
-#    Handle failing to add to pointermap gracefully.
-# * https://bugzilla.mozilla.org/show_bug.cgi?id=1280648
-#    Don't cache based on pointers to movable GC things.
-# * https://bugzilla.mozilla.org/show_bug.cgi?id=1224123
-#    Fix the use of LastEntryId in tracelogger.h.
-# * https://bugzilla.mozilla.org/show_bug.cgi?id=1231170
-#    Use size in debugger instead of the current id to track last logged item.
-# * https://bugzilla.mozilla.org/show_bug.cgi?id=1221844
-#    Move TraceLogger_Invalidation to LOG_ITEM.
-#    Add some debug checks to logTimestamp.
-# * https://bugzilla.mozilla.org/show_bug.cgi?id=1255766
-#    Also mark resizing of memory.
-# * https://bugzilla.mozilla.org/show_bug.cgi?id=1259403
-#    Only increase capacity by multiples of 2.
-#    Always make sure there are 3 free slots for events.
-# ===
+From 65eac5441770ac1f0ac143e39aea5c7db0c46f1f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon gnome org>
+Date: Wed, 15 Feb 2017 20:49:01 +0000
+Subject: [PATCH 2/5] mozjs38-fix-tracelogger
+
+=== Fix the SM38 tracelogger ===
+This patch is a squashed version of several patches that were adapted
+to fix failing hunks.
+
+Applied in the following order, they are:
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=1223767
+   Assertion failure: i < size_, at js/src/vm/TraceLoggingTypes.h:210
+   Also fix stop-information to make reduce.py work correctly.
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=1227914
+   Limit the memory tracelogger can take.
+   This causes tracelogger to flush data to the disk regularly and prevents out of
+   memory issues if a lot of data gets logged.
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=1155618
+   Fix tracelogger destructor that touches possibly uninitialised hash table.
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=1223636
+   Don't treat extraTextId as containing only extra ids.
+   This fixes an assertion failure: id == nextTextId at js/src/vm/TraceLoggingGraph.cpp
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=1227028
+   Fix when to keep the payload of a TraceLogger event.
+   This fixes an assertion failure: textId < uint32_t(1 << 31) at js/src/vm/TraceLoggingGraph.h
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=1266649
+   Handle failing to add to pointermap gracefully.
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=1280648
+   Don't cache based on pointers to movable GC things.
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=1224123
+   Fix the use of LastEntryId in tracelogger.h.
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=1231170
+   Use size in debugger instead of the current id to track last logged item.
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=1221844
+   Move TraceLogger_Invalidation to LOG_ITEM.
+   Add some debug checks to logTimestamp.
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=1255766
+   Also mark resizing of memory.
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=1259403
+   Only increase capacity by multiples of 2.
+   Always make sure there are 3 free slots for events.
+---
+ js/src/jit/Ion.cpp              |   2 +
+ js/src/vm/Debugger.cpp          |  12 ++--
+ js/src/vm/Debugger.h            |   4 +-
+ js/src/vm/TraceLogging.cpp      | 135 ++++++++++++++++++++++++++++------------
+ js/src/vm/TraceLogging.h        |  38 ++++++-----
+ js/src/vm/TraceLoggingGraph.cpp |   4 +-
+ js/src/vm/TraceLoggingTypes.h   |  18 ++++--
+ 7 files changed, 145 insertions(+), 68 deletions(-)
 
-diff --git a/js/src/jit-test/tests/tracelogger/bug1231170.js 
b/js/src/jit-test/tests/tracelogger/bug1231170.js
-new file mode 100644
-index 0000000..023e93e
---- /dev/null
-+++ b/js/src/jit-test/tests/tracelogger/bug1231170.js
-@@ -0,0 +1,3 @@
-+var du = new Debugger();
-+if (typeof du.drainTraceLogger === "function")
-+    du.drainTraceLogger();
-diff --git a/js/src/jit-test/tests/tracelogger/bug1266649.js 
b/js/src/jit-test/tests/tracelogger/bug1266649.js
-new file mode 100644
-index 0000000..81ae7ad
---- /dev/null
-+++ b/js/src/jit-test/tests/tracelogger/bug1266649.js
-@@ -0,0 +1,10 @@
-+
-+var du = new Debugger();
-+if (typeof du.setupTraceLogger === "function" &&
-+    typeof oomTest === 'function')
-+{
-+    du.setupTraceLogger({
-+        Scripts: true
-+    })
-+    oomTest(() => function(){});
-+}
 diff --git a/js/src/jit/Ion.cpp b/js/src/jit/Ion.cpp
-index 93e2fda..09049d6 100644
+index 93e2fda3..09049d68 100644
 --- a/js/src/jit/Ion.cpp
 +++ b/js/src/jit/Ion.cpp
 @@ -1055,6 +1055,8 @@ IonScript::Destroy(FreeOp* fop, IonScript* script)
@@ -75,7 +63,7 @@ index 93e2fda..09049d6 100644
  }
  
 diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
-index 26262fd..af7f313 100644
+index 26262fd4..af7f313c 100644
 --- a/js/src/vm/Debugger.cpp
 +++ b/js/src/vm/Debugger.cpp
 @@ -369,10 +369,10 @@ Debugger::Debugger(JSContext* cx, NativeObject* dbg)
@@ -117,7 +105,7 @@ index 26262fd..af7f313 100644
  
      RootedObject array(cx, NewDenseEmptyArray(cx));
 diff --git a/js/src/vm/Debugger.h b/js/src/vm/Debugger.h
-index 8cac36a..c92d685 100644
+index 8cac36ae..c92d6854 100644
 --- a/js/src/vm/Debugger.h
 +++ b/js/src/vm/Debugger.h
 @@ -314,10 +314,10 @@ class Debugger : private mozilla::LinkedListElement<Debugger>
@@ -134,7 +122,7 @@ index 8cac36a..c92d685 100644
  
      class FrameRange;
 diff --git a/js/src/vm/TraceLogging.cpp b/js/src/vm/TraceLogging.cpp
-index 6715b36..9766a6f 100644
+index 6715b369..9766a6fa 100644
 --- a/js/src/vm/TraceLogging.cpp
 +++ b/js/src/vm/TraceLogging.cpp
 @@ -131,7 +131,7 @@ TraceLoggerThread::init()
@@ -417,7 +405,7 @@ index 6715b36..9766a6f 100644
 +    return *this;
 +}
 diff --git a/js/src/vm/TraceLogging.h b/js/src/vm/TraceLogging.h
-index a124dcb..91a1eb0 100644
+index a124dcb2..91a1eb0f 100644
 --- a/js/src/vm/TraceLogging.h
 +++ b/js/src/vm/TraceLogging.h
 @@ -110,6 +110,9 @@ class TraceLoggerEvent {
@@ -521,7 +509,7 @@ index a124dcb..91a1eb0 100644
    public:
      static unsigned offsetOfEnabled() {
 diff --git a/js/src/vm/TraceLoggingGraph.cpp b/js/src/vm/TraceLoggingGraph.cpp
-index d1b7f2e..a4eb273 100644
+index d1b7f2e5..a4eb273b 100644
 --- a/js/src/vm/TraceLoggingGraph.cpp
 +++ b/js/src/vm/TraceLoggingGraph.cpp
 @@ -276,7 +276,7 @@ TraceLoggerGraph::flush()
@@ -543,7 +531,7 @@ index d1b7f2e..a4eb273 100644
          if (!updateHasChildren(parent.treeId()))
              return false;
 diff --git a/js/src/vm/TraceLoggingTypes.h b/js/src/vm/TraceLoggingTypes.h
-index f1c9d0c..10b76d6 100644
+index f1c9d0cc..10b76d6f 100644
 --- a/js/src/vm/TraceLoggingTypes.h
 +++ b/js/src/vm/TraceLoggingTypes.h
 @@ -21,7 +21,6 @@
@@ -601,3 +589,6 @@ index f1c9d0c..10b76d6 100644
          if (!entries)
              return false;
  
+-- 
+2.11.1
+
diff --git a/patches/mozjs38-pkg-config-version.patch b/patches/mozjs38-pkg-config-version.patch
index 34a43d1..e561c9c 100644
--- a/patches/mozjs38-pkg-config-version.patch
+++ b/patches/mozjs38-pkg-config-version.patch
@@ -1,15 +1,23 @@
+From c2dd89db98773fa12f1071216f5ca5390701ff00 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon gnome org>
+Date: Wed, 15 Feb 2017 20:56:24 +0000
+Subject: [PATCH 5/5] mozjs38-pkg-config-version
+
 Add major version to pkg-config filename.
 Author: Rico Tzschichholz <ricotz ubuntu com>
 Forwarded: no
 Last-Update: 2015-05-04
+---
+ js/src/Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: b/js/src/Makefile.in
-===================================================================
+diff --git a/js/src/Makefile.in b/js/src/Makefile.in
+index fad5f0fc..60fb2c3c 100644
 --- a/js/src/Makefile.in
 +++ b/js/src/Makefile.in
-@@ -214,10 +214,10 @@
+@@ -211,10 +211,10 @@ SDK_BINARY = $(JS_CONFIG_NAME)
  $(JS_CONFIG_NAME): js-config
-    cp $^ $@
+       cp $^ $@
  
 -$(LIBRARY_NAME).pc: js.pc
 +$(JS_LIBRARY_NAME).pc: js.pc
@@ -20,3 +28,6 @@ Index: b/js/src/Makefile.in
        $(SYSINSTALL) $^ $(DESTDIR)$(libdir)/pkgconfig
  
  install:: js-config.h
+-- 
+2.11.1
+
diff --git a/patches/mozjs38-release-number.patch b/patches/mozjs38-release-number.patch
index 7202e62..e01c37b 100644
--- a/patches/mozjs38-release-number.patch
+++ b/patches/mozjs38-release-number.patch
@@ -1,6 +1,18 @@
+From 1f069d17b7ab72738580d3f43cb5e979a5ef250c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon gnome org>
+Date: Wed, 15 Feb 2017 20:54:19 +0000
+Subject: [PATCH 3/5] mozjs38-release-number
+
+---
+ js/src/configure    | 6 +++---
+ js/src/configure.in | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/js/src/configure b/js/src/configure
+index cce5430c..b266bc16 100755
 --- a/js/src/configure
 +++ b/js/src/configure
-@@ -1662,9 +1662,9 @@
+@@ -1662,9 +1662,9 @@ esac
  
  fi
  
@@ -13,9 +25,11 @@
  
  cat >> confdefs.pytmp <<EOF
      (''' MOZILLA_VERSION ''', r''' "$MOZILLA_VERSION" ''')
+diff --git a/js/src/configure.in b/js/src/configure.in
+index 82ef78a6..534d2cea 100644
 --- a/js/src/configure.in
 +++ b/js/src/configure.in
-@@ -236,9 +236,9 @@
+@@ -236,9 +236,9 @@ fi
  dnl ==============================================================
  dnl Get mozilla version from central milestone file
  dnl ==============================================================
@@ -28,3 +42,6 @@
  
  AC_DEFINE_UNQUOTED(MOZILLA_VERSION,"$MOZILLA_VERSION")
  AC_DEFINE_UNQUOTED(MOZILLA_VERSION_U,$MOZILLA_VERSION)
+-- 
+2.11.1
+
diff --git a/patches/mozjs38-shell-version.patch b/patches/mozjs38-shell-version.patch
index cc6b3d3..99253f2 100644
--- a/patches/mozjs38-shell-version.patch
+++ b/patches/mozjs38-shell-version.patch
@@ -1,15 +1,37 @@
-# HG changeset patch
-# Parent 4732a0e5d22bc7e5c1f1ace7a182d537d9cc2c6a
+From fe06b3cb62788eb0a0607276c54444f49b346d76 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon gnome org>
+Date: Wed, 15 Feb 2017 20:55:37 +0000
+Subject: [PATCH 4/5] mozjs38-shell-version
+
 Add major version to shell and js-config filenames.
 Author: Rico Tzschichholz <ricotz ubuntu com>
 Forwarded: no
 Last-Update: 2014-10-29
-
 ---
+ js/src/Makefile.in  |  3 +++
+ js/src/configure    |  5 +++++
+ js/src/configure.in | 13 +++++--------
+ 3 files changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/js/src/Makefile.in b/js/src/Makefile.in
+index 92469a67..fad5f0fc 100644
+--- a/js/src/Makefile.in
++++ b/js/src/Makefile.in
+@@ -208,6 +208,9 @@ endif
+ SCRIPTS = $(JS_CONFIG_NAME)
+ SDK_BINARY = $(JS_CONFIG_NAME)
+ 
++$(JS_CONFIG_NAME): js-config
++      cp $^ $@
++
+ $(LIBRARY_NAME).pc: js.pc
+       cp $^ $@
+ 
 diff --git a/js/src/configure b/js/src/configure
+index b266bc16..685bcdc1 100755
 --- a/js/src/configure
 +++ b/js/src/configure
-@@ -1696,8 +1696,13 @@
+@@ -1696,8 +1696,13 @@ MOZJS_MINOR_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.\([0-9]*\).*|\1|"`
  MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"`
  IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'`
  
@@ -23,11 +45,11 @@ diff --git a/js/src/configure b/js/src/configure
  
  
  if test -n "$IS_ALPHA"; then
-
 diff --git a/js/src/configure.in b/js/src/configure.in
+index 534d2cea..a10bc77d 100644
 --- a/js/src/configure.in
 +++ b/js/src/configure.in
-@@ -234,16 +234,13 @@ MOZJS_MINOR_VERSION=`echo $MOZILLA_VERSI
+@@ -252,16 +252,13 @@ MOZJS_MINOR_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.\([0-9]*\).*|\1|"`
  MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"`
  IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'`
  
@@ -49,17 +71,6 @@ diff --git a/js/src/configure.in b/js/src/configure.in
  
  changequote([,])
  if test -n "$IS_ALPHA"; then
+-- 
+2.11.1
 
-diff -r 80a9e64d75f5 js/src/Makefile.in
---- a/js/src/Makefile.in        Wed Jun 25 15:11:42 2014 +0200
-+++ b/js/src/Makefile.in        Sat Jul 05 14:08:38 2014 +0200
-@@ -273,6 +273,9 @@
- SCRIPTS = $(JS_CONFIG_NAME)
- SDK_BINARY = $(JS_CONFIG_NAME)
- 
-+$(JS_CONFIG_NAME): js-config
-+      cp $^ $@
-+
- $(LIBRARY_NAME).pc: js.pc
-       cp $^ $@
-
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]