Handle more constants in Constantifier

tests/compiler/dart2js/kernel/impact_test.dart

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library dart2js.kernel.impact_test;
 
 import 'package:async_helper/async_helper.dart';
 import 'package:compiler/src/commandline_options.dart';
 import 'package:compiler/src/common.dart';
 import 'package:compiler/src/common/names.dart';
@@ skipping 38 matching lines @@
   testTrue();
   testFalse();
   testInt();
   testDouble();
   testString();
   testStringInterpolation();
   testStringInterpolationConst();
   testStringJuxtaposition();
   testSymbol();
   testConstSymbol();
+  testComplexConstSymbol();
   testTypeLiteral();
   testBoolFromEnvironment();
   testEmptyListLiteral();
   testEmptyListLiteralDynamic();
   testEmptyListLiteralTyped();
   testEmptyListLiteralConstant();
   testNonEmptyListLiteral();
   testEmptyMapLiteral();
   testEmptyMapLiteralDynamic();
   testEmptyMapLiteralTyped();
@@ skipping 141 matching lines @@
 testInt() => 42;
 testDouble() => 37.5;
 testString() => 'foo';
 testStringInterpolation() => '${0}';
 testStringInterpolationConst() {
   const b = '${0}';
 }
 testStringJuxtaposition() => 'a' 'b';
 testSymbol() => #main;
 testConstSymbol() => const Symbol('main');
+
+const complexSymbolField1 = "true".length == 4;
+const complexSymbolField2 = "true" "false" "${4}${null}";
+const complexSymbolField3 = const { 
+  0.1: const bool.fromEnvironment('a', defaultValue: true),
+  false: const int.fromEnvironment('b', defaultValue: 42),
+  const <int>[]: const String.fromEnvironment('c'),
+  testComplexConstSymbol: #testComplexConstSymbol,
+  1 + 2: identical(0, -0), 
+  true || false: false && true,
+  override: const GenericClass<int, String>.generative(),
+}; 
+const complexSymbolField = 
+    complexSymbolField1 ? complexSymbolField2 : complexSymbolField3;
+testComplexConstSymbol() => const Symbol(complexSymbolField);
+
 testTypeLiteral() => Object;
 testBoolFromEnvironment() => const bool.fromEnvironment('FOO');
 testEmptyListLiteral() => [];
 testEmptyListLiteralDynamic() => <dynamic>[];
 testEmptyListLiteralTyped() => <String>[];
 testEmptyListLiteralConstant() => const [];
 testNonEmptyListLiteral() => [0];
 testEmptyMapLiteral() => {};
 testEmptyMapLiteralDynamic() => <dynamic, dynamic>{};
 testEmptyMapLiteralTyped() => <String, int>{};
@@ skipping 487 matching lines @@
         memorySourceFiles: SOURCE,
         options: [
           fullTest ? Flags.analyzeAll : Flags.analyzeOnly,
           Flags.useKernel,
           Flags.enableAssertMessage
         ]);
     compiler.resolution.retainCachesForTesting = true;
     Expect.isTrue(await compiler.run(entryPoint));
     JavaScriptBackend backend = compiler.backend;
     KernelToElementMap kernelElementMap =
-        new KernelToElementMap(compiler.reporter);
+        new KernelToElementMap(compiler.reporter, compiler.environment);
     kernelElementMap.addProgram(backend.kernelTask.program);
 
     checkLibrary(compiler, kernelElementMap, compiler.mainApp,
         fullTest: fullTest);
     compiler.libraryLoader.libraries.forEach((LibraryElement library) {
       if (library == compiler.mainApp) return;
       checkLibrary(compiler, kernelElementMap, library, fullTest: fullTest);
     });
   });
 }
@@ skipping 183 matching lines @@
         visitList(type.optionalParameterTypes),
         type.namedParameters,
         visitList(type.namedParameterTypes));
   }
 }
 
 /// Perform unaliasing of all typedefs nested within a [ResolutionDartType].
 ResolutionDartType unalias(ResolutionDartType type) {
   return const Unaliaser().visit(type);
 }