Merge pull request #64208 from slavapestov/fix-rdar106433355

slavapestov · web-flow · commit bcfe5a1e6692 · 2023-03-08T15:57:37.000-05:00
Runtime: Fix SWIFT_STDLIB_USE_RELATIVE_PROTOCOL_WITNESS_TABLES build
diff --git a/stdlib/public/runtime/Metadata.cpp b/stdlib/public/runtime/Metadata.cpp
@@ -5867,8 +5867,6 @@ instantiateRelativeWitnessTable(const Metadata *Type,
           : conformance->getConditionalRequirements()) {
       if (conditionalRequirement.Flags.hasKeyArgument())
         copyNextInstantiationArg();
-      if (conditionalRequirement.Flags.hasExtraArgument())
-        copyNextInstantiationArg();
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -5867,8 +5867,6 @@ instantiateRelativeWitnessTable(const Metadata *Type,`
`5867`	`5867`	`: conformance->getConditionalRequirements()) {`
`5868`	`5868`	`if (conditionalRequirement.Flags.hasKeyArgument())`
`5869`	`5869`	`copyNextInstantiationArg();`
`5870`		`- if (conditionalRequirement.Flags.hasExtraArgument())`
`5871`		`- copyNextInstantiationArg();`
`5872`	`5870`	`}`
`5873`	`5871`	`}`
`5874`	`5872`