Bug 864216 - Only create IonScriptCounts for asm.js code if rt->profilingScripts, r=luke.
authorBrian Hackett <bhackett1024@gmail.com>
Thu, 25 Apr 2013 18:18:29 -0600
changeset 140959 2239dc1af0109a28e722c373d2a4252552fe57fa
parent 140958 944a223513c52518240e344f9e1e38f0c76ee391
child 140960 ccdc2beb09ae5908a209c11d19f85279307279c1
push id2579
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 18:52:47 +0000
treeherdermozilla-beta@b69b7de8a05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersluke
bugs864216
milestone23.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 864216 - Only create IonScriptCounts for asm.js code if rt->profilingScripts, r=luke.
js/src/ion/CodeGenerator.cpp
--- a/js/src/ion/CodeGenerator.cpp
+++ b/js/src/ion/CodeGenerator.cpp
@@ -2079,16 +2079,18 @@ CodeGenerator::maybeCreateScriptCounts()
     IonScriptCounts *counts = NULL;
 
     CompileInfo *outerInfo = &gen->info();
     RawScript script = outerInfo->script();
 
     if (cx->runtime->profilingScripts) {
         if (script && !script->hasScriptCounts && !script->initScriptCounts(cx))
             return NULL;
+    } else if (!script) {
+        return NULL;
     }
 
     if (script && !script->hasScriptCounts)
         return NULL;
 
     counts = js_new<IonScriptCounts>();
     if (!counts || !counts->init(graph.numBlocks())) {
         js_delete(counts);