Revert r91073.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@91629 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 6ed9f7a772b6683881ad4e5b703954989f434f2e..5bb168068f5f3410edd7e6503747f7fe920c4ded 100644 (file)
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -1253,11 +1253,6 @@ Sema::ControlFlowKind Sema::CheckFallThrough(Stmt *Root) {
       HasFakeEdge = true;
       continue;
     }
-    if (isa<AsmStmt>(S)) {
-      HasFakeEdge = true;
-      HasLiveReturn = true;
-      continue;
-    }
     bool NoReturnEdge = false;
     if (CallExpr *C = dyn_cast<CallExpr>(S)) {
       Expr *CEE = C->getCallee()->IgnoreParenCasts();

diff --git a/test/Sema/return.c b/test/Sema/return.c
index a1d9e5eeedd0f7591a053fe4e9c0bd74e089ceae..17d21789f05ad7c72136881ca45b25abe034d627 100644 (file)
--- a/test/Sema/return.c
+++ b/test/Sema/return.c
@@ -222,7 +222,3 @@ void test32() {
 void test33() {
   if (j) while (1) { }
 }
-
-int test34() {
-  asm("nop");
-}