Skip to content

[clang][AArch64] Avoid a crash when a non-reserved register is used #117419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 6, 2024
Merged

[clang][AArch64] Avoid a crash when a non-reserved register is used #117419

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54fc788
[clang][AArch64] Avoid a crash when a non-reserved register is used
igorkudrin Nov 23, 2024
1f1fe3d
fixup: Improve tests
igorkudrin Nov 26, 2024
255ac95
fixup: also check w* registers
igorkudrin Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions clang/lib/Basic/Targets/AArch64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,13 +232,23 @@ bool AArch64TargetInfo::validateTarget(DiagnosticsEngine &Diags) const {

bool AArch64TargetInfo::validateGlobalRegisterVariable(
StringRef RegName, unsigned RegSize, bool &HasSizeMismatch) const {
if ((RegName == "sp") || RegName.starts_with("x")) {
HasSizeMismatch = RegSize != 64;
return true;
} else if (RegName.starts_with("w")) {
if (RegName.starts_with("w")) {
HasSizeMismatch = RegSize != 32;
return true;
}
if (RegName == "sp") {
HasSizeMismatch = RegSize != 64;
return true;
}
if (RegName.starts_with("x")) {
HasSizeMismatch = RegSize != 64;
// Check if the register is reserved. See also
// AArch64TargetLowering::getRegisterByName().
return RegName == "x0" ||
(RegName == "x18" &&
llvm::AArch64::isX18ReservedByDefault(getTriple())) ||
getTargetOpts().FeatureMap.lookup(("reserve-" + RegName).str());
Copy link
Member

@kawashima-fj kawashima-fj Nov 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To avoid the fatal error: error in backend: Invalid register name "x??" error in #109778, this check is sufficient.

I think the original purpose of rejecting a global register variable associated with a non-reserved register is to avoid unintended register use. w?? registers are lower half bits of the corresponding x?? registers. So when x?? register is not reserved, should we reject a global register variable associated with the corresponding w???

For this purpose, maybe the backend should also check w?? registers. Actually, old backend code checked w?? regsters.

Copy link
Collaborator Author

@igorkudrin igorkudrin Dec 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Since this patch is focused on fixing the crash, it doesn't seem appropriate to make AArch64TargetLowering::getRegisterByName() more restrictive here. However, I added checks for w?? registers in AArch64TargetInfo::validateGlobalRegisterVariable() and corresponding tests.

}
return false;
}

Expand Down
22 changes: 22 additions & 0 deletions clang/test/CodeGen/AArch64/fixed-register-global.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/// Check that -ffixed register handled for globals.
/// Regression test for #76426, #109778

// RUN: %clang -c --target=aarch64-none-gnu -ffixed-x15 %s 2>&1 | count 0

// RUN: not %clang -c --target=aarch64-none-gnu %s 2>&1 | \
// RUN: FileCheck %s --check-prefix=ERR_INVREG
// ERR_INVREG: error: register 'x15' unsuitable for global register variables on this target

// RUN: not %clang -c --target=aarch64-none-gnu -ffixed-x15 -DTYPE=short %s 2>&1 | \
// RUN: FileCheck %s --check-prefix=ERR_SIZE
// ERR_SIZE: error: size of register 'x15' does not match variable size

#ifndef TYPE
#define TYPE long
#endif

register TYPE x15 __asm__("x15");

TYPE foo() {
return x15;
}
12 changes: 0 additions & 12 deletions clang/test/Driver/aarch64-fixed-register-global.c
View file
Open in desktop

This file was deleted.

7 changes: 6 additions & 1 deletion clang/test/Sema/aarch64-fixed-global-register.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
// RUN: %clang_cc1 -triple aarch64-unknown-none-gnu %s -verify -fsyntax-only
// RUN: %clang_cc1 -triple aarch64-unknown-none-gnu %s -target-feature +reserve-x4 -target-feature +reserve-x15 -verify -verify=no_x18 -fsyntax-only
// RUN: %clang_cc1 -triple aarch64-unknown-android %s -target-feature +reserve-x4 -target-feature +reserve-x15 -verify -fsyntax-only

register long x0 __asm__ ("x0");
register char i1 __asm__ ("x15"); // expected-error {{size of register 'x15' does not match variable size}}
register long long l2 __asm__ ("w14"); // expected-error {{size of register 'w14' does not match variable size}}
register long x3 __asm__ ("x3"); // expected-error {{register 'x3' unsuitable for global register variables on this target}}
register long x4 __asm__ ("x4");
register long x18 __asm__ ("x18"); // no_x18-error {{register 'x18' unsuitable for global register variables on this target}}
Loading