Skip to content

Commit 12fa024

Browse files
authored
Merge pull request #38897 from apple/revert-38649-problem/37170485
Revert "[Tests] Add a test to round-trip types through mangled names."
2 parents ec3ccd7 + f451954 commit 12fa024

19 files changed

+4
-736
lines changed

docs/Testing.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -384,16 +384,6 @@ code for the target that is not the build machine:
384384

385385
Add ``REQUIRES: static_stdlib`` to the test.
386386

387-
* ``%target-rtti-opt``: the ``-frtti`` or ``-fno-rtti`` option required to
388-
link with the Swift libraries on the target platform.
389-
390-
* ``%target-cxx-lib``: the argument to add to the command line when using
391-
``swiftc`` and linking in a C++ object file. Typically ``-lc++`` or
392-
``-lstdc++`` depending on platform.
393-
394-
* ``%target-msvc-runtime-opt``: for Windows, the MSVC runtime option, e.g.
395-
``-MD``, to use when building C/C++ code to link with Swift.
396-
397387
Always use ``%target-*`` substitutions unless you have a good reason. For
398388
example, an exception would be a test that checks how the compiler handles
399389
mixing module files for incompatible platforms (that test would need to compile

stdlib/public/runtime/Private.h

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,8 @@ class TypeInfo {
268268
const ContextDescriptor *
269269
_searchConformancesByMangledTypeName(Demangle::NodePointer node);
270270

271-
SWIFT_RUNTIME_EXPORT
272271
Demangle::NodePointer _swift_buildDemanglingForMetadata(const Metadata *type,
273-
Demangle::Demangler &Dem);
272+
Demangle::Demangler &Dem);
274273

275274
/// Callback used to provide the substitution of a generic parameter
276275
/// (described by depth/index) to its metadata.
@@ -368,15 +367,13 @@ class TypeInfo {
368367
unsigned index) const;
369368
};
370369

371-
#pragma clang diagnostic push
372-
#pragma clang diagnostic ignored "-Wreturn-type-c-linkage"
373370
/// Retrieve the type metadata described by the given demangled type name.
374371
///
375372
/// \p substGenericParam Function that provides generic argument metadata
376373
/// given a particular generic parameter specified by depth/index.
377374
/// \p substWitnessTable Function that provides witness tables given a
378375
/// particular dependent conformance index.
379-
SWIFT_RUNTIME_EXPORT SWIFT_CC(swift)
376+
SWIFT_CC(swift)
380377
TypeLookupErrorOr<TypeInfo> swift_getTypeByMangledNode(
381378
MetadataRequest request,
382379
Demangler &demangler,
@@ -391,14 +388,13 @@ class TypeInfo {
391388
/// given a particular generic parameter specified by depth/index.
392389
/// \p substWitnessTable Function that provides witness tables given a
393390
/// particular dependent conformance index.
394-
SWIFT_RUNTIME_EXPORT SWIFT_CC(swift)
391+
SWIFT_CC(swift)
395392
TypeLookupErrorOr<TypeInfo> swift_getTypeByMangledName(
396393
MetadataRequest request,
397394
StringRef typeName,
398395
const void * const *arguments,
399396
SubstGenericParameterFn substGenericParam,
400397
SubstDependentWitnessTableFn substWitnessTable);
401-
#pragma clang diagnostic pop
402398

403399
/// Function object that produces substitutions for the generic parameters
404400
/// that occur within a mangled name, using the complete set of generic

test/TypeRoundTrip/Inputs/RoundTrip/RoundTrip.cpp

Lines changed: 0 additions & 74 deletions
This file was deleted.

test/TypeRoundTrip/Inputs/RoundTrip/RoundTrip.swift

Lines changed: 0 additions & 2 deletions
This file was deleted.

test/TypeRoundTrip/Inputs/testcases/builtins.swift

Lines changed: 0 additions & 19 deletions
This file was deleted.

test/TypeRoundTrip/Inputs/testcases/concurrency.swift

Lines changed: 0 additions & 6 deletions
This file was deleted.

test/TypeRoundTrip/Inputs/testcases/existentials.swift

Lines changed: 0 additions & 35 deletions
This file was deleted.

test/TypeRoundTrip/Inputs/testcases/extensions.swift

Lines changed: 0 additions & 34 deletions
This file was deleted.

test/TypeRoundTrip/Inputs/testcases/function_types.swift

Lines changed: 0 additions & 14 deletions
This file was deleted.

test/TypeRoundTrip/Inputs/testcases/generics.swift

Lines changed: 0 additions & 84 deletions
This file was deleted.

0 commit comments

Comments
 (0)