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

Unified Diff: src/IceTargetLoweringX8664.cpp

Issue 1531623007: Add option to force filetype=asm for testing (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Missed one --sandbox in the wrong place. Created 4 years, 11 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: src/IceTargetLoweringX8664.cpp
diff --git a/src/IceTargetLoweringX8664.cpp b/src/IceTargetLoweringX8664.cpp
index 0616ba104690ce1140db45565e3499f1713e3575..7e63780f1a67044b0e762b1a4774df1200d5201a 100644
--- a/src/IceTargetLoweringX8664.cpp
+++ b/src/IceTargetLoweringX8664.cpp
@@ -412,13 +412,13 @@ void TargetX8664::lowerRet(const InstRet *Inst) {
Variable *Reg = nullptr;
if (Inst->hasRetValue()) {
Operand *Src0 = legalize(Inst->getRetValue());
- if (isVectorType(Src0->getType()) ||
- isScalarFloatingType(Src0->getType())) {
+ const Type Src0Ty = Src0->getType();
+ if (isVectorType(Src0Ty) || isScalarFloatingType(Src0Ty)) {
Reg = legalizeToReg(Src0, Traits::RegisterSet::Reg_xmm0);
} else {
- assert(isScalarIntegerType(Src0->getType()));
- _mov(Reg, Src0, Traits::getGprForType(Src0->getType(),
- Traits::RegisterSet::Reg_rax));
+ assert(Src0Ty == IceType_i32 || Src0Ty == IceType_i64);
+ _mov(Reg, Src0,
+ Traits::getGprForType(Src0Ty, Traits::RegisterSet::Reg_rax));
}
}
// Add a ret instruction even if sandboxing is enabled, because addEpilog

Powered by Google App Engine
This is Rietveld 408576698