[IRGen] Mark protocol conformance descriptors as true const.

DougGregor · DougGregor · commit 4444ff9294e0 · 2018-09-28T23:53:18.000-07:00
diff --git a/lib/IRGen/GenMeta.cpp b/lib/IRGen/GenMeta.cpp
@@ -603,7 +603,6 @@ namespace {
       auto var = cast<llvm::GlobalVariable>(addr);
 
       var->setConstant(true);
-      disableAddressSanitizer(IGM, var);
       IGM.setTrueConstGlobal(var);
     }
 
diff --git a/lib/IRGen/GenProto.cpp b/lib/IRGen/GenProto.cpp
@@ -2240,6 +2240,7 @@ void IRGenModule::emitProtocolConformance(
           getAddrOfProtocolConformanceDescriptor(conformance,
                                                  init.finishAndCreateFuture()));
   var->setConstant(true);
+  setTrueConstGlobal(var);
 }
 
 void IRGenModule::ensureRelativeSymbolCollocation(SILWitnessTable &wt) {

Original file line number	Diff line number	Diff line change
`@@ -603,7 +603,6 @@ namespace {`
`603`	`603`	`auto var = cast<llvm::GlobalVariable>(addr);`
`604`	`604`
`605`	`605`	`var->setConstant(true);`
`606`		`- disableAddressSanitizer(IGM, var);`
`607`	`606`	`IGM.setTrueConstGlobal(var);`
`608`	`607`	`}`
`609`	`608`
Original file line number	Diff line number	Diff line change
`@@ -2240,6 +2240,7 @@ void IRGenModule::emitProtocolConformance(`
`2240`	`2240`	`getAddrOfProtocolConformanceDescriptor(conformance,`
`2241`	`2241`	`init.finishAndCreateFuture()));`
`2242`	`2242`	`var->setConstant(true);`
	`2243`	`+ setTrueConstGlobal(var);`
`2243`	`2244`	`}`
`2244`	`2245`
`2245`	`2246`	`void IRGenModule::ensureRelativeSymbolCollocation(SILWitnessTable &wt) {`