diff options
author | Bill Wendling <isanbard@gmail.com> | 2018-12-19 04:36:42 +0000 |
---|---|---|
committer | Bill Wendling <isanbard@gmail.com> | 2018-12-19 04:36:42 +0000 |
commit | 13381fbc29f1d38c4c0c21a1596baf25d4f2dfd4 (patch) | |
tree | 811c10ae673afbf9ec42391be0355c62337773e3 /clang/lib/Sema/SemaStmtAsm.cpp | |
parent | 016394b2806278cbe3b96f91550af0a7c86229a4 (diff) | |
download | bcm5719-llvm-13381fbc29f1d38c4c0c21a1596baf25d4f2dfd4.tar.gz bcm5719-llvm-13381fbc29f1d38c4c0c21a1596baf25d4f2dfd4.zip |
Revert accidentally included code.
llvm-svn: 349603
Diffstat (limited to 'clang/lib/Sema/SemaStmtAsm.cpp')
-rw-r--r-- | clang/lib/Sema/SemaStmtAsm.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/clang/lib/Sema/SemaStmtAsm.cpp b/clang/lib/Sema/SemaStmtAsm.cpp index b10b3d852c6..d209266049e 100644 --- a/clang/lib/Sema/SemaStmtAsm.cpp +++ b/clang/lib/Sema/SemaStmtAsm.cpp @@ -378,17 +378,17 @@ StmtResult Sema::ActOnGCCAsmStmt(SourceLocation AsmLoc, bool IsSimple, << InputExpr->getSourceRange()); } else if (Info.requiresImmediateConstant() && !Info.allowsRegister()) { if (!InputExpr->isValueDependent()) { - llvm::SmallVector<PartialDiagnosticAt, 1> Diags; - llvm::APSInt Result = InputExpr->EvaluateKnownConstInt(Context, &Diags); - if (!Diags.empty()) + Expr::EvalResult EVResult; + if (!InputExpr->EvaluateAsInt(EVResult, Context)) return StmtError( Diag(InputExpr->getBeginLoc(), diag::err_asm_immediate_expected) << Info.getConstraintStr() << InputExpr->getSourceRange()); - if (!Info.isValidAsmImmediate(Result)) - return StmtError(Diag(InputExpr->getBeginLoc(), - diag::err_invalid_asm_value_for_constraint) - << Result.toString(10) << Info.getConstraintStr() - << InputExpr->getSourceRange()); + llvm::APSInt Result = EVResult.Val.getInt(); + if (!Info.isValidAsmImmediate(Result)) + return StmtError(Diag(InputExpr->getBeginLoc(), + diag::err_invalid_asm_value_for_constraint) + << Result.toString(10) << Info.getConstraintStr() + << InputExpr->getSourceRange()); } } else { |