commit 5fc6a6efe0d012d0ac69c7a3c6eadf59292d8119
author Steve Naroff <snaroff@apple.com> Tue Mar 03 00:45:38 2009 +0000
committer Steve Naroff <snaroff@apple.com> Tue Mar 03 00:45:38 2009 +0000
tree 103dba12bbd7e9335413ca6b84e698badae68647
parent 5f097321c186cdd51fa5dc6aeccffb48ecc5f379

Fix <rdar://problem/6635908> crash on invalid


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

lib/Sema/SemaStmt.cpp

diff --git a/lib/Sema/SemaStmt.cpp b/lib/Sema/SemaStmt.cpp
index 39b211f..e7dff6d 100644
--- a/lib/Sema/SemaStmt.cpp
+++ b/lib/Sema/SemaStmt.cpp
@@ -785,9 +785,11 @@
   QualType FnRetType;
   if (FunctionDecl *FD = getCurFunctionDecl())
     FnRetType = FD->getResultType();
-  else
-    FnRetType = getCurMethodDecl()->getResultType();
-
+  else if (ObjCMethodDecl *MD = getCurMethodDecl())
+    FnRetType = MD->getResultType();
+  else // If we don't have a function/method context, bail.
+    return StmtError();
+    
   if (FnRetType->isVoidType()) {
     if (RetValExp) {// C99 6.8.6.4p1 (ext_ since GCC warns)
       unsigned D = diag::ext_return_has_expr;