This is an archive of the discontinued LLVM Phabricator instance.

Differential D95488

Itanium Mangling: In 'enable_if', omit X/E around <expr-primary>.
ClosedPublic

Authored by jyknight on Jan 26 2021, 3:49 PM.

Details

Reviewers
rsmith
rjmccall
Commits
rGa7246ba02a89: Itanium Mangling: In 'enable_if', omit X/E around <expr-primary>.
Summary

The Clang enable_if extension is mangled as an <extended-qualifier>,
which is supposed to contain <template-args>. However, we were
unconditionally emitting X/E around its arguments, neglecting the fact
that <expr-primary> should be emitted directly without the surrounding
X/E.

Diff Detail

Event Timeline

jyknight requested review of this revision.Jan 26 2021, 3:49 PM
jyknight created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptJan 26 2021, 3:49 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
jyknight mentioned this in D93922: Itanium Mangling: Mangle `__alignof__` differently than `alignof`..Jan 26 2021, 3:51 PM
Harbormaster completed remote builds in B86777: Diff 319424.Jan 26 2021, 4:18 PM
rjmccall accepted this revision.Jan 27 2021, 1:17 AM

LGTM

This revision is now accepted and ready to land.Jan 27 2021, 1:17 AM
jyknight updated this revision to Diff 319578.Jan 27 2021, 7:42 AM

Add neglected clang-abi-compat.cpp change.

Harbormaster completed remote builds in B86850: Diff 319578.Jan 27 2021, 7:43 AM
This revision was landed with ongoing or failed builds.Jan 27 2021, 1:52 PM
Closed by commit rGa7246ba02a89: Itanium Mangling: In 'enable_if', omit X/E around <expr-primary>. (authored by jyknight). · Explain Why
This revision was automatically updated to reflect the committed changes.
jyknight added a commit: rGa7246ba02a89: Itanium Mangling: In 'enable_if', omit X/E around <expr-primary>..

Revision Contents

PathSize
clang/
lib/
AST/
14 lines
test/
CodeGen/
34 lines
CodeGenCXX/
2 lines

Diff 319424

clang/lib/AST/ItaniumMangle.cpp

Show First 20 Lines • Show All 720 Lines • ▼ Show 20 Lines if (FD->hasAttr<EnableIfAttr>()) {
FunctionTypeDepthState Saved = FunctionTypeDepth.push(); FunctionTypeDepthState Saved = FunctionTypeDepth.push();
Out << "Ua9enable_ifI"; Out << "Ua9enable_ifI";
for (AttrVec::const_iterator I = FD->getAttrs().begin(), for (AttrVec::const_iterator I = FD->getAttrs().begin(),
E = FD->getAttrs().end(); E = FD->getAttrs().end();
I != E; ++I) { I != E; ++I) {
EnableIfAttr *EIA = dyn_cast<EnableIfAttr>(*I); EnableIfAttr *EIA = dyn_cast<EnableIfAttr>(*I);
if (!EIA) if (!EIA)
continue; continue;
if (Context.getASTContext().getLangOpts().getClangABICompat() >
LangOptions::ClangABI::Ver11) {
mangleTemplateArgExpr(EIA->getCond());
Lint: Pre-merge checks
Inline Actions

clang-tidy: error: use of undeclared identifier 'mangleTemplateArgExpr'; did you mean 'mangleTemplatePrefix'? [clang-diagnostic-error]
not useful
clang-tidy: error: no viable conversion from 'clang::Expr *' to 'clang::GlobalDecl' [clang-diagnostic-error]
not useful

Lint: Pre-merge checks: clang-tidy: error: use of undeclared identifier 'mangleTemplateArgExpr'; did you mean…
} else {
// Prior to Clang 12, we hardcoded the X/E around enable-if's argument,
// even though <template-arg> should not include an X/E around
// <expr-primary>.
Out << 'X'; Out << 'X';
mangleExpression(EIA->getCond()); mangleExpression(EIA->getCond());
Out << 'E'; Out << 'E';
} }
}
Out << 'E'; Out << 'E';
FunctionTypeDepth.pop(Saved); FunctionTypeDepth.pop(Saved);
} }
// When mangling an inheriting constructor, the bare function type used is // When mangling an inheriting constructor, the bare function type used is
// that of the inherited constructor. // that of the inherited constructor.
if (auto *CD = dyn_cast<CXXConstructorDecl>(FD)) if (auto *CD = dyn_cast<CXXConstructorDecl>(FD))
if (auto Inherited = CD->getInheritedConstructor()) if (auto Inherited = CD->getInheritedConstructor())
▲ Show 20 Lines • Show All 5,448 Lines • Show Last 20 Lines

