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

Unified Diff: sdk/lib/_internal/compiler/implementation/ssa/nodes.dart

Issue 614993002: Rename Constant to ConstantValue and ConstExp to ConstantExpression. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Updated cf. comments. Created 6 years, 3 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
Index: sdk/lib/_internal/compiler/implementation/ssa/nodes.dart
diff --git a/sdk/lib/_internal/compiler/implementation/ssa/nodes.dart b/sdk/lib/_internal/compiler/implementation/ssa/nodes.dart
index ec6c70b5121221a1d89de45aa3245382368a34f7..172de7f17e2bb924dcbfc1a308a685c003c47405 100644
--- a/sdk/lib/_internal/compiler/implementation/ssa/nodes.dart
+++ b/sdk/lib/_internal/compiler/implementation/ssa/nodes.dart
@@ -138,11 +138,11 @@ class HGraph {
// We canonicalize all constants used within a graph so we do not
// have to worry about them for global value numbering.
- Map<Constant, HConstant> constants;
+ Map<ConstantValue, HConstant> constants;
HGraph()
: blocks = new List<HBasicBlock>(),
- constants = new Map<Constant, HConstant>() {
+ constants = new Map<ConstantValue, HConstant>() {
entry = addNewBlock();
// The exit block will be added later, so it has an id that is
// after all others in the system.
@@ -170,7 +170,7 @@ class HGraph {
return result;
}
- HConstant addConstant(Constant constant, Compiler compiler) {
+ HConstant addConstant(ConstantValue constant, Compiler compiler) {
HConstant result = constants[constant];
if (result == null) {
TypeMask type = constant.computeMask(compiler);
@@ -184,9 +184,9 @@ class HGraph {
return result;
}
- HConstant addDeferredConstant(Constant constant, PrefixElement prefix,
+ HConstant addDeferredConstant(ConstantValue constant, PrefixElement prefix,
Compiler compiler) {
- Constant wrapper = new DeferredConstant(constant, prefix);
+ ConstantValue wrapper = new DeferredConstantValue(constant, prefix);
compiler.deferredLoadTask.registerConstantDeferredUse(wrapper, prefix);
return addConstant(wrapper, compiler);
}
@@ -2027,7 +2027,7 @@ class HLoopBranch extends HConditionalBranch {
}
class HConstant extends HInstruction {
- final Constant constant;
+ final ConstantValue constant;
HConstant.internal(this.constant, TypeMask constantType)
: super(<HInstruction>[], constantType);

Powered by Google App Engine
This is Rietveld 408576698