This is an archive of the discontinued LLVM Phabricator instance.

Differential D69995

[clang][IFS] Adding support for processing more decl types in clang interface stubs.
ClosedPublic

Authored by plotfi on Nov 8 2019, 1:54 AM.

Details

Reviewers
compnerd
Commits
rG79e345fbcc82: [clang][IFS] Adds support for more decl types in clang interface stubs.
Summary

This patch adds support for more decl types that need to be processable, as part of clang-ifs hardening.

Diff Detail

Event Timeline

plotfi created this revision.Nov 8 2019, 1:54 AM
Herald added a project: Restricted Project. · View Herald TranscriptNov 8 2019, 1:54 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
compnerd accepted this revision.Nov 8 2019, 9:22 AM
compnerd added inline comments.
clang/lib/Frontend/InterfaceStubFunctionsConsumer.cpp
202

Not sure if I prefer this or:

if (!ND->getIdentifier())
  return true;
const auto *VD = cast<VarDecl>(ND);
if (VD->isTemplated() || VD->getType()->isDependent())
  return true;
This revision is now accepted and ready to land.Nov 8 2019, 9:22 AM
Closed by commit rG79e345fbcc82: [clang][IFS] Adds support for more decl types in clang interface stubs. (authored by plotfi). · Explain WhyNov 8 2019, 5:54 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 228551

clang/lib/Frontend/InterfaceStubFunctionsConsumer.cpp

Show First 20 Lines • Show All 176 Lines • ▼ Show 20 Lines case Decl::Kind::FunctionTemplate:
HandleTemplateSpecializations(*cast<FunctionTemplateDecl>(ND), Symbols, HandleTemplateSpecializations(*cast<FunctionTemplateDecl>(ND), Symbols,
RDO); RDO);
return true; return true;
case Decl::Kind::Record: case Decl::Kind::Record:
case Decl::Kind::Typedef: case Decl::Kind::Typedef:
case Decl::Kind::Enum: case Decl::Kind::Enum:
case Decl::Kind::EnumConstant: case Decl::Kind::EnumConstant:
case Decl::Kind::TemplateTypeParm: case Decl::Kind::TemplateTypeParm:
case Decl::Kind::NonTypeTemplateParm:
case Decl::Kind::CXXConversion:
case Decl::Kind::UnresolvedUsingValue:
case Decl::Kind::Using:
case Decl::Kind::UsingShadow:
case Decl::Kind::TypeAliasTemplate:
case Decl::Kind::TypeAlias:
case Decl::Kind::VarTemplate:
case Decl::Kind::VarTemplateSpecialization:
case Decl::Kind::UsingDirective:
case Decl::Kind::TemplateTemplateParm:
case Decl::Kind::ClassTemplatePartialSpecialization:
case Decl::Kind::IndirectField:
return true;
case Decl::Kind::Var: {
// Bail on any VarDecl that either has no named symbol.
if (!ND->getIdentifier())
return true;
compnerdUnsubmitted
Not Done
ReplyInline Actions

Not sure if I prefer this or:

if (!ND->getIdentifier())
  return true;
const auto *VD = cast<VarDecl>(ND);
if (VD->isTemplated() || VD->getType()->isDependent())
  return true;
compnerd: Not sure if I prefer this or: ``` if (!ND->getIdentifier()) return true; const auto *VD =…
const auto *VD = cast<VarDecl>(ND);
// Bail on any VarDecl that is a dependent or templated type.
if (VD->isTemplated() || VD->getType()->isDependentType())
return true; return true;
case Decl::Kind::Var: if (WriteNamedDecl(ND, Symbols, RDO))
return true;
break;
}
case Decl::Kind::ParmVar: case Decl::Kind::ParmVar:
case Decl::Kind::CXXMethod: case Decl::Kind::CXXMethod:
case Decl::Kind::CXXConstructor: case Decl::Kind::CXXConstructor:
case Decl::Kind::CXXDestructor: case Decl::Kind::CXXDestructor:
case Decl::Kind::Function: case Decl::Kind::Function:
case Decl::Kind::Field: case Decl::Kind::Field:
if (WriteNamedDecl(ND, Symbols, RDO)) if (WriteNamedDecl(ND, Symbols, RDO))
return true; return true;
▲ Show 20 Lines • Show All 51 Lines • ▼ Show 20 Lines if (Instance.getLangOpts().DelayedTemplateParsing) {
} }
} }
for (const NamedDecl *ND : v.ValueDecls) for (const NamedDecl *ND : v.ValueDecls)
HandleNamedDecl(ND, Symbols, FromTU); HandleNamedDecl(ND, Symbols, FromTU);
for (const NamedDecl *ND : v.NamedDecls) for (const NamedDecl *ND : v.NamedDecls)
HandleNamedDecl(ND, Symbols, FromTU); HandleNamedDecl(ND, Symbols, FromTU);
auto writeIfsV1 = auto writeIfsV1 = [this](const llvm::Triple &T,
[this](const llvm::Triple &T, const MangledSymbols &Symbols, const MangledSymbols &Symbols,
const ASTContext &context, StringRef Format, const ASTContext &context, StringRef Format,
raw_ostream &OS) -> void { raw_ostream &OS) -> void {
OS << "--- !" << Format << "\n"; OS << "--- !" << Format << "\n";
OS << "IfsVersion: 1.0\n"; OS << "IfsVersion: 1.0\n";
OS << "Triple: " << T.str() << "\n"; OS << "Triple: " << T.str() << "\n";
OS << "ObjectFileFormat: " << "ELF" << "\n"; // TODO: For now, just ELF. OS << "ObjectFileFormat: "
<< "ELF"
<< "\n"; // TODO: For now, just ELF.
OS << "Symbols:\n"; OS << "Symbols:\n";
for (const auto &E : Symbols) { for (const auto &E : Symbols) {
const MangledSymbol &Symbol = E.second; const MangledSymbol &Symbol = E.second;
for (auto Name : Symbol.Names) { for (auto Name : Symbol.Names) {
OS << " \"" OS << " \""
<< (Symbol.ParentName.empty() || Instance.getLangOpts().CPlusPlus << (Symbol.ParentName.empty() || Instance.getLangOpts().CPlusPlus
? "" ? ""
: (Symbol.ParentName + ".")) : (Symbol.ParentName + "."))
Show All 39 Lines

clang/test/InterfaceStubs/class-template-partial-specialization.cpp

  • This file was added.
// RUN: %clang -c -o - -emit-interface-stubs %s | FileCheck %s
// CHECK: --- !experimental-ifs-v1
// CHECK-NEXT: IfsVersion: 1.0
// CHECK-NEXT: Triple: x86_64-unknown-linux-gnu
// CHECK-NEXT: ObjectFileFormat: ELF
// CHECK-NEXT: Symbols:
// CHECK-NEXT: ...
template<typename> struct S7 { };
template<typename T> struct S7<T&> { };
No newline at end of file

clang/test/InterfaceStubs/cxx-conversion.cpp

  • This file was added.
// RUN: %clang -c -o - -emit-interface-stubs %s | FileCheck %s
// CHECK: --- !experimental-ifs-v1
// CHECK-NEXT: IfsVersion: 1.0
// CHECK-NEXT: Triple: x86_64-unknown-linux-gnu
// CHECK-NEXT: ObjectFileFormat: ELF
// CHECK-NEXT: Symbols:
// CHECK-NEXT: ...
template<typename T> class C1 {
long a;
operator long() const { return a; }
};
No newline at end of file

clang/test/InterfaceStubs/indirect-field-decl.cpp

  • This file was added.
// RUN: %clang -c -o - -emit-interface-stubs %s | FileCheck %s
// CHECK: --- !experimental-ifs-v1
// CHECK-NEXT: IfsVersion: 1.0
// CHECK-NEXT: Triple: x86_64-unknown-linux-gnu
// CHECK-NEXT: ObjectFileFormat: ELF
// CHECK-NEXT: Symbols:
// CHECK-NEXT: ...
template<typename T> class C2 { union { T c; }; };
No newline at end of file

clang/test/InterfaceStubs/namespace.cpp

  • This file was added.
// RUN: %clang -c -o - -emit-interface-stubs %s | FileCheck %s
// CHECK: --- !experimental-ifs-v1
// CHECK-NEXT: IfsVersion: 1.0
// CHECK-NEXT: Triple: x86_64-unknown-linux-gnu
// CHECK-NEXT: ObjectFileFormat: ELF
// CHECK-NEXT: Symbols:
// CHECK-NEXT: ...
namespace NS1 { }
using namespace NS1;
No newline at end of file

clang/test/InterfaceStubs/non-type-template-parm-decl.cpp

  • This file was added.
// RUN: %clang -c -o - -emit-interface-stubs %s | FileCheck %s
// CHECK: --- !experimental-ifs-v1
// CHECK-NEXT: IfsVersion: 1.0
// CHECK-NEXT: Triple: x86_64-unknown-linux-gnu
// CHECK-NEXT: ObjectFileFormat: ELF
// CHECK-NEXT: Symbols:
// CHECK-NEXT: ...
template<bool T> struct S1 {};
No newline at end of file

clang/test/InterfaceStubs/template-constexpr.cpp

  • This file was added.
// RUN: %clang -c -o - -emit-interface-stubs %s | FileCheck %s
// CHECK: --- !experimental-ifs-v1
// CHECK-NEXT: IfsVersion: 1.0
// CHECK-NEXT: Triple: x86_64-unknown-linux-gnu
// CHECK-NEXT: ObjectFileFormat: ELF
// CHECK-NEXT: Symbols:
// CHECK-NEXT: ...
template<typename T, T v> struct S8 { static constexpr T value = v; };
template<typename T, T v> constexpr T S8<T, v>::value;
No newline at end of file

clang/test/InterfaceStubs/template-template-parm-decl.cpp

  • This file was added.
// RUN: %clang -c -o - -emit-interface-stubs %s | FileCheck %s
// CHECK: --- !experimental-ifs-v1
// CHECK-NEXT: IfsVersion: 1.0
// CHECK-NEXT: Triple: x86_64-unknown-linux-gnu
// CHECK-NEXT: ObjectFileFormat: ELF
// CHECK-NEXT: Symbols:
// CHECK-NEXT: ...
template<template<typename...> class a> struct S6 { };
No newline at end of file

clang/test/InterfaceStubs/trycatch.cpp

  • This file was added.
// REQUIRES: x86-registered-target
// RUN: %clang -target x86_64-unknown-linux-gnu -c -o - -emit-interface-stubs %s | FileCheck %s
// CHECK: --- !experimental-ifs-v1
// CHECK-NEXT: IfsVersion: 1.0
// CHECK-NEXT: Triple: x86_64-unknown-linux-gnu
// CHECK-NEXT: ObjectFileFormat: ELF
// CHECK-NEXT: Symbols:
// CHECK-NEXT: "_Z1fv" : { Type: Func }
// CHECK-NEXT: ...
class C5 {};
void f() { try {} catch(C5&){} }
No newline at end of file

clang/test/InterfaceStubs/usings.cpp

  • This file was added.
// RUN: %clang -c -o - -emit-interface-stubs %s | FileCheck %s
// CHECK: --- !experimental-ifs-v1
// CHECK-NEXT: IfsVersion: 1.0
// CHECK-NEXT: Triple: x86_64-unknown-linux-gnu
// CHECK-NEXT: ObjectFileFormat: ELF
// CHECK-NEXT: Symbols:
// CHECK-NEXT: ...
template<typename T> struct S2 { static unsigned f(); };
template<typename T> struct S3 { using S2<T>::f; };
typedef struct {} S4;
using ::S4;
template<typename T, T t> struct C3{};
template<bool b> using U1 = C3<bool, b>;
No newline at end of file

clang/test/InterfaceStubs/var-template-specialization-decl.cpp

  • This file was added.
// REQUIRES: x86-registered-target
// RUN: %clang -target x86_64-unknown-linux-gnu -c -o - -emit-interface-stubs %s | FileCheck %s
// CHECK: --- !experimental-ifs-v1
// CHECK-NEXT: IfsVersion: 1.0
// CHECK-NEXT: Triple: x86_64-unknown-linux-gnu
// CHECK-NEXT: ObjectFileFormat: ELF
// CHECK-NEXT: Symbols:
// CHECK-NEXT: "a" : { Type: Object, Size: 4 }
// CHECK-NEXT: ...
template<typename T, T v> struct S9 {
static constexpr T value = v;
};
template<typename T> struct S0 : public S9<bool, true> { };
template<typename T> constexpr bool CE2 = S0<T>::value;
int a = CE2<int>;
No newline at end of file