diff --git a/lldb/scripts/clang.check-definition-for-superclasses.diff b/lldb/scripts/clang.check-definition-for-superclasses.diff
new file mode 100644
index 0000000000000000000000000000000000000000..566c518c1971774698a0841ae7179d99a9c1b134
--- /dev/null
+++ b/lldb/scripts/clang.check-definition-for-superclasses.diff
@@ -0,0 +1,15 @@
+Index: lib/AST/DeclObjC.cpp
+===================================================================
+--- lib/AST/DeclObjC.cpp	(revision 152265)
++++ lib/AST/DeclObjC.cpp	(working copy)
+@@ -330,6 +330,10 @@
+     LoadExternalDefinition();
+ 
+   while (ClassDecl != NULL) {
++    // FIXME: Should make sure no callers ever do this.
++    if (!ClassDecl->hasDefinition())
++      return 0;
++        
+     if ((MethodDecl = ClassDecl->getMethod(Sel, isInstance)))
+       return MethodDecl;
+