[QoI] Don't rely on extension type to be present when validating its …

…attributes Malformed 'extension' expressions won't have extended type avaliable, so don't rely on that when validating its attributes.
apple · Dec 5, 2016 · 1e50570 · 1e50570
1 parent 9197174
commit 1e50570
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/lib/Sema/TypeCheckAttr.cpp b/lib/Sema/TypeCheckAttr.cpp
@@ -289,8 +289,7 @@ void AttributeEarlyChecker::visitIBActionAttr(IBActionAttr *attr) {
 
 void AttributeEarlyChecker::visitIBDesignableAttr(IBDesignableAttr *attr) {
   if (auto *ED = dyn_cast<ExtensionDecl>(D)) {
-    CanType extendedTy = ED->getExtendedType()->getCanonicalType();
-    if (!isa<ClassDecl>(extendedTy->getAnyNominal()))
+    if (!ED->getAsClassOrClassExtensionContext())
       return diagnoseAndRemoveAttr(attr, diag::invalid_ibdesignable_extension);
   }
 }

diff --git a/...8556-val-isa-used-on-a-null-pointer.swift → ...8556-val-isa-used-on-a-null-pointer.swift b/...8556-val-isa-used-on-a-null-pointer.swift → ...8556-val-isa-used-on-a-null-pointer.swift
@@ -5,6 +5,6 @@
 // See https://swift.org/LICENSE.txt for license information
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
-// RUN: not --crash %target-swift-frontend %s -emit-ir
+// RUN: not %target-swift-frontend %s -emit-ir
 // REQUIRES: asserts
 @IBDesignable extension