Merge pull request #38896 from apple/revert-38746-objc-getclass-test

Revert "[Demangler][Tests] Add an explicit test for getObjCClassByMangledName."

Author: shahmishal

include/swift/Demangling/TypeLookupError.h

@@ -207,10 +207,7 @@ template <typename... Args>
 static TypeLookupError TypeLookupErrorImpl(const char *fmt, Args... args) {
   return TypeLookupError([=] {
     char *str;
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wformat-security"
     swift_asprintf(&str, fmt, args...);
-#pragma clang diagnostic pop
     return str;
   });
 }

include/swift/Reflection/TypeRefBuilder.h

@@ -24,6 +24,7 @@
 #include "swift/Reflection/TypeLowering.h"
 #include "swift/Reflection/TypeRef.h"
 #include "llvm/ADT/Optional.h"
+
 #include <vector>
 #include <unordered_map>
 

lib/Demangling/Remangler.cpp

@@ -441,11 +441,9 @@ std::pair<int, Node *> Remangler::mangleConstrainedType(Node *node,
     Chain.push_back(node->getChild(1), Factory);
     node = getChildOfType(node->getFirstChild());
   }
-
+  
   if (node->getKind() != Node::Kind::DependentGenericParamType) {
     mangle(node, depth + 1);
-    if (!Chain.size())
-      return {-1, nullptr};
     node = nullptr;
   }
 

stdlib/public/runtime/Metadata.cpp

@@ -3490,17 +3490,13 @@ swift::swift_getExistentialMetatypeMetadata(const Metadata *instanceMetadata) {
 ExistentialMetatypeCacheEntry::ExistentialMetatypeCacheEntry(
                                             const Metadata *instanceMetadata) {
   ExistentialTypeFlags flags;
-  switch (instanceMetadata->getKind()) {
-  case MetadataKind::Existential:
+  if (instanceMetadata->getKind() == MetadataKind::Existential) {
     flags = static_cast<const ExistentialTypeMetadata*>(instanceMetadata)
       ->Flags;
-    break;
-  case MetadataKind::ExistentialMetatype:
+  } else {
+    assert(instanceMetadata->getKind() == MetadataKind::ExistentialMetatype);
     flags = static_cast<const ExistentialMetatypeMetadata*>(instanceMetadata)
       ->Flags;
-    break;
-  default:
-    assert(false && "expected existential metadata");
   }
 
   Data.setKind(MetadataKind::ExistentialMetatype);

stdlib/public/runtime/MetadataLookup.cpp

@@ -1446,12 +1446,6 @@ class DecodedMetadataBuilder {
   TypeLookupErrorOr<BuiltType> createExistentialMetatypeType(
       BuiltType instance,
       llvm::Optional<Demangle::ImplMetatypeRepresentation> repr = None) const {
-    if (instance->getKind() != MetadataKind::Existential
-        && instance->getKind() != MetadataKind::ExistentialMetatype) {
-      return TYPE_LOOKUP_ERROR_FMT("Tried to build an existential metatype from "
-                                   "a type that was neither an existential nor "
-                                   "an existential metatype");
-    }
     return swift_getExistentialMetatypeMetadata(instance);
   }
 

test/Demangle/Inputs/objc-getclass.txt

@@ -1,3 +1,2 @@
 # suffixes: A list of file extensions to treat as test files.
 config.suffixes.add('.test')
-config.suffixes.add('.cpp')