summaryrefslogtreecommitdiff
path: root/src/compiler/codegen/RallocUtil.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/compiler/codegen/RallocUtil.cc')
-rw-r--r--src/compiler/codegen/RallocUtil.cc39
1 files changed, 0 insertions, 39 deletions
diff --git a/src/compiler/codegen/RallocUtil.cc b/src/compiler/codegen/RallocUtil.cc
index 76cff17648..8295b33f4a 100644
--- a/src/compiler/codegen/RallocUtil.cc
+++ b/src/compiler/codegen/RallocUtil.cc
@@ -1004,38 +1004,15 @@ extern RegLocation oatEvalLoc(CompilationUnit* cUnit, RegLocation loc,
return loc;
}
-/*
- * There's currently a problem in SSA renaming. So long as register promotion
- * is disabled, a bad renaming will have no effect. Work around the problem
- * here to make progress while the fix is being identified.
- */
-#define SSA_WORKAROUND
-
extern RegLocation oatGetDest(CompilationUnit* cUnit, MIR* mir, int num)
{
RegLocation res = cUnit->regLocation[mir->ssaRep->defs[num]];
-#ifdef SSA_WORKAROUND
- if (res.wide) {
- LOG(WARNING) << "Invalid SSA renaming: " << PrettyMethod(cUnit->method);
- cUnit->printMe = true;
- cUnit->dumpCFG = true;
- res.wide = false;
- }
-#endif
assert(!res.wide);
return res;
}
extern RegLocation oatGetSrc(CompilationUnit* cUnit, MIR* mir, int num)
{
RegLocation res = cUnit->regLocation[mir->ssaRep->uses[num]];
-#ifdef SSA_WORKAROUND
- if (res.wide) {
- LOG(WARNING) << "Invalid SSA renaming: " << PrettyMethod(cUnit->method);
- cUnit->printMe = true;
- cUnit->dumpCFG = true;
- res.wide = false;
- }
-#endif
assert(!res.wide);
return res;
}
@@ -1048,14 +1025,6 @@ extern RegLocation oatGetDestWide(CompilationUnit* cUnit, MIR* mir,
int low, int high)
{
RegLocation res = cUnit->regLocation[mir->ssaRep->defs[low]];
-#ifdef SSA_WORKAROUND
- if (!res.wide) {
- LOG(WARNING) << "Invalid SSA renaming: " << PrettyMethod(cUnit->method);
- cUnit->printMe = true;
- cUnit->dumpCFG = true;
- res.wide = true;
- }
-#endif
assert(res.wide);
return res;
}
@@ -1064,14 +1033,6 @@ extern RegLocation oatGetSrcWide(CompilationUnit* cUnit, MIR* mir,
int low, int high)
{
RegLocation res = cUnit->regLocation[mir->ssaRep->uses[low]];
-#ifdef SSA_WORKAROUND
- if (!res.wide) {
- LOG(WARNING) << "Invalid SSA renaming: " << PrettyMethod(cUnit->method);
- cUnit->printMe = true;
- cUnit->dumpCFG = true;
- res.wide = true;
- }
-#endif
assert(res.wide);
return res;
}