Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2676)

Unified Diff: pkg/compiler/lib/src/ssa/builder_kernel.dart

Issue 2864363002: Remove DartString from constants. (Closed)
Patch Set: Remove toDartString Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pkg/compiler/lib/src/ssa/builder.dart ('k') | pkg/compiler/lib/src/ssa/kernel_impact.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/compiler/lib/src/ssa/builder_kernel.dart
diff --git a/pkg/compiler/lib/src/ssa/builder_kernel.dart b/pkg/compiler/lib/src/ssa/builder_kernel.dart
index c2c992bc7c1bfece35cf0e74eb0d279491c414cd..56a5073736769301b591a9a81c58577ce6766845 100644
--- a/pkg/compiler/lib/src/ssa/builder_kernel.dart
+++ b/pkg/compiler/lib/src/ssa/builder_kernel.dart
@@ -25,7 +25,6 @@ import '../js_backend/backend.dart' show JavaScriptBackend;
import '../kernel/kernel.dart';
import '../native/native.dart' as native;
import '../resolution/tree_elements.dart';
-import '../tree/dartstring.dart';
import '../tree/nodes.dart' show Node;
import '../types/masks.dart';
import '../universe/selector.dart';
@@ -709,8 +708,7 @@ class KernelSsaBuilder extends ir.Visitor with GraphBuilder {
void _trap(String message) {
HInstruction nullValue = graph.addConstantNull(closedWorld);
- HInstruction errorMessage =
- graph.addConstantString(new DartString.literal(message), closedWorld);
+ HInstruction errorMessage = graph.addConstantString(message, closedWorld);
HInstruction trap = new HForeignCode(js.js.parseForeignJS("#.#"),
commonMasks.dynamicType, <HInstruction>[nullValue, errorMessage]);
trap.sideEffects
@@ -752,12 +750,11 @@ class KernelSsaBuilder extends ir.Visitor with GraphBuilder {
@override
void visitCheckLibraryIsLoaded(ir.CheckLibraryIsLoaded checkLoad) {
- HInstruction prefixConstant = graph.addConstantString(
- new DartString.literal(checkLoad.import.name), closedWorld);
+ HInstruction prefixConstant =
+ graph.addConstantString(checkLoad.import.name, closedWorld);
var prefixElement = astAdapter.getElement(checkLoad.import);
HInstruction uriConstant = graph.addConstantString(
- new DartString.literal(prefixElement.deferredImport.uri.toString()),
- closedWorld);
+ prefixElement.deferredImport.uri.toString(), closedWorld);
_pushStaticInvocation(astAdapter.checkDeferredIsLoaded,
[prefixConstant, uriConstant], astAdapter.checkDeferredIsLoadedType);
}
@@ -767,10 +764,7 @@ class KernelSsaBuilder extends ir.Visitor with GraphBuilder {
// TODO(efortuna): Source information!
push(new HInvokeStatic(
commonElements.loadLibraryWrapper,
- [
- graph.addConstantString(
- new DartString.literal(loadLibrary.import.name), closedWorld)
- ],
+ [graph.addConstantString(loadLibrary.import.name, closedWorld)],
commonMasks.nonNullType,
targetCanThrow: false));
}
@@ -1345,8 +1339,7 @@ class KernelSsaBuilder extends ir.Visitor with GraphBuilder {
void generateError(
ir.Node node, ir.Procedure procedure, String message, TypeMask typeMask) {
- HInstruction errorMessage =
- graph.addConstantString(new DartString.literal(message), closedWorld);
+ HInstruction errorMessage = graph.addConstantString(message, closedWorld);
// TODO(sra): Associate source info from [node].
_pushStaticInvocation(procedure, [errorMessage], typeMask);
}
@@ -1835,8 +1828,7 @@ class KernelSsaBuilder extends ir.Visitor with GraphBuilder {
@override
void visitStringLiteral(ir.StringLiteral stringLiteral) {
- stack.add(graph.addConstantString(
- new DartString.literal(stringLiteral.value), closedWorld));
+ stack.add(graph.addConstantString(stringLiteral.value, closedWorld));
}
@override
@@ -2383,7 +2375,7 @@ class KernelSsaBuilder extends ir.Visitor with GraphBuilder {
HConstant hConstant = instruction;
StringConstantValue stringConstant = hConstant.constant;
- return stringConstant.primitiveValue.slowToString();
+ return stringConstant.primitiveValue;
}
void handleForeignJsCurrentIsolateContext(ir.StaticInvocation invocation) {
@@ -2889,8 +2881,7 @@ class KernelSsaBuilder extends ir.Visitor with GraphBuilder {
registry?.registerDynamicUse(new DynamicUse(selector, null));
}
- ConstantValue nameConstant =
- constantSystem.createString(new DartString.literal(publicName));
+ ConstantValue nameConstant = constantSystem.createString(publicName);
js.Name internalName = namer.invocationName(selector);
@@ -2901,7 +2892,7 @@ class KernelSsaBuilder extends ir.Visitor with GraphBuilder {
var argumentNames = new List<HInstruction>();
for (String argumentName in selector.namedArguments) {
ConstantValue argumentNameConstant =
- constantSystem.createString(new DartString.literal(argumentName));
+ constantSystem.createString(argumentName);
argumentNames.add(graph.addConstant(argumentNameConstant, closedWorld));
}
var argumentNamesInstruction =
« no previous file with comments | « pkg/compiler/lib/src/ssa/builder.dart ('k') | pkg/compiler/lib/src/ssa/kernel_impact.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698