diff options
Diffstat (limited to 'lib/Sema')
| -rw-r--r-- | lib/Sema/AnalysisBasedWarnings.cpp | 7 | ||||
| -rw-r--r-- | lib/Sema/SemaStmtAsm.cpp | 8 | ||||
| -rw-r--r-- | lib/Sema/TreeTransform.h | 8 |
3 files changed, 7 insertions, 16 deletions
diff --git a/lib/Sema/AnalysisBasedWarnings.cpp b/lib/Sema/AnalysisBasedWarnings.cpp index 19a7d6f35c..93be773f2d 100644 --- a/lib/Sema/AnalysisBasedWarnings.cpp +++ b/lib/Sema/AnalysisBasedWarnings.cpp @@ -182,13 +182,6 @@ static ControlFlowKind CheckFallThrough(AnalysisDeclContext &AC) { HasFakeEdge = true; continue; } - if (const AsmStmt *AS = dyn_cast<AsmStmt>(S)) { - if (AS->isMSAsm()) { - HasFakeEdge = true; - HasLiveReturn = true; - continue; - } - } if (isa<MSAsmStmt>(S)) { // TODO: Verify this is correct. HasFakeEdge = true; diff --git a/lib/Sema/SemaStmtAsm.cpp b/lib/Sema/SemaStmtAsm.cpp index 0a7d980a9f..591a91c7e5 100644 --- a/lib/Sema/SemaStmtAsm.cpp +++ b/lib/Sema/SemaStmtAsm.cpp @@ -94,7 +94,7 @@ StmtResult Sema::ActOnAsmStmt(SourceLocation AsmLoc, bool IsSimple, unsigned NumInputs, IdentifierInfo **Names, MultiExprArg constraints, MultiExprArg exprs, Expr *asmString, MultiExprArg clobbers, - SourceLocation RParenLoc, bool MSAsm) { + SourceLocation RParenLoc) { unsigned NumClobbers = clobbers.size(); StringLiteral **Constraints = reinterpret_cast<StringLiteral**>(constraints.get()); @@ -199,9 +199,9 @@ StmtResult Sema::ActOnAsmStmt(SourceLocation AsmLoc, bool IsSimple, } AsmStmt *NS = - new (Context) AsmStmt(Context, AsmLoc, IsSimple, IsVolatile, MSAsm, - NumOutputs, NumInputs, Names, Constraints, Exprs, - AsmString, NumClobbers, Clobbers, RParenLoc); + new (Context) AsmStmt(Context, AsmLoc, IsSimple, IsVolatile, NumOutputs, + NumInputs, Names, Constraints, Exprs, AsmString, + NumClobbers, Clobbers, RParenLoc); // Validate the asm string, ensuring it makes sense given the operands we // have. SmallVector<AsmStmt::AsmStringPiece, 8> Pieces; diff --git a/lib/Sema/TreeTransform.h b/lib/Sema/TreeTransform.h index 619ad330b9..05a3c611e9 100644 --- a/lib/Sema/TreeTransform.h +++ b/lib/Sema/TreeTransform.h @@ -1172,12 +1172,11 @@ public: MultiExprArg Exprs, Expr *AsmString, MultiExprArg Clobbers, - SourceLocation RParenLoc, - bool MSAsm) { + SourceLocation RParenLoc) { return getSema().ActOnAsmStmt(AsmLoc, IsSimple, IsVolatile, NumOutputs, NumInputs, Names, move(Constraints), Exprs, AsmString, Clobbers, - RParenLoc, MSAsm); + RParenLoc); } /// \brief Build a new MS style inline asm statement. @@ -5600,8 +5599,7 @@ TreeTransform<Derived>::TransformAsmStmt(AsmStmt *S) { move_arg(Exprs), AsmString.get(), move_arg(Clobbers), - S->getRParenLoc(), - S->isMSAsm()); + S->getRParenLoc()); } template<typename Derived> |