Emit reflection metadata, but not reflection names, by default

slavapestov · slavapestov · commit 98abbdb3320e · 2016-04-21T15:15:30.000-07:00
This allows the reflection type lowering test to pass with the
default build configuration.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -231,6 +231,10 @@ option(SWIFT_STDLIB_ENABLE_RESILIENCE
 
 option(SWIFT_STDLIB_ENABLE_REFLECTION_METADATA
     "Build the standard libraries and overlays with remote reflection metadata; see docs/proposals/RemoteMirrors.rst"
+    TRUE)
+
+option(SWIFT_STDLIB_ENABLE_REFLECTION_NAMES
+    "Build the standard libraries and overlays with remote reflection names; see docs/proposals/RemoteMirrors.rst"
     FALSE)
 
 option(SWIFT_STDLIB_SIL_SERIALIZE_ALL
diff --git a/cmake/modules/AddSwift.cmake b/cmake/modules/AddSwift.cmake
@@ -394,6 +394,10 @@ function(_compile_swift_files dependency_target_out_var_name)
     list(APPEND swift_flags "-Xfrontend" "-enable-reflection-metadata")
   endif()
 
+  if(SWIFT_STDLIB_ENABLE_REFLECTION_NAMES AND SWIFTFILE_IS_STDLIB)
+    list(APPEND swift_flags "-Xfrontend" "-enable-reflection-names")
+  endif()
+
   if(SWIFT_EMIT_SORTED_SIL_OUTPUT)
     list(APPEND swift_flags "-Xfrontend" "-emit-sorted-sil")
   endif()
diff --git a/include/swift/AST/IRGenOptions.h b/include/swift/AST/IRGenOptions.h
@@ -140,11 +140,11 @@ class IRGenOptions {
   unsigned HasValueNamesSetting : 1;
   unsigned ValueNames : 1;
 
-  /// Only strip the field names section from nominal type field metadata.
-  unsigned StripReflectionNames : 1;
+  /// Emit nominal type field metadata.
+  unsigned EnableReflectionMetadata : 1;
 
-  /// Strip all nominal type field metadata.
-  unsigned StripReflectionMetadata : 1;
+  /// Emit names of struct stored properties and enum cases.
+  unsigned EnableReflectionNames : 1;
 
   /// List of backend command-line options for -embed-bitcode.
   std::vector<uint8_t> CmdArgs;
@@ -165,7 +165,7 @@ class IRGenOptions {
                    EmitStackPromotionChecks(false), GenerateProfile(false),
                    PrintInlineTree(false), EmbedMode(IRGenEmbedMode::None),
                    HasValueNamesSetting(false), ValueNames(false),
-                   StripReflectionNames(true), StripReflectionMetadata(true),
+                   EnableReflectionMetadata(false), EnableReflectionNames(false),
                    CmdArgs(), UseIncrementalLLVMCodeGen(true)
                    {}
 
diff --git a/include/swift/Option/FrontendOptions.td b/include/swift/Option/FrontendOptions.td
@@ -193,11 +193,8 @@ def enable_llvm_value_names : Flag<["-"], "enable-llvm-value-names">,
 def enable_reflection_metadata : Flag<["-"], "enable-reflection-metadata">,
   HelpText<"Enable emission of reflection metadata for nominal types">;
 
-def strip_reflection_metadata : Flag<["-"], "strip-reflection-metadata">,
-  HelpText<"Strip all reflection metadata for nominal types">;
-
-def strip_reflection_names : Flag<["-"], "strip-reflection-names">,
-  HelpText<"Strip names of stored properties and enum cases from"
+def enable_reflection_names : Flag<["-"], "enable-reflection-names">,
+  HelpText<"Enable emission of names of stored properties and enum cases in"
            "reflection metadata">;
 
 def stack_promotion_checks : Flag<["-"], "emit-stack-promotion-checks">,
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
@@ -1262,17 +1262,10 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,
   }
 
   if (Args.hasArg(OPT_enable_reflection_metadata)) {
-    Opts.StripReflectionMetadata = false;
-    Opts.StripReflectionNames = false;
-  }
-
-  if (Args.hasArg(OPT_strip_reflection_names)) {
-    Opts.StripReflectionNames = true;
-  }
-
-  if (Args.hasArg(OPT_strip_reflection_metadata)) {
-    Opts.StripReflectionMetadata = true;
-    Opts.StripReflectionNames = true;
+    Opts.EnableReflectionMetadata = true;
+    if (Args.hasArg(OPT_enable_reflection_names)) {
+      Opts.EnableReflectionNames = true;
+    }
   }
 
   return false;
diff --git a/lib/IRGen/GenReflection.cpp b/lib/IRGen/GenReflection.cpp
@@ -175,11 +175,11 @@ class FieldTypeMetadataBuilder : public ReflectionMetadataBuilder {
       addBuiltinTypeRefs(type);
     }
 
-    if (IGM.Opts.StripReflectionNames) {
-      addConstantInt32(0);
-    } else {
+    if (IGM.Opts.EnableReflectionNames) {
       auto fieldName = IGM.getAddrOfFieldName(value->getNameStr());
       addRelativeAddress(fieldName);
+    } else {
+      addConstantInt32(0);
     }
   }
 
@@ -380,8 +380,8 @@ llvm::Constant *IRGenModule::getAddrOfStringForTypeRef(StringRef Str) {
 }
 
 void IRGenModule::emitReflectionMetadataRecords() {
-  auto DontHaveDecls = NominalTypeDecls.empty() && ExtensionDecls.empty();
-  if (Opts.StripReflectionMetadata || DontHaveDecls)
+  auto DoNotHaveDecls = NominalTypeDecls.empty() && ExtensionDecls.empty();
+  if (!Opts.EnableReflectionMetadata || DoNotHaveDecls)
     return;
 
   // We collect all referenced builtin types and emit records for them.
diff --git a/stdlib/private/SwiftReflectionTest/CMakeLists.txt b/stdlib/private/SwiftReflectionTest/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(swift_reflection_test_compile_flags
-  "-Xfrontend" "-enable-reflection-metadata")
+  "-Xfrontend" "-enable-reflection-names")
 
 add_swift_library(swiftSwiftReflectionTest SHARED IS_STDLIB
   SwiftReflectionTest.swift
diff --git a/test/IRGen/reflection_metadata.swift b/test/IRGen/reflection_metadata.swift
@@ -1,6 +1,6 @@
-// RUN: %target-swift-frontend -enable-reflection-metadata -emit-ir %S/Inputs/reflection_metadata.swift | FileCheck %s
-// RUN: %target-swift-frontend -enable-reflection-metadata -strip-reflection-names -emit-ir %S/Inputs/reflection_metadata.swift | FileCheck %s --check-prefix=STRIP_REFLECTION_NAMES
-// RUN: %target-swift-frontend -enable-reflection-metadata -strip-reflection-metadata -emit-ir %S/Inputs/reflection_metadata.swift | FileCheck %s --check-prefix=STRIP_REFLECTION_METADATA
+// RUN: %target-swift-frontend -enable-reflection-metadata -enable-reflection-names -emit-ir %S/Inputs/reflection_metadata.swift | FileCheck %s
+// RUN: %target-swift-frontend -enable-reflection-metadata -emit-ir %S/Inputs/reflection_metadata.swift | FileCheck %s --check-prefix=STRIP_REFLECTION_NAMES
+// RUN: %target-swift-frontend -emit-ir %S/Inputs/reflection_metadata.swift | FileCheck %s --check-prefix=STRIP_REFLECTION_METADATA
 
 // STRIP_REFLECTION_NAMES-NOT: {{.*}}swift3_reflstr
 // STRIP_REFLECTION_NAMES_DAG: {{.*}}swift3_reflect
diff --git a/test/Reflection/typeref_decoding.swift b/test/Reflection/typeref_decoding.swift
@@ -1,4 +1,4 @@
 // RUN: rm -rf %t && mkdir -p %t
-// RUN: %target-build-swift %S/Inputs/ConcreteTypes.swift %S/Inputs/GenericTypes.swift %S/Inputs/Protocols.swift %S/Inputs/Extensions.swift -parse-as-library -emit-module -emit-library -module-name TypesToReflect -Xfrontend -enable-reflection-metadata -o %t/libTypesToReflect
+// RUN: %target-build-swift %S/Inputs/ConcreteTypes.swift %S/Inputs/GenericTypes.swift %S/Inputs/Protocols.swift %S/Inputs/Extensions.swift -parse-as-library -emit-module -emit-library -module-name TypesToReflect -Xfrontend -enable-reflection-metadata -Xfrontend -enable-reflection-names -o %t/libTypesToReflect
 // RUN: %target-swift-reflection-dump -binary-filename %t/libTypesToReflect > %t/typeref_decoding.txt
 // RUN: diff -u %S/typeref_decoding.result.txt %t/typeref_decoding.txt
diff --git a/test/Reflection/typeref_decoding_objc.swift b/test/Reflection/typeref_decoding_objc.swift
@@ -1,5 +1,5 @@
 // RUN: rm -rf %t && mkdir -p %t
-// RUN: %target-build-swift %S/Inputs/ObjectiveCTypes.swift -parse-as-library -emit-module -emit-library -module-name TypesToReflect -Xfrontend -enable-reflection-metadata -o %t/libTypesToReflect
+// RUN: %target-build-swift %S/Inputs/ObjectiveCTypes.swift -parse-as-library -emit-module -emit-library -module-name TypesToReflect -Xfrontend -enable-reflection-metadata -Xfrontend -enable-reflection-names -o %t/libTypesToReflect
 // RUN: %target-swift-reflection-dump -binary-filename %t/libTypesToReflect > %t/typeref_decoding.txt
 // RUN: diff -u %S/typeref_decoding_objc.result.txt %t/typeref_decoding.txt
 // REQUIRES: objc_interop
diff --git a/utils/build-script-impl b/utils/build-script-impl
@@ -77,7 +77,8 @@ KNOWN_SETTINGS=(
     llvm-enable-lto             "0"              "enable LTO compilation of LLVM/Clang."
     swift-stdlib-build-type     "Debug"          "the CMake build variant for Swift"
     swift-stdlib-enable-assertions "1"           "enable assertions in Swift"
-    swift-stdlib-enable-reflection-metadata "0"  "build the Swift stdlib and overlays with remote reflection metadata"
+    swift-stdlib-enable-reflection-metadata "1"  "build the Swift stdlib and overlays with remote reflection metadata"
+    swift-stdlib-enable-reflection-names "0"     "build the Swift stdlib and overlays with names of struct stored properties and enum cases"
     swift-stdlib-enable-resilience "0"           "build the Swift stdlib and overlays with resilience enabled"
     swift-stdlib-sil-serialize-all "1"           "build the Swift stdlib and overlays with all method bodies serialized"
     lldb-build-type             "Debug"          "the CMake build variant for LLDB"
@@ -1712,6 +1713,7 @@ for deployment_target in "${HOST_TARGET}" "${CROSS_TOOLS_DEPLOYMENT_TARGETS[@]}"
                     -DSWIFT_STDLIB_BUILD_TYPE:STRING="${SWIFT_STDLIB_BUILD_TYPE}"
                     -DSWIFT_STDLIB_ASSERTIONS:BOOL=$(true_false "${SWIFT_STDLIB_ENABLE_ASSERTIONS}")
                     -DSWIFT_STDLIB_ENABLE_REFLECTION_METADATA:BOOL=$(true_false "${SWIFT_STDLIB_ENABLE_REFLECTION_METADATA}")
+                    -DSWIFT_STDLIB_ENABLE_REFLECTION_NAMES:BOOL=$(true_false "${SWIFT_STDLIB_ENABLE_REFLECTION_NAMES}")
                     -DSWIFT_STDLIB_ENABLE_RESILIENCE:BOOL=$(true_false "${SWIFT_STDLIB_ENABLE_RESILIENCE}")
                     -DSWIFT_STDLIB_SIL_SERIALIZE_ALL:BOOL=$(true_false "${SWIFT_STDLIB_SIL_SERIALIZE_ALL}")
                     -DSWIFT_NATIVE_LLVM_TOOLS_PATH:STRING="${native_llvm_tools_path}"

Original file line number	Diff line number	Diff line change
`@@ -175,11 +175,11 @@ class FieldTypeMetadataBuilder : public ReflectionMetadataBuilder {`
`175`	`175`	`addBuiltinTypeRefs(type);`
`176`	`176`	`}`
`177`	`177`
`178`		`- if (IGM.Opts.StripReflectionNames) {`
`179`		`- addConstantInt32(0);`
`180`		`- } else {`
	`178`	`+ if (IGM.Opts.EnableReflectionNames) {`
`181`	`179`	`auto fieldName = IGM.getAddrOfFieldName(value->getNameStr());`
`182`	`180`	`addRelativeAddress(fieldName);`
	`181`	`+ } else {`
	`182`	`+ addConstantInt32(0);`
`183`	`183`	`}`
`184`	`184`	`}`
`185`	`185`
`@@ -380,8 +380,8 @@ llvm::Constant *IRGenModule::getAddrOfStringForTypeRef(StringRef Str) {`
`380`	`380`	`}`
`381`	`381`
`382`	`382`	`void IRGenModule::emitReflectionMetadataRecords() {`
`383`		`- auto DontHaveDecls = NominalTypeDecls.empty() && ExtensionDecls.empty();`
`384`		`- if (Opts.StripReflectionMetadata \|\| DontHaveDecls)`
	`383`	`+ auto DoNotHaveDecls = NominalTypeDecls.empty() && ExtensionDecls.empty();`
	`384`	`+ if (!Opts.EnableReflectionMetadata \|\| DoNotHaveDecls)`
`385`	`385`	`return;`
`386`	`386`
`387`	`387`	`// We collect all referenced builtin types and emit records for them.`