Fix build

AlexeySachkov · vladimirlaz · commit f7ef4c0d12f6 · 2020-09-07T07:29:28.000+03:00
Fixed an error caused by interference of KhronosGroup/SPIRV-LLVM-Translator@7cd1a3b and KhronosGroup/SPIRV-LLVM-Translator@584329f
diff --git a/llvm-spirv/lib/SPIRV/libSPIRV/SPIRVInstruction.h b/llvm-spirv/lib/SPIRV/libSPIRV/SPIRVInstruction.h
@@ -3101,8 +3101,8 @@ class SPIRVVariableLengthArrayINTELInstBase : public SPIRVInstTemplateBase {
   SPIRVCapVec getRequiredCapability() const override {
     return getVec(CapabilityVariableLengthArrayINTEL);
   }
-  SPIRVExtSet getRequiredExtensions() const override {
-    return getSet(ExtensionID::SPV_INTEL_variable_length_array);
+  llvm::Optional<ExtensionID> getRequiredExtension() const override {
+    return ExtensionID::SPV_INTEL_variable_length_array;
   }
 };
 #define _SPIRV_OP(x, ...)                                                      \

Original file line number	Diff line number	Diff line change
`@@ -3101,8 +3101,8 @@ class SPIRVVariableLengthArrayINTELInstBase : public SPIRVInstTemplateBase {`
`3101`	`3101`	`SPIRVCapVec getRequiredCapability() const override {`
`3102`	`3102`	`return getVec(CapabilityVariableLengthArrayINTEL);`
`3103`	`3103`	`}`
`3104`		`- SPIRVExtSet getRequiredExtensions() const override {`
`3105`		`- return getSet(ExtensionID::SPV_INTEL_variable_length_array);`
	`3104`	`+ llvm::Optional<ExtensionID> getRequiredExtension() const override {`
	`3105`	`+ return ExtensionID::SPV_INTEL_variable_length_array;`
`3106`	`3106`	`}`
`3107`	`3107`	`};`
`3108`	`3108`	`#define _SPIRV_OP(x, ...) \`