Merge magic: IGNORE BAD COMMIT MESSAGES
authorDavid Anderson <danderson@mozilla.com>
Tue, 11 Sep 2012 10:33:00 -0700
changeset 113089 fdfaef738a00c5808782864cd991494d53eaf680
parent 113088 ca3fa3fbe62ad72fa7db075d9d93843c959d6725
child 113137 d50bf1edaabed0cde4b4c458118c3fb26fdca549
child 118875 90de3522fe2405a8ba24cb2e0b445b0494e177bb
push id1708
push userakeybl@mozilla.com
push dateMon, 19 Nov 2012 21:10:21 +0000
treeherdermozilla-beta@27b14fe50103 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone18.0a1
first release with
nightly linux32
fdfaef738a00 / 18.0a1 / 20120911140351 / files
nightly linux64
fdfaef738a00 / 18.0a1 / 20120911140351 / files
nightly mac
fdfaef738a00 / 18.0a1 / 20120911140351 / files
nightly win32
fdfaef738a00 / 18.0a1 / 20120911140351 / files
nightly win64
fdfaef738a00 / 18.0a1 / 20120911140351 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge magic: IGNORE BAD COMMIT MESSAGES
js/src/ion/Ion.cpp
--- a/js/src/ion/Ion.cpp
+++ b/js/src/ion/Ion.cpp
@@ -880,17 +880,17 @@ class AutoDestroyAllocator
 
     ~AutoDestroyAllocator()
     {
         if (alloc)
             js_delete(alloc);
     }
 };
 
-/* static */ bool
+bool
 TestCompiler(IonBuilder *builder, MIRGraph *graph, AutoDestroyAllocator &autoDestroy)
 {
     JS_ASSERT(!builder->script->ion);
     JSContext *cx = GetIonContext()->cx;
 
     IonSpewNewFunction(graph, builder->script);
 
     if (!builder->build())