clang/test/CodeGen/enable_if.c

Show All 25 Linesvoid test1() {
// CHECK: store i8* bitcast (void (i32)* @_Z3fooi to i8*) // CHECK: store i8* bitcast (void (i32)* @_Z3fooi to i8*)
vp1 = (void*)foo; vp1 = (void*)foo;
} }
void bar(int m) __attribute__((overloadable, enable_if(m > 0, ""))); void bar(int m) __attribute__((overloadable, enable_if(m > 0, "")));
void bar(int m) __attribute__((overloadable, enable_if(1, ""))); void bar(int m) __attribute__((overloadable, enable_if(1, "")));
// CHECK-LABEL: define{{.*}} void @test2 // CHECK-LABEL: define{{.*}} void @test2
void test2() { void test2() {
// CHECK: store void (i32)* @_Z3barUa9enable_ifIXLi1EEEi // CHECK: store void (i32)* @_Z3barUa9enable_ifILi1EEi
void (*p)(int) = bar; void (*p)(int) = bar;
// CHECK: store void (i32)* @_Z3barUa9enable_ifIXLi1EEEi // CHECK: store void (i32)* @_Z3barUa9enable_ifILi1EEi
void (*p2)(int) = &bar; void (*p2)(int) = &bar;
// CHECK: store void (i32)* @_Z3barUa9enable_ifIXLi1EEEi // CHECK: store void (i32)* @_Z3barUa9enable_ifILi1EEi
p = bar; p = bar;
// CHECK: store void (i32)* @_Z3barUa9enable_ifIXLi1EEEi // CHECK: store void (i32)* @_Z3barUa9enable_ifILi1EEi
p = &bar; p = &bar;
// CHECK: store i8* bitcast (void (i32)* @_Z3barUa9enable_ifIXLi1EEEi to i8*) // CHECK: store i8* bitcast (void (i32)* @_Z3barUa9enable_ifILi1EEi to i8*)
void *vp1 = (void*)&bar; void *vp1 = (void*)&bar;
// CHECK: store i8* bitcast (void (i32)* @_Z3barUa9enable_ifIXLi1EEEi to i8*) // CHECK: store i8* bitcast (void (i32)* @_Z3barUa9enable_ifILi1EEi to i8*)
void *vp2 = (void*)bar; void *vp2 = (void*)bar;
// CHECK: store i8* bitcast (void (i32)* @_Z3barUa9enable_ifIXLi1EEEi to i8*) // CHECK: store i8* bitcast (void (i32)* @_Z3barUa9enable_ifILi1EEi to i8*)
vp1 = (void*)&bar; vp1 = (void*)&bar;
// CHECK: store i8* bitcast (void (i32)* @_Z3barUa9enable_ifIXLi1EEEi to i8*) // CHECK: store i8* bitcast (void (i32)* @_Z3barUa9enable_ifILi1EEi to i8*)
vp1 = (void*)bar; vp1 = (void*)bar;
} }
void baz(int m) __attribute__((overloadable, enable_if(1, ""))); void baz(int m) __attribute__((overloadable, enable_if(1, "")));
void baz(int m) __attribute__((overloadable)); void baz(int m) __attribute__((overloadable));
// CHECK-LABEL: define{{.*}} void @test3 // CHECK-LABEL: define{{.*}} void @test3
void test3() { void test3() {
// CHECK: store void (i32)* @_Z3bazUa9enable_ifIXLi1EEEi // CHECK: store void (i32)* @_Z3bazUa9enable_ifILi1EEi
void (*p)(int) = baz; void (*p)(int) = baz;
// CHECK: store void (i32)* @_Z3bazUa9enable_ifIXLi1EEEi // CHECK: store void (i32)* @_Z3bazUa9enable_ifILi1EEi
void (*p2)(int) = &baz; void (*p2)(int) = &baz;
// CHECK: store void (i32)* @_Z3bazUa9enable_ifIXLi1EEEi // CHECK: store void (i32)* @_Z3bazUa9enable_ifILi1EEi
p = baz; p = baz;
// CHECK: store void (i32)* @_Z3bazUa9enable_ifIXLi1EEEi // CHECK: store void (i32)* @_Z3bazUa9enable_ifILi1EEi
p = &baz; p = &baz;
} }
enum { TRUEFACTS = 1 }; enum { TRUEFACTS = 1 };
void qux(int m) __attribute__((overloadable, enable_if(1, ""), void qux(int m) __attribute__((overloadable, enable_if(1, ""),
enable_if(TRUEFACTS, ""))); enable_if(TRUEFACTS, "")));
void qux(int m) __attribute__((overloadable, enable_if(1, ""))); void qux(int m) __attribute__((overloadable, enable_if(1, "")));
// CHECK-LABEL: define{{.*}} void @test4 // CHECK-LABEL: define{{.*}} void @test4
void test4() { void test4() {
// CHECK: store void (i32)* @_Z3quxUa9enable_ifIXLi1EEXLi1EEEi // CHECK: store void (i32)* @_Z3quxUa9enable_ifILi1ELi1EEi
void (*p)(int) = qux; void (*p)(int) = qux;
// CHECK: store void (i32)* @_Z3quxUa9enable_ifIXLi1EEXLi1EEEi // CHECK: store void (i32)* @_Z3quxUa9enable_ifILi1ELi1EEi
void (*p2)(int) = &qux; void (*p2)(int) = &qux;
// CHECK: store void (i32)* @_Z3quxUa9enable_ifIXLi1EEXLi1EEEi // CHECK: store void (i32)* @_Z3quxUa9enable_ifILi1ELi1EEi
p = qux; p = qux;
// CHECK: store void (i32)* @_Z3quxUa9enable_ifIXLi1EEXLi1EEEi // CHECK: store void (i32)* @_Z3quxUa9enable_ifILi1ELi1EEi
p = &qux; p = &qux;
} }
// There was a bug where, when enable_if was present, overload resolution // There was a bug where, when enable_if was present, overload resolution
// wouldn't pay attention to lower-priority attributes. // wouldn't pay attention to lower-priority attributes.
// (N.B. `foo` with pass_object_size should always be preferred) // (N.B. `foo` with pass_object_size should always be preferred)
// CHECK-LABEL: define{{.*}} void @test5 // CHECK-LABEL: define{{.*}} void @test5
void test5() { void test5() {
int foo(char *i) __attribute__((enable_if(1, ""), overloadable)); int foo(char *i) __attribute__((enable_if(1, ""), overloadable));
int foo(char *i __attribute__((pass_object_size(0)))) int foo(char *i __attribute__((pass_object_size(0))))
__attribute__((enable_if(1, ""), overloadable)); __attribute__((enable_if(1, ""), overloadable));
// CHECK: call i32 @_Z3fooUa9enable_ifIXLi1EEEPcU17pass_object_size0 // CHECK: call i32 @_Z3fooUa9enable_ifILi1EEPcU17pass_object_size0
foo((void*)0); foo((void*)0);
} }

