This is an archive of the discontinued LLVM Phabricator instance.

Differential D8048

TypePrinter print __restrict if not in C99 mode
ClosedPublic

Authored by jpienaar on Mar 3 2015, 3:31 PM.

Details

Reviewers
eliben
rnk
Summary

restrict is a keyword in C99 but not in C++ while clang accepts restrict for C++ code. Modify the TypePrinter to print restrict when not processing C99 code.

Printing restrict in C++ was problematic as printing the argument of

int f(int * __restrict a) { ... }

resulted in

int *restrict a

which is incorrect.

Diff Detail

Event Timeline

jpienaar updated this revision to Diff 21150.Mar 3 2015, 3:31 PM
jpienaar retitled this revision from to TypePrinter print __restrict if not in C99 mode.
jpienaar updated this object.
jpienaar edited the test plan for this revision. (Show Details)
jpienaar added reviewers: eliben, rnk.
jpienaar added a subscriber: Unknown Object (MLST).
rnk accepted this revision.Mar 3 2015, 3:57 PM
rnk edited edge metadata.

lgtm

This revision is now accepted and ready to land.Mar 3 2015, 3:57 PM
eliben accepted this revision.Mar 3 2015, 3:58 PM
eliben edited edge metadata.

LGTM

Eugene.Zelenko closed this revision.Sep 28 2016, 2:40 PM
Eugene.Zelenko added a subscriber: Eugene.Zelenko.

Committed in rL231179.

Revision Contents

PathSize
lib/
AST/
16 lines
test/
SemaCXX/
8 lines

Diff 21150

lib/AST/TypePrinter.cpp

Context not available.
}; };
} }
static void AppendTypeQualList(raw_ostream &OS, unsigned TypeQuals) { static void AppendTypeQualList(raw_ostream &OS, unsigned TypeQuals, bool C99) {
bool appendSpace = false; bool appendSpace = false;
if (TypeQuals & Qualifiers::Const) { if (TypeQuals & Qualifiers::Const) {
OS << "const"; OS << "const";
Context not available.
} }
if (TypeQuals & Qualifiers::Restrict) { if (TypeQuals & Qualifiers::Restrict) {
if (appendSpace) OS << ' '; if (appendSpace) OS << ' ';
OS << "restrict"; if (C99) {
OS << "restrict";
} else {
OS << "__restrict";
}
} }
} }
Context not available.
raw_ostream &OS) { raw_ostream &OS) {
OS << '['; OS << '[';
if (T->getIndexTypeQualifiers().hasQualifiers()) { if (T->getIndexTypeQualifiers().hasQualifiers()) {
AppendTypeQualList(OS, T->getIndexTypeCVRQualifiers()); AppendTypeQualList(OS, T->getIndexTypeCVRQualifiers(), Policy.LangOpts.C99);
OS << ' '; OS << ' ';
} }
Context not available.
raw_ostream &OS) { raw_ostream &OS) {
OS << '['; OS << '[';
if (T->getIndexTypeQualifiers().hasQualifiers()) { if (T->getIndexTypeQualifiers().hasQualifiers()) {
AppendTypeQualList(OS, T->getIndexTypeCVRQualifiers()); AppendTypeQualList(OS, T->getIndexTypeCVRQualifiers(), Policy.LangOpts.C99);
OS << ' '; OS << ' ';
} }
Context not available.
if (unsigned quals = T->getTypeQuals()) { if (unsigned quals = T->getTypeQuals()) {
OS << ' '; OS << ' ';
AppendTypeQualList(OS, quals); AppendTypeQualList(OS, quals, Policy.LangOpts.C99);
} }
switch (T->getRefQualifier()) { switch (T->getRefQualifier()) {
Context not available.
unsigned quals = getCVRQualifiers(); unsigned quals = getCVRQualifiers();
if (quals) { if (quals) {
AppendTypeQualList(OS, quals); AppendTypeQualList(OS, quals, Policy.LangOpts.C99);
addSpace = true; addSpace = true;
} }
if (unsigned addrspace = getAddressSpace()) { if (unsigned addrspace = getAddressSpace()) {
Context not available.

test/SemaCXX/addr-of-overloaded-function.cpp

Context not available.
void (Qualifiers::*X)(); void (Qualifiers::*X)();
X = &Qualifiers::C; // expected-error-re {{assigning to 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}}' from incompatible type 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}} const': different qualifiers (none vs const)}} X = &Qualifiers::C; // expected-error-re {{assigning to 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}}' from incompatible type 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}} const': different qualifiers (none vs const)}}
X = &Qualifiers::V; // expected-error-re{{assigning to 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}}' from incompatible type 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}} volatile': different qualifiers (none vs volatile)}} X = &Qualifiers::V; // expected-error-re{{assigning to 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}}' from incompatible type 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}} volatile': different qualifiers (none vs volatile)}}
X = &Qualifiers::R; // expected-error-re{{assigning to 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}}' from incompatible type 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}} restrict': different qualifiers (none vs restrict)}} X = &Qualifiers::R; // expected-error-re{{assigning to 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}}' from incompatible type 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}} __restrict': different qualifiers (none vs restrict)}}
X = &Qualifiers::CV; // expected-error-re{{assigning to 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}}' from incompatible type 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}} const volatile': different qualifiers (none vs const and volatile)}} X = &Qualifiers::CV; // expected-error-re{{assigning to 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}}' from incompatible type 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}} const volatile': different qualifiers (none vs const and volatile)}}
X = &Qualifiers::CR; // expected-error-re{{assigning to 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}}' from incompatible type 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}} const restrict': different qualifiers (none vs const and restrict)}} X = &Qualifiers::CR; // expected-error-re{{assigning to 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}}' from incompatible type 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}} const __restrict': different qualifiers (none vs const and restrict)}}
X = &Qualifiers::VR; // expected-error-re{{assigning to 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}}' from incompatible type 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}} volatile restrict': different qualifiers (none vs volatile and restrict)}} X = &Qualifiers::VR; // expected-error-re{{assigning to 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}}' from incompatible type 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}} volatile __restrict': different qualifiers (none vs volatile and restrict)}}
X = &Qualifiers::CVR; // expected-error-re{{assigning to 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}}' from incompatible type 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}} const volatile restrict': different qualifiers (none vs const, volatile, and restrict)}} X = &Qualifiers::CVR; // expected-error-re{{assigning to 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}}' from incompatible type 'void (test1::Qualifiers::*)(){{( __attribute__\(\(thiscall\)\))?}} const volatile __restrict': different qualifiers (none vs const, volatile, and restrict)}}
} }
struct Dummy { struct Dummy {
Context not available.