@@ -14758,40 +14758,34 @@ Value *CodeGenFunction::EmitX86BuiltinExpr(unsigned BuiltinID,
14758
14758
case X86::BI__builtin_ia32_aesenc256kl_u8:
14759
14759
case X86::BI__builtin_ia32_aesdec256kl_u8: {
14760
14760
Intrinsic::ID IID;
14761
- StringRef StrNoErr, StrErr, StrEnd ;
14761
+ StringRef BlockName ;
14762
14762
switch (BuiltinID) {
14763
- default: llvm_unreachable("Unexpected builtin");
14763
+ default:
14764
+ llvm_unreachable("Unexpected builtin");
14764
14765
case X86::BI__builtin_ia32_aesenc128kl_u8:
14765
14766
IID = Intrinsic::x86_aesenc128kl;
14766
- StrNoErr = "aesenc128kl_no_error";
14767
- StrErr = "aesenc128kl_error";
14768
- StrEnd = "aesenc128kl_end";
14767
+ BlockName = "aesenc128kl";
14769
14768
break;
14770
14769
case X86::BI__builtin_ia32_aesdec128kl_u8:
14771
14770
IID = Intrinsic::x86_aesdec128kl;
14772
- StrNoErr = "aesdec128kl_no_error";
14773
- StrErr = "aesdec128kl_error";
14774
- StrEnd = "aesdec128kl_end";
14771
+ BlockName = "aesdec128kl";
14775
14772
break;
14776
14773
case X86::BI__builtin_ia32_aesenc256kl_u8:
14777
14774
IID = Intrinsic::x86_aesenc256kl;
14778
- StrNoErr = "aesenc256kl_no_error";
14779
- StrErr = "aesenc256kl_error";
14780
- StrEnd = "aesenc256kl_end";
14775
+ BlockName = "aesenc256kl";
14781
14776
break;
14782
14777
case X86::BI__builtin_ia32_aesdec256kl_u8:
14783
14778
IID = Intrinsic::x86_aesdec256kl;
14784
- StrNoErr = "aesdec256kl_no_error";
14785
- StrErr = "aesdec256kl_error";
14786
- StrEnd = "aesdec256kl_end";
14779
+ BlockName = "aesdec256kl";
14787
14780
break;
14788
14781
}
14789
14782
14790
14783
Value *Call = Builder.CreateCall(CGM.getIntrinsic(IID), {Ops[1], Ops[2]});
14791
14784
14792
- BasicBlock *NoError = createBasicBlock(StrNoErr, this->CurFn);
14793
- BasicBlock *Error = createBasicBlock(StrErr, this->CurFn);
14794
- BasicBlock *End = createBasicBlock(StrEnd, this->CurFn);
14785
+ BasicBlock *NoError =
14786
+ createBasicBlock(BlockName + "_no_error", this->CurFn);
14787
+ BasicBlock *Error = createBasicBlock(BlockName + "_error", this->CurFn);
14788
+ BasicBlock *End = createBasicBlock(BlockName + "_end", this->CurFn);
14795
14789
14796
14790
Value *Ret = Builder.CreateExtractValue(Call, 0);
14797
14791
Value *Succ = Builder.CreateTrunc(Ret, Builder.getInt1Ty());
@@ -14815,31 +14809,23 @@ Value *CodeGenFunction::EmitX86BuiltinExpr(unsigned BuiltinID,
14815
14809
case X86::BI__builtin_ia32_aesencwide256kl_u8:
14816
14810
case X86::BI__builtin_ia32_aesdecwide256kl_u8: {
14817
14811
Intrinsic::ID IID;
14818
- StringRef StrNoErr, StrErr, StrEnd ;
14812
+ StringRef BlockName ;
14819
14813
switch (BuiltinID) {
14820
14814
case X86::BI__builtin_ia32_aesencwide128kl_u8:
14821
14815
IID = Intrinsic::x86_aesencwide128kl;
14822
- StrNoErr = "aesencwide128kl_no_error";
14823
- StrErr = "aesencwide128kl_error";
14824
- StrEnd = "aesencwide128kl_end";
14816
+ BlockName = "aesencwide128kl";
14825
14817
break;
14826
14818
case X86::BI__builtin_ia32_aesdecwide128kl_u8:
14827
14819
IID = Intrinsic::x86_aesdecwide128kl;
14828
- StrNoErr = "aesdecwide128kl_no_error";
14829
- StrErr = "aesdecwide128kl_error";
14830
- StrEnd = "aesdecwide128kl_end";
14820
+ BlockName = "aesdecwide128kl";
14831
14821
break;
14832
14822
case X86::BI__builtin_ia32_aesencwide256kl_u8:
14833
14823
IID = Intrinsic::x86_aesencwide256kl;
14834
- StrNoErr = "aesencwide256kl_no_error";
14835
- StrErr = "aesencwide256kl_error";
14836
- StrEnd = "aesencwide256kl_end";
14824
+ BlockName = "aesencwide256kl";
14837
14825
break;
14838
14826
case X86::BI__builtin_ia32_aesdecwide256kl_u8:
14839
14827
IID = Intrinsic::x86_aesdecwide256kl;
14840
- StrNoErr = "aesdecwide256kl_no_error";
14841
- StrErr = "aesdecwide256kl_error";
14842
- StrEnd = "aesdecwide256kl_end";
14828
+ BlockName = "aesdecwide256kl";
14843
14829
break;
14844
14830
}
14845
14831
@@ -14853,9 +14839,10 @@ Value *CodeGenFunction::EmitX86BuiltinExpr(unsigned BuiltinID,
14853
14839
14854
14840
Value *Call = Builder.CreateCall(CGM.getIntrinsic(IID), InOps);
14855
14841
14856
- BasicBlock *NoError = createBasicBlock(StrNoErr, this->CurFn);
14857
- BasicBlock *Error = createBasicBlock(StrErr, this->CurFn);
14858
- BasicBlock *End = createBasicBlock(StrEnd, this->CurFn);
14842
+ BasicBlock *NoError =
14843
+ createBasicBlock(BlockName + "_no_error", this->CurFn);
14844
+ BasicBlock *Error = createBasicBlock(BlockName + "_error", this->CurFn);
14845
+ BasicBlock *End = createBasicBlock(BlockName + "_end", this->CurFn);
14859
14846
14860
14847
Value *Ret = Builder.CreateExtractValue(Call, 0);
14861
14848
Value *Succ = Builder.CreateTrunc(Ret, Builder.getInt1Ty());
0 commit comments