clang/test/CodeGenCXX/enable_if.cpp

// RUN: %clang_cc1 -emit-llvm %s -o - -triple=x86_64-pc-linux-gnu | FileCheck %s // RUN: %clang_cc1 -emit-llvm %s -o - -triple=x86_64-pc-linux-gnu | FileCheck %s
// Test address-of overloading logic // Test address-of overloading logic
int test5(int); int test5(int);
template <typename T> template <typename T>
T test5(T) __attribute__((enable_if(1, "better than non-template"))); T test5(T) __attribute__((enable_if(1, "better than non-template")));
// CHECK: @_Z5test5IiEUa9enable_ifIXLi1EEET_S0_ // CHECK: @_Z5test5IiEUa9enable_ifILi1EET_S0_
int (*Ptr)(int) = &test5; int (*Ptr)(int) = &test5;
// Test itanium mangling for attribute enable_if // Test itanium mangling for attribute enable_if
// CHECK: _Z5test1Ua9enable_ifIXeqfL0p_Li1EEEi // CHECK: _Z5test1Ua9enable_ifIXeqfL0p_Li1EEEi
void test1(int i) __attribute__((enable_if(i == 1, ""))) {} void test1(int i) __attribute__((enable_if(i == 1, ""))) {}
void ext(); void ext();
Show All 13 Lines