Bug 665934 - fix bug: arev was meant instead of amap - r=upstream
authorBenoit Jacob <bjacob@mozilla.com>
Mon, 27 Jun 2011 13:27:04 -0400
changeset 71833 51e18435b793dc3ee54965fcf2c7688409b1e52f
parent 71832 9aeebeda6b0568540416f0c81b378f57a0d71754
child 71834 a5c8bd58f92630b332756036b7df242548945e7f
push id20617
push userbjacob@mozilla.com
push dateMon, 27 Jun 2011 17:28:28 +0000
treeherdermozilla-central@baa619406bea [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersupstream
bugs665934
milestone7.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 665934 - fix bug: arev was meant instead of amap - r=upstream This patch has been taken in ANGLE upstream as r699.
gfx/angle/README.mozilla
gfx/angle/angle-amap-arev-fix.patch
gfx/angle/src/compiler/preprocessor/atom.c
--- a/gfx/angle/README.mozilla
+++ b/gfx/angle/README.mozilla
@@ -3,16 +3,17 @@ This is the ANGLE project, from http://c
 Current revision: r653
 
 == Applied local patches ==
 
 In this order:
   angle-nspr-misc.patch - don't bother with ANGLE_OS detection with NSPR
   angle-renaming.patch - rename debug.h to compilerdebug.h to avoid conflict in our makefiles
   angle-intrinsic-msvc2005.patch - work around a MSVC 2005 compile error
+  angle-amap-arev-fix.patch - plain bug fix, this is ANGLE r699
 
 In addition to these patches, the Makefile.in files are ours, they're not present in upsteam ANGLE.
 
 == How to update this ANGLE copy ==
 
 1. Unapply patches
 2. Apply diff with new ANGLE version
 3. Reapply patches.
new file mode 100644
--- /dev/null
+++ b/gfx/angle/angle-amap-arev-fix.patch
@@ -0,0 +1,28 @@
+# HG changeset patch
+# Parent c88f8e8921fb6399cf95b5899d2acc60951dddd1
+Bug 665934 - fix bug: arev was meant instead of amap - r=upstream
+
+This patch has been taken in ANGLE upstream as r699.
+
+diff --git a/gfx/angle/src/compiler/preprocessor/atom.c b/gfx/angle/src/compiler/preprocessor/atom.c
+--- a/gfx/angle/src/compiler/preprocessor/atom.c
++++ b/gfx/angle/src/compiler/preprocessor/atom.c
+@@ -330,17 +330,17 @@ static int GrowAtomTable(AtomTable *atab
+             newrev = malloc(sizeof(int)*size);
+             atable->size = 0;
+         }
+         if (!newmap || !newrev) {
+             /* failed to grow -- error */
+             if (newmap)
+                 atable->amap = newmap;
+             if (newrev)
+-                atable->amap = newrev;
++                atable->arev = newrev;
+             return -1;
+         }
+         memset(&newmap[atable->size], 0, (size - atable->size) * sizeof(int));
+         memset(&newrev[atable->size], 0, (size - atable->size) * sizeof(int));
+         atable->amap = newmap;
+         atable->arev = newrev;
+         atable->size = size;
+     }
--- a/gfx/angle/src/compiler/preprocessor/atom.c
+++ b/gfx/angle/src/compiler/preprocessor/atom.c
@@ -330,17 +330,17 @@ static int GrowAtomTable(AtomTable *atab
             newrev = malloc(sizeof(int)*size);
             atable->size = 0;
         }
         if (!newmap || !newrev) {
             /* failed to grow -- error */
             if (newmap)
                 atable->amap = newmap;
             if (newrev)
-                atable->amap = newrev;
+                atable->arev = newrev;
             return -1;
         }
         memset(&newmap[atable->size], 0, (size - atable->size) * sizeof(int));
         memset(&newrev[atable->size], 0, (size - atable->size) * sizeof(int));
         atable->amap = newmap;
         atable->arev = newrev;
         atable->size = size;
     }