Skip to content

Commit e3a5e10

Browse files
committed
Revert "Work around SPIRV validation failure."
This reverts commit 38b1d52.
1 parent 38b1d52 commit e3a5e10

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

llvm/lib/Target/SPIRV/SPIRVSubtarget.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,13 @@ static bool isAtLeastVer(VersionTuple Target, VersionTuple VerToCompareTo) {
4949
return Target.empty() || Target >= VerToCompareTo;
5050
}
5151

52-
// FIXME: initSubtargetDependencies should be called on the InstrInfo
53-
// initializer, not the following FrameLowering
5452
SPIRVSubtarget::SPIRVSubtarget(const Triple &TT, const std::string &CPU,
5553
const std::string &FS,
5654
const SPIRVTargetMachine &TM)
5755
: SPIRVGenSubtargetInfo(TT, CPU, /*TuneCPU=*/CPU, FS),
58-
PointerSize(TM.getPointerSizeInBits(/* AS= */ 0)), InstrInfo(*this),
59-
FrameLowering(initSubtargetDependencies(CPU, FS)), TLInfo(TM, *this),
60-
TargetTriple(TT) {
56+
PointerSize(TM.getPointerSizeInBits(/* AS= */ 0)),
57+
InstrInfo(initSubtargetDependencies(CPU, FS)), FrameLowering(*this),
58+
TLInfo(TM, *this), TargetTriple(TT) {
6159
switch (TT.getSubArch()) {
6260
case Triple::SPIRVSubArch_v10:
6361
SPIRVVersion = VersionTuple(1, 0);

0 commit comments

Comments
 (0)