[hotfix] Only report allocations if the reporter is active

timfel · timfel · commit be1f8b7336a8 · 2018-10-11T00:54:50.000-07:00
PullRequest: graalpython/221
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java
@@ -167,7 +167,7 @@ private ContextReference<PythonContext> getContextRef() {
     }
 
     private boolean reportAllocations() {
-        return getContextRef() != null && allocationReporter != null;
+        return getContextRef() != null && allocationReporter != null && allocationReporter.isActive();
     }
 
     /*
diff --git a/mx.graalpython/mx_graalpython.py b/mx.graalpython/mx_graalpython.py
@@ -420,7 +420,7 @@ def graalpython_gate_runner(args, tasks):
             apprepo = os.environ["GRAALPYTHON_APPTESTS_REPO_URL"]
             _apptest_suite = _suite.import_suite(
                 "graalpython-apptests",
-                version="f40fcf3af008d30a67e0dbc325a0d90f1e68f0c0",
+                version="006db2cfd79a51ba49e23a42629da13a54b87451",
                 urlinfos=[mx.SuiteImportURLInfo(mx_urlrewrites.rewriteurl(apprepo), "git", mx.vc_system("git"))]
             )
             mx.run_mx(["-p", _apptest_suite.dir, "graalpython-apptests"])

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ private ContextReference<PythonContext> getContextRef() {`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`private boolean reportAllocations() {`
`170`		`- return getContextRef() != null && allocationReporter != null;`
	`170`	`+ return getContextRef() != null && allocationReporter != null && allocationReporter.isActive();`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -420,7 +420,7 @@ def graalpython_gate_runner(args, tasks):`
`420`	`420`	`apprepo = os.environ["GRAALPYTHON_APPTESTS_REPO_URL"]`
`421`	`421`	`_apptest_suite = _suite.import_suite(`
`422`	`422`	`"graalpython-apptests",`
`423`		`- version="f40fcf3af008d30a67e0dbc325a0d90f1e68f0c0",`
	`423`	`+ version="006db2cfd79a51ba49e23a42629da13a54b87451",`
`424`	`424`	`urlinfos=[mx.SuiteImportURLInfo(mx_urlrewrites.rewriteurl(apprepo), "git", mx.vc_system("git"))]`
`425`	`425`	`)`
`426`	`426`	`mx.run_mx(["-p", _apptest_suite.dir, "graalpython-apptests"])`