Updated Patch, based on feedback.

Author: isakhilesh

llvm/lib/Target/AMDGPU/SIFoldOperands.cpp

@@ -1161,12 +1161,14 @@ void SIFoldOperandsImpl::foldOperand(
 
         if (OpToFold.isImm())
           UseMI->getOperand(1).ChangeToImmediate(OpToFold.getImm());
-        else if (OpToFold.isGlobal())
+        else if (OpToFold.isFI())
+          UseMI->getOperand(1).ChangeToFrameIndex(OpToFold.getIndex());
+        else {
+          assert(OpToFold.isGlobal());
           UseMI->getOperand(1).ChangeToGA(OpToFold.getGlobal(),
                                           OpToFold.getOffset(),
                                           OpToFold.getTargetFlags());
-        else
-          UseMI->getOperand(1).ChangeToFrameIndex(OpToFold.getIndex());
+        }
         UseMI->removeOperand(2); // Remove exec read (or src1 for readlane)
         return;
       }

llvm/test/CodeGen/AMDGPU/swdev504645-global-fold.ll

@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 5
-; RUN: llc -mtriple=amdgcn -mcpu=gfx942 < %s | FileCheck %s
+; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx942 < %s | FileCheck %s
 
 define void @test_load_zext() {
 ; CHECK-LABEL: test_load_zext:
@@ -41,6 +41,4 @@ declare void @has_spgr_args(i32 inreg)
 
 declare i32 @llvm.amdgcn.reloc.constant(metadata) #0
 
-attributes #0 = { nocallback nofree nosync nounwind speculatable willreturn memory(none) }
-
-!0 = !{!"DescriptorBuffer", i32 4, i32 8, i32 0, i32 0}
+!0 = !{!"DescriptorBuffer", i32 4, i32 8, i32 0, i32 0}