Test CFE constants in side-effects test

johnniwinther · commit-bot@chromium.org · commit b614253cdbb0 · 2019-08-09T07:11:52.000Z
Change-Id: I720a4e1b574a19aebb93dfab17a372f987f2cb71 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/99153 Commit-Queue: Johnni Winther <johnniwinther@google.com> Reviewed-by: Sigmund Cherem <sigmund@google.com>
diff --git a/pkg/compiler/lib/src/ir/visitors.dart b/pkg/compiler/lib/src/ir/visitors.dart
@@ -36,6 +36,15 @@ class Stringifier extends ir.ExpressionVisitor<String> {
     }
     return sb.toString();
   }
+
+  @override
+  String visitConstantExpression(ir.ConstantExpression node) {
+    ir.Constant constant = node.constant;
+    if (constant is ir.StringConstant) {
+      return constant.value;
+    }
+    return null;
+  }
 }
 
 /// Visitor that converts a kernel constant expression into a
diff --git a/tests/compiler/dart2js/inference/side_effects/foreign.dart b/tests/compiler/dart2js/inference/side_effects/foreign.dart
@@ -29,12 +29,20 @@ jsBuiltin_rawRtiToJsConstructorName() {
   return JS_BUILTIN('String', JsBuiltin.rawRtiToJsConstructorName, null);
 }
 
-/*member: jsEmbeddedGlobal_getTypeFromName:SideEffects(reads static; writes nothing)*/
+/*strong.member: jsEmbeddedGlobal_getTypeFromName:SideEffects(reads static; writes nothing)*/
+/*omit.member: jsEmbeddedGlobal_getTypeFromName:SideEffects(reads static; writes nothing)*/
+// With CFE constant we no longer get the noise from the static get if GET_TYPE_FROM_NAME.
+/*strongConst.member: jsEmbeddedGlobal_getTypeFromName:SideEffects(reads nothing; writes nothing)*/
+/*omitConst.member: jsEmbeddedGlobal_getTypeFromName:SideEffects(reads nothing; writes nothing)*/
 jsEmbeddedGlobal_getTypeFromName() {
   return JS_EMBEDDED_GLOBAL('', GET_TYPE_FROM_NAME);
 }
 
-/*member: jsEmbeddedGlobal_libraries:SideEffects(reads static; writes nothing)*/
+/*strong.member: jsEmbeddedGlobal_libraries:SideEffects(reads static; writes nothing)*/
+/*omit.member: jsEmbeddedGlobal_libraries:SideEffects(reads static; writes nothing)*/
+// With CFE constant we no longer get the noise from the static get if LIBRARIES.
+/*strongConst.member: jsEmbeddedGlobal_libraries:SideEffects(reads nothing; writes nothing)*/
+/*omitConst.member: jsEmbeddedGlobal_libraries:SideEffects(reads nothing; writes nothing)*/
 jsEmbeddedGlobal_libraries() {
   return JS_EMBEDDED_GLOBAL('JSExtendableArray|Null', LIBRARIES);
 }
diff --git a/tests/compiler/dart2js/inference/side_effects_test.dart b/tests/compiler/dart2js/inference/side_effects_test.dart
@@ -21,7 +21,9 @@ main(List<String> args) {
     Directory dataDir =
         new Directory.fromUri(Platform.script.resolve('side_effects'));
     await checkTests(dataDir, const SideEffectsDataComputer(),
-        args: args, options: [stopAfterTypeInference]);
+        args: args,
+        options: [stopAfterTypeInference],
+        testedConfigs: allInternalConfigs);
   });
 }
 

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,15 @@ class Stringifier extends ir.ExpressionVisitor<String> {`
`36`	`36`	`}`
`37`	`37`	`return sb.toString();`
`38`	`38`	`}`
	`39`	`+`
	`40`	`+ @override`
	`41`	`+ String visitConstantExpression(ir.ConstantExpression node) {`
	`42`	`+ ir.Constant constant = node.constant;`
	`43`	`+ if (constant is ir.StringConstant) {`
	`44`	`+ return constant.value;`
	`45`	`+ }`
	`46`	`+ return null;`
	`47`	`+ }`
`39`	`48`	`}`
`40`	`49`
`41`	`50`	`/// Visitor that converts a kernel constant expression into a`