commit 6f9386049c6dee2df33a4b7a6dfeda2733acce7d
author Fariborz Jahanian <fjahanian@apple.com> Mon Sep 10 18:04:25 2012 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Mon Sep 10 18:04:25 2012 +0000
tree f61d97f5db84062f5ef77289ff052947d02fc82d
parent 121ec0a1a903d07ca8f5eaa6976f3233795a3d20

More tweaking and  test cases for call to super
annotations. // rdar://6386358


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

lib/Sema/SemaDeclObjC.cpp

diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index 709a868..e81429c 100644
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -388,9 +388,12 @@
         !(Context.getLangOpts().ObjCAutoRefCount ||
           Context.getLangOpts().getGC() == LangOptions::GCOnly) &&
           MDecl->getMethodFamily() == OMF_dealloc;
-      if (!getCurFunction()->ObjCShouldCallSuperDealloc)
+      if (!getCurFunction()->ObjCShouldCallSuperDealloc) {
+        IMD = IC->getSuperClass()->lookupMethod(MDecl->getSelector(), 
+                                                MDecl->isInstanceMethod());
         getCurFunction()->ObjCShouldCallSuperDealloc = 
           (IMD && IMD->hasAttr<ObjCRequiresSuperAttr>());
+      }
       getCurFunction()->ObjCShouldCallSuperFinalize =
         Context.getLangOpts().getGC() != LangOptions::NonGC &&
         MDecl->getMethodFamily() == OMF_finalize;