2 files changed, 0 insertions, 9 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 6ed9f7a772..5bb168068f 100644
--- 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 a1d9e5eeed..17d21789f0 100644
--- 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");
-}