[clang] [clang][MS ABI] Use image-relative throw info on 32-bit Arm (PR #240571)
via cfe-commits
cfe-commits at lists.llvm.org
Mon Nov 9 18:14:29 PST 2026
https://github.com/hamed7ir updated https://github.com/llvm/llvm-project/pull/240571
>From d47b2c6ddf403ff68be0f6d38b7cba43c48718a1 Mon Sep 17 00:00:00 2001
From: hamed7ir <hamedghorbani17 at live.com>
Date: Mon, 9 Nov 2026 11:42:24 -0800
Subject: [PATCH 1/2] [clang][MS ABI] Use image-relative throw info on 32-bit
Arm
MSVC's runtime reads the throw information (ThrowInfo, CatchableTypeArray and
CatchableType) as offsets from the image base on every target but 32-bit x86,
and _CxxThrowException looks up the image base from the ThrowInfo. clang wrote
these tables with absolute pointers on 32-bit Arm, so a throw crashed in the
runtime there. Make them image-relative on Arm, as on 64-bit targets. The RTTI
stays absolute, as on MSVC.
Assisted-by: Claude Opus 5.5 (Anthropic)
---
clang/lib/CodeGen/MicrosoftCXXABI.cpp | 66 +++++++++++++------
.../CodeGenCXX/microsoft-abi-throw-arm.cpp | 49 ++++++++++++++
2 files changed, 95 insertions(+), 20 deletions(-)
create mode 100644 clang/test/CodeGenCXX/microsoft-abi-throw-arm.cpp
diff --git a/clang/lib/CodeGen/MicrosoftCXXABI.cpp b/clang/lib/CodeGen/MicrosoftCXXABI.cpp
index 9a1439d6171a5a..271fd814dfe972 100644
--- a/clang/lib/CodeGen/MicrosoftCXXABI.cpp
+++ b/clang/lib/CodeGen/MicrosoftCXXABI.cpp
@@ -501,6 +501,14 @@ class MicrosoftCXXABI : public CGCXXABI {
return CGM.getTarget().getPointerWidth(LangAS::Default) == 64;
}
+ // The throw information (ThrowInfo, CatchableTypeArray and CatchableType) is
+ // image-relative on every target but 32-bit x86. On 32-bit Arm the RTTI is
+ // not.
+ bool isThrowInfoImageRelative() const {
+ const llvm::Triple &T = CGM.getTarget().getTriple();
+ return isImageRelative() || T.isARM() || T.isThumb();
+ }
+
// 5 routines for constructing the llvm types for MS RTTI structs.
llvm::StructType *getTypeDescriptorType(StringRef TypeInfoString) {
llvm::SmallString<32> TDTypeName("rtti.TypeDescriptor");
@@ -587,7 +595,22 @@ class MicrosoftCXXABI : public CGCXXABI {
llvm::Constant *getImageRelativeConstant(llvm::Constant *PtrVal) {
if (!isImageRelative())
return PtrVal;
+ return getImageRelativeOffset(PtrVal);
+ }
+
+ llvm::Type *getThrowInfoRelativeType(llvm::Type *PtrType) {
+ if (!isThrowInfoImageRelative())
+ return PtrType;
+ return CGM.IntTy;
+ }
+
+ llvm::Constant *getThrowInfoRelativeConstant(llvm::Constant *PtrVal) {
+ if (!isThrowInfoImageRelative())
+ return PtrVal;
+ return getImageRelativeOffset(PtrVal);
+ }
+ llvm::Constant *getImageRelativeOffset(llvm::Constant *PtrVal) {
if (PtrVal->isNullValue())
return llvm::Constant::getNullValue(CGM.IntTy);
@@ -598,6 +621,9 @@ class MicrosoftCXXABI : public CGCXXABI {
llvm::Constant *Diff =
llvm::ConstantExpr::getSub(PtrValAsInt, ImageBaseAsInt,
/*HasNUW=*/true, /*HasNSW=*/true);
+ // On a 32-bit target the difference already has the field's width.
+ if (Diff->getType() == CGM.IntTy)
+ return Diff;
return llvm::ConstantExpr::getTrunc(Diff, CGM.IntTy);
}
@@ -738,13 +764,13 @@ class MicrosoftCXXABI : public CGCXXABI {
if (CatchableTypeType)
return CatchableTypeType;
llvm::Type *FieldTypes[] = {
- CGM.IntTy, // Flags
- getImageRelativeType(CGM.Int8PtrTy), // TypeDescriptor
- CGM.IntTy, // NonVirtualAdjustment
- CGM.IntTy, // OffsetToVBPtr
- CGM.IntTy, // VBTableIndex
- CGM.IntTy, // Size
- getImageRelativeType(CGM.Int8PtrTy) // CopyCtor
+ CGM.IntTy, // Flags
+ getThrowInfoRelativeType(CGM.Int8PtrTy), // TypeDescriptor
+ CGM.IntTy, // NonVirtualAdjustment
+ CGM.IntTy, // OffsetToVBPtr
+ CGM.IntTy, // VBTableIndex
+ CGM.IntTy, // Size
+ getThrowInfoRelativeType(CGM.Int8PtrTy) // CopyCtor
};
CatchableTypeType = llvm::StructType::create(
CGM.getLLVMContext(), FieldTypes, "eh.CatchableType");
@@ -759,7 +785,7 @@ class MicrosoftCXXABI : public CGCXXABI {
llvm::SmallString<23> CTATypeName("eh.CatchableTypeArray.");
CTATypeName += llvm::utostr(NumEntries);
- llvm::Type *CTType = getImageRelativeType(CGM.DefaultPtrTy);
+ llvm::Type *CTType = getThrowInfoRelativeType(CGM.DefaultPtrTy);
llvm::Type *FieldTypes[] = {
CGM.IntTy, // NumEntries
llvm::ArrayType::get(CTType, NumEntries) // CatchableTypes
@@ -773,10 +799,10 @@ class MicrosoftCXXABI : public CGCXXABI {
if (ThrowInfoType)
return ThrowInfoType;
llvm::Type *FieldTypes[] = {
- CGM.IntTy, // Flags
- getImageRelativeType(CGM.Int8PtrTy), // CleanupFn
- getImageRelativeType(CGM.Int8PtrTy), // ForwardCompat
- getImageRelativeType(CGM.Int8PtrTy) // CatchableTypeArray
+ CGM.IntTy, // Flags
+ getThrowInfoRelativeType(CGM.Int8PtrTy), // CleanupFn
+ getThrowInfoRelativeType(CGM.Int8PtrTy), // ForwardCompat
+ getThrowInfoRelativeType(CGM.Int8PtrTy) // CatchableTypeArray
};
ThrowInfoType = llvm::StructType::create(CGM.getLLVMContext(), FieldTypes,
"eh.ThrowInfo");
@@ -4277,11 +4303,11 @@ llvm::Constant *MicrosoftCXXABI::getCatchableType(QualType T,
VBPtrOffset, VBIndex, Out);
}
if (llvm::GlobalVariable *GV = CGM.getModule().getNamedGlobal(MangledName))
- return getImageRelativeConstant(GV);
+ return getThrowInfoRelativeConstant(GV);
// The TypeDescriptor is used by the runtime to determine if a catch handler
// is appropriate for the exception object.
- llvm::Constant *TD = getImageRelativeConstant(getAddrOfRTTIDescriptor(T));
+ llvm::Constant *TD = getThrowInfoRelativeConstant(getAddrOfRTTIDescriptor(T));
// The runtime is responsible for calling the copy constructor if the
// exception is caught by value.
@@ -4294,7 +4320,7 @@ llvm::Constant *MicrosoftCXXABI::getCatchableType(QualType T,
} else {
CopyCtor = llvm::Constant::getNullValue(CGM.Int8PtrTy);
}
- CopyCtor = getImageRelativeConstant(CopyCtor);
+ CopyCtor = getThrowInfoRelativeConstant(CopyCtor);
bool IsScalar = !RD;
bool HasVirtualBases = false;
@@ -4335,7 +4361,7 @@ llvm::Constant *MicrosoftCXXABI::getCatchableType(QualType T,
GV->setSection(".xdata");
if (GV->isWeakForLinker())
GV->setComdat(CGM.getModule().getOrInsertComdat(GV->getName()));
- return getImageRelativeConstant(GV);
+ return getThrowInfoRelativeConstant(GV);
}
llvm::GlobalVariable *MicrosoftCXXABI::getCatchableTypeArray(QualType T) {
@@ -4431,7 +4457,7 @@ llvm::GlobalVariable *MicrosoftCXXABI::getCatchableTypeArray(QualType T) {
CatchableTypes.insert(getCatchableType(getContext().VoidPtrTy));
uint32_t NumEntries = CatchableTypes.size();
- llvm::Type *CTType = getImageRelativeType(CGM.DefaultPtrTy);
+ llvm::Type *CTType = getThrowInfoRelativeType(CGM.DefaultPtrTy);
llvm::ArrayType *AT = llvm::ArrayType::get(CTType, NumEntries);
llvm::StructType *CTAType = getCatchableTypeArrayType(NumEntries);
llvm::Constant *Fields[] = {
@@ -4502,12 +4528,12 @@ llvm::GlobalVariable *MicrosoftCXXABI::getThrowInfo(QualType T) {
CleanupFn = CGM.getAddrOfCXXStructor(GlobalDecl(DtorD, Dtor_Complete));
// This is unused as far as we can tell, initialize it to null.
llvm::Constant *ForwardCompat =
- getImageRelativeConstant(llvm::Constant::getNullValue(CGM.Int8PtrTy));
- llvm::Constant *PointerToCatchableTypes = getImageRelativeConstant(CTA);
+ getThrowInfoRelativeConstant(llvm::Constant::getNullValue(CGM.Int8PtrTy));
+ llvm::Constant *PointerToCatchableTypes = getThrowInfoRelativeConstant(CTA);
llvm::StructType *TIType = getThrowInfoType();
llvm::Constant *Fields[] = {
llvm::ConstantInt::get(CGM.IntTy, Flags), // Flags
- getImageRelativeConstant(CleanupFn), // CleanupFn
+ getThrowInfoRelativeConstant(CleanupFn), // CleanupFn
ForwardCompat, // ForwardCompat
PointerToCatchableTypes // CatchableTypeArray
};
diff --git a/clang/test/CodeGenCXX/microsoft-abi-throw-arm.cpp b/clang/test/CodeGenCXX/microsoft-abi-throw-arm.cpp
new file mode 100644
index 00000000000000..5b31a5c23bbd0b
--- /dev/null
+++ b/clang/test/CodeGenCXX/microsoft-abi-throw-arm.cpp
@@ -0,0 +1,49 @@
+// On 32-bit Arm Windows the throw information is image-relative, as on 64-bit
+// targets, and the RTTI stays absolute. 32-bit x86 keeps absolute pointers.
+
+// RUN: %clang_cc1 -emit-llvm -o - -triple=thumbv7-windows-msvc -std=c++17 %s -fcxx-exceptions -fexceptions -fms-extensions | FileCheck %s --check-prefix=ARM
+// RUN: %clang_cc1 -emit-llvm -o - -triple=i686-windows-msvc -std=c++17 %s -fcxx-exceptions -fexceptions -fms-extensions | FileCheck %s --check-prefix=X86 --implicit-check-not=__ImageBase
+
+// ARM-DAG: %eh.CatchableType = type { i32, i32, i32, i32, i32, i32, i32 }
+// ARM-DAG: %eh.CatchableTypeArray.1 = type { i32, [1 x i32] }
+// ARM-DAG: %eh.CatchableTypeArray.2 = type { i32, [2 x i32] }
+// ARM-DAG: %eh.ThrowInfo = type { i32, i32, i32, i32 }
+// ARM-DAG: %rtti.CompleteObjectLocator = type { i32, i32, i32, ptr, ptr }
+// ARM-DAG: %rtti.ClassHierarchyDescriptor = type { i32, i32, i32, ptr }
+// ARM-DAG: %rtti.BaseClassDescriptor = type { ptr, i32, i32, i32, i32, i32, ptr }
+
+// ARM-DAG: @"_CT??_R0?AUD@@@8??0D@@QAA at ABU0@@Z4" = linkonce_odr unnamed_addr constant %eh.CatchableType { i32 0, i32 sub nuw nsw (i32 ptrtoint (ptr @"??_R0?AUD@@@8" to i32), i32 ptrtoint (ptr @__ImageBase to i32)), i32 0, i32 -1, i32 0, i32 4, i32 sub nuw nsw (i32 ptrtoint (ptr @"??0D@@QAA at ABU0@@Z" to i32), i32 ptrtoint (ptr @__ImageBase to i32)) }, section ".xdata", comdat
+// ARM-DAG: @"_CTA2?AUD@@" = linkonce_odr unnamed_addr constant %eh.CatchableTypeArray.2 { i32 2, [2 x i32] [i32 sub nuw nsw (i32 ptrtoint (ptr @"_CT??_R0?AUD@@@8??0D@@QAA at ABU0@@Z4" to i32), i32 ptrtoint (ptr @__ImageBase to i32)), i32 sub nuw nsw (i32 ptrtoint (ptr @"_CT??_R0?AUB@@@8??0B@@QAA at ABU0@@Z4" to i32), i32 ptrtoint (ptr @__ImageBase to i32))] }, section ".xdata", comdat
+// ARM-DAG: @"_TI2?AUD@@" = linkonce_odr unnamed_addr constant %eh.ThrowInfo { i32 0, i32 sub nuw nsw (i32 ptrtoint (ptr @"??1D@@UAA at XZ" to i32), i32 ptrtoint (ptr @__ImageBase to i32)), i32 0, i32 sub nuw nsw (i32 ptrtoint (ptr @"_CTA2?AUD@@" to i32), i32 ptrtoint (ptr @__ImageBase to i32)) }, section ".xdata", comdat
+// ARM-DAG: @"_CT??_R0H at 84" = linkonce_odr unnamed_addr constant %eh.CatchableType { i32 1, i32 sub nuw nsw (i32 ptrtoint (ptr @"??_R0H at 8" to i32), i32 ptrtoint (ptr @__ImageBase to i32)), i32 0, i32 -1, i32 0, i32 4, i32 0 }, section ".xdata", comdat
+// ARM-DAG: @_TI1H = linkonce_odr unnamed_addr constant %eh.ThrowInfo { i32 0, i32 0, i32 0, i32 sub nuw nsw (i32 ptrtoint (ptr @_CTA1H to i32), i32 ptrtoint (ptr @__ImageBase to i32)) }, section ".xdata", comdat
+// ARM-DAG: @"??_R4B@@6B@" = linkonce_odr constant %rtti.CompleteObjectLocator { i32 0, i32 0, i32 0, ptr @"??_R0?AUB@@@8", ptr @"??_R3B@@8" }, comdat
+// ARM-DAG: @"??_R1A@?0A at EA@B@@8" = linkonce_odr constant %rtti.BaseClassDescriptor { ptr @"??_R0?AUB@@@8", i32 0, i32 0, i32 -1, i32 0, i32 64, ptr @"??_R3B@@8" }, comdat
+// ARM-DAG: @__ImageBase = external dso_local constant i8
+
+// X86-DAG: %eh.CatchableType = type { i32, ptr, i32, i32, i32, i32, ptr }
+// X86-DAG: %eh.CatchableTypeArray.2 = type { i32, [2 x ptr] }
+// X86-DAG: %eh.ThrowInfo = type { i32, ptr, ptr, ptr }
+// X86-DAG: @"_TI2?AUD@@" = linkonce_odr unnamed_addr constant %eh.ThrowInfo { i32 0, ptr @"??1D@@UAE at XZ", ptr null, ptr @"_CTA2?AUD@@" }, section ".xdata", comdat
+// X86-DAG: @"_CT??_R0H at 84" = linkonce_odr unnamed_addr constant %eh.CatchableType { i32 1, ptr @"??_R0H at 8", i32 0, i32 -1, i32 0, i32 4, ptr null }, section ".xdata", comdat
+
+struct B {
+ virtual ~B();
+};
+struct D : B {
+ D();
+ D(const D &);
+ ~D();
+};
+B::~B() {}
+
+// The throw still passes the ThrowInfo by address.
+// ARM-LABEL: define dso_local arm_aapcs_vfpcc void @"?throwD@@YAXABUD@@@Z"
+// ARM: call arm_aapcs_vfpcc void @_CxxThrowException(ptr %{{.*}}, ptr @"_TI2?AUD@@")
+// X86-LABEL: define dso_local void @"?throwD@@YAXABUD@@@Z"
+// X86: call void @_CxxThrowException(ptr %{{.*}}, ptr @"_TI2?AUD@@")
+void throwD(const D &d) { throw d; }
+
+// ARM-LABEL: define dso_local arm_aapcs_vfpcc void @"?throwInt@@YAXXZ"
+// ARM: call arm_aapcs_vfpcc void @_CxxThrowException(ptr %{{.*}}, ptr @_TI1H)
+void throwInt() { throw 1; }
>From b9ff2313446ea703a1be02891fa1e15f88990580 Mon Sep 17 00:00:00 2001
From: hamed7ir <hamedghorbani17 at live.com>
Date: Mon, 9 Nov 2026 18:06:03 -0800
Subject: [PATCH 2/2] Rename isImageRelative and do not pass null to the
relative helpers
Assisted-by: Claude Opus 5.5 (Anthropic)
---
clang/lib/CodeGen/MicrosoftCXXABI.cpp | 32 +++++++++++++--------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/clang/lib/CodeGen/MicrosoftCXXABI.cpp b/clang/lib/CodeGen/MicrosoftCXXABI.cpp
index 271fd814dfe972..89447f4f97a03d 100644
--- a/clang/lib/CodeGen/MicrosoftCXXABI.cpp
+++ b/clang/lib/CodeGen/MicrosoftCXXABI.cpp
@@ -497,7 +497,7 @@ class MicrosoftCXXABI : public CGCXXABI {
friend struct MSRTTIBuilder;
- bool isImageRelative() const {
+ bool isRTTIImageRelative() const {
return CGM.getTarget().getPointerWidth(LangAS::Default) == 64;
}
@@ -506,7 +506,7 @@ class MicrosoftCXXABI : public CGCXXABI {
// not.
bool isThrowInfoImageRelative() const {
const llvm::Triple &T = CGM.getTarget().getTriple();
- return isImageRelative() || T.isARM() || T.isThumb();
+ return isRTTIImageRelative() || T.isARM() || T.isThumb();
}
// 5 routines for constructing the llvm types for MS RTTI structs.
@@ -527,7 +527,7 @@ class MicrosoftCXXABI : public CGCXXABI {
}
llvm::Type *getImageRelativeType(llvm::Type *PtrType) {
- if (!isImageRelative())
+ if (!isRTTIImageRelative())
return PtrType;
return CGM.IntTy;
}
@@ -572,7 +572,7 @@ class MicrosoftCXXABI : public CGCXXABI {
getImageRelativeType(CGM.VoidTy),
};
llvm::ArrayRef<llvm::Type *> FieldTypesRef(FieldTypes);
- if (!isImageRelative())
+ if (!isRTTIImageRelative())
FieldTypesRef = FieldTypesRef.drop_back();
CompleteObjectLocatorType =
llvm::StructType::create(FieldTypesRef, "rtti.CompleteObjectLocator");
@@ -593,7 +593,7 @@ class MicrosoftCXXABI : public CGCXXABI {
}
llvm::Constant *getImageRelativeConstant(llvm::Constant *PtrVal) {
- if (!isImageRelative())
+ if (!isRTTIImageRelative())
return PtrVal;
return getImageRelativeOffset(PtrVal);
}
@@ -611,9 +611,6 @@ class MicrosoftCXXABI : public CGCXXABI {
}
llvm::Constant *getImageRelativeOffset(llvm::Constant *PtrVal) {
- if (PtrVal->isNullValue())
- return llvm::Constant::getNullValue(CGM.IntTy);
-
llvm::Constant *ImageBaseAsInt =
llvm::ConstantExpr::getPtrToInt(getImageBase(), CGM.IntPtrTy);
llvm::Constant *PtrValAsInt =
@@ -3992,7 +3989,7 @@ MSRTTIBuilder::getCompleteObjectLocator(const VPtrInfo &Info) {
// Initialize the CompleteObjectLocator.
llvm::Constant *Fields[] = {
- llvm::ConstantInt::get(CGM.IntTy, ABI.isImageRelative()),
+ llvm::ConstantInt::get(CGM.IntTy, ABI.isRTTIImageRelative()),
llvm::ConstantInt::get(CGM.IntTy, OffsetToTop),
llvm::ConstantInt::get(CGM.IntTy, VFPtrOffset),
ABI.getImageRelativeConstant(
@@ -4001,7 +3998,7 @@ MSRTTIBuilder::getCompleteObjectLocator(const VPtrInfo &Info) {
ABI.getImageRelativeConstant(COL),
};
llvm::ArrayRef<llvm::Constant *> FieldsRef(Fields);
- if (!ABI.isImageRelative())
+ if (!ABI.isRTTIImageRelative())
FieldsRef = FieldsRef.drop_back();
COL->setInitializer(llvm::ConstantStruct::get(Type, FieldsRef));
if (COL->isWeakForLinker())
@@ -4317,10 +4314,11 @@ llvm::Constant *MicrosoftCXXABI::getCatchableType(QualType T,
CopyCtor = getAddrOfCXXCtorClosure(CD, Ctor_CopyingClosure);
else
CopyCtor = CGM.getAddrOfCXXStructor(GlobalDecl(CD, Ctor_Complete));
+ CopyCtor = getThrowInfoRelativeConstant(CopyCtor);
} else {
- CopyCtor = llvm::Constant::getNullValue(CGM.Int8PtrTy);
+ CopyCtor =
+ llvm::Constant::getNullValue(getThrowInfoRelativeType(CGM.Int8PtrTy));
}
- CopyCtor = getThrowInfoRelativeConstant(CopyCtor);
bool IsScalar = !RD;
bool HasVirtualBases = false;
@@ -4521,19 +4519,21 @@ llvm::GlobalVariable *MicrosoftCXXABI::getThrowInfo(QualType T) {
// The cleanup-function (a destructor) must be called when the exception
// object's lifetime ends.
- llvm::Constant *CleanupFn = llvm::Constant::getNullValue(CGM.Int8PtrTy);
+ llvm::Constant *CleanupFn =
+ llvm::Constant::getNullValue(getThrowInfoRelativeType(CGM.Int8PtrTy));
if (const CXXRecordDecl *RD = T->getAsCXXRecordDecl())
if (CXXDestructorDecl *DtorD = RD->getDestructor())
if (!DtorD->isTrivial())
- CleanupFn = CGM.getAddrOfCXXStructor(GlobalDecl(DtorD, Dtor_Complete));
+ CleanupFn = getThrowInfoRelativeConstant(
+ CGM.getAddrOfCXXStructor(GlobalDecl(DtorD, Dtor_Complete)));
// This is unused as far as we can tell, initialize it to null.
llvm::Constant *ForwardCompat =
- getThrowInfoRelativeConstant(llvm::Constant::getNullValue(CGM.Int8PtrTy));
+ llvm::Constant::getNullValue(getThrowInfoRelativeType(CGM.Int8PtrTy));
llvm::Constant *PointerToCatchableTypes = getThrowInfoRelativeConstant(CTA);
llvm::StructType *TIType = getThrowInfoType();
llvm::Constant *Fields[] = {
llvm::ConstantInt::get(CGM.IntTy, Flags), // Flags
- getThrowInfoRelativeConstant(CleanupFn), // CleanupFn
+ CleanupFn, // CleanupFn
ForwardCompat, // ForwardCompat
PointerToCatchableTypes // CatchableTypeArray
};
More information about the cfe-commits
mailing list