StarMirror/sandboxed-api
1
0
Fork 0
mirror of https://github.com/google/sandboxed-api.git synced 2024-03-22 13:11:30 +08:00
Code Issues Projects Releases Wiki Activity

clang_generator: Do not collect structs/unions if declared in another record

Browse Source 
The enclosing type is enough to reconstruct the AST when writing the header and this
change avoids emitting the same struct twice.

PiperOrigin-RevId: 435300029
Change-Id: I34bd660db5ba5c68b64cce73ecf2f026727ac57b
This commit is contained in:
Christian Blichmann 2022-03-17 03:29:36 -07:00 committed by Copybara-Service
parent 92ccfeae67
commit 4e71f1d0a3
5 changed files with 70 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sandboxed_api/tools/clang_generator/emitter.cc
View File

@ -399,8 +399,8 @@ void Emitter::CollectType(clang::QualType qual) {
decl = typedef_type->getDecl();
} else if (const auto* enum_type = qual->getAs<clang::EnumType>()) {
decl = enum_type->getDecl();
} else {
decl = qual->getAsRecordDecl();
} else if (const auto* record_type = qual->getAs<clang::RecordType>()) {
decl = record_type->getDecl();
}
if (!decl) {
return;

87
sandboxed_api/tools/clang_generator/emitter_test.cc
View File

@ -74,24 +74,18 @@ TEST_F(EmitterTest, RelatedTypes) {
size_t width;
size_t height;
};
struct ByValue {
int value;
};
struct ByValue { int value; };
extern "C" void Colorize(Channel* chan, ByValue v) {}
typedef struct { int member; } MyStruct;
extern "C" void Structize(MyStruct* s);
)",
)",
absl::make_unique<GeneratorAction>(emitter, GeneratorOptions()));
// Types from "std" should be skipped
EXPECT_THAT(emitter.rendered_types_["std"], IsEmpty());
std::vector<std::string> ugly_types;
for (const auto& type : emitter.rendered_types_[""]) {
ugly_types.push_back(Uglify(type));
}
EXPECT_THAT(ugly_types,
EXPECT_THAT(UglifyAll(emitter.rendered_types_[""]),
ElementsAre("typedef enum { kRed, kGreen, kBlue } Color",
"struct Channel {"
" Color color;"
@ -106,27 +100,19 @@ TEST_F(EmitterTest, NestedStruct) {
RunFrontendAction(
R"(
struct A {
struct B {
int number;
};
struct B { int number; };
B b;
int data;
};
extern "C" void Structize(A* s);
)",
)",
absl::make_unique<GeneratorAction>(emitter, GeneratorOptions()));
std::vector<std::string> ugly_types;
for (const auto& type : emitter.rendered_types_[""]) {
ugly_types.push_back(Uglify(type));
}
EXPECT_THAT(ugly_types, ElementsAre("struct A {"
" struct B {"
" int number;"
" };"
" A::B b;"
" int data; "
"}"));
EXPECT_THAT(UglifyAll(emitter.rendered_types_[""]),
ElementsAre("struct A {"
" struct B { int number; };"
" A::B b;"
" int data; }"));
}
TEST_F(EmitterTest, NestedAnonymousStruct) {
@ -134,25 +120,50 @@ TEST_F(EmitterTest, NestedAnonymousStruct) {
RunFrontendAction(
R"(
struct A {
struct {
int number;
} b;
struct { int number; } b;
int data;
};
extern "C" void Structize(A* s);
)",
)",
absl::make_unique<GeneratorAction>(emitter, GeneratorOptions()));
std::vector<std::string> ugly_types;
for (const auto& type : emitter.rendered_types_[""]) {
ugly_types.push_back(Uglify(type));
}
EXPECT_THAT(ugly_types, ElementsAre("struct A {"
" struct {"
" int number;"
" } b;"
" int data; "
"}"));
EXPECT_THAT(UglifyAll(emitter.rendered_types_[""]),
ElementsAre("struct A {"
" struct { int number; } b;"
" int data; }"));
}
TEST_F(EmitterTest, ParentNotCollected) {
EmitterForTesting emitter;
RunFrontendAction(
R"(
struct A {
struct B { int number; };
B b;
int data;
};
extern "C" void Structize(A::B* s);
)",
absl::make_unique<GeneratorAction>(emitter, GeneratorOptions()));
EXPECT_THAT(UglifyAll(emitter.rendered_types_[""]),
ElementsAre("struct A {"
" struct B { int number; };"
" A::B b;"
" int data; }"));
}
TEST_F(EmitterTest, RemoveQualifiers) {
EmitterForTesting emitter;
RunFrontendAction(
R"(
struct A { int data; };
extern "C" void Structize(const A* in, A* out);
)",
absl::make_unique<GeneratorAction>(emitter, GeneratorOptions()));
EXPECT_THAT(UglifyAll(emitter.rendered_types_[""]),
ElementsAre("struct A { int data; }"));
}
TEST(IncludeGuard, CreatesRandomizedGuardForEmptyFilename) {

10
sandboxed_api/tools/clang_generator/frontend_action_test_util.cc
View File

@ -14,6 +14,8 @@
#include "sandboxed_api/tools/clang_generator/frontend_action_test_util.h"
#include <algorithm>
#include <iterator>
#include <vector>
#include "absl/status/status.h"
@ -75,4 +77,12 @@ std::string Uglify(absl::string_view code) {
return result;
}
std::vector<std::string> UglifyAll(const std::vector<std::string>& snippets) {
std::vector<std::string> result;
result.reserve(snippets.size());
std::transform(snippets.cbegin(), snippets.cend(), std::back_inserter(result),
Uglify);
return result;
}
} // namespace sapi

2
sandboxed_api/tools/clang_generator/frontend_action_test_util.h
View File

@ -84,6 +84,8 @@ class FrontendActionTest : public ::testing::Test {
// well.
std::string Uglify(absl::string_view code);
std::vector<std::string> UglifyAll(const std::vector<std::string>& snippets);
} // namespace sapi
#endif // SANDBOXED_API_TOOLS_CLANG_GENERATOR_FRONTEND_ACTION_TEST_UTIL_H_

10
sandboxed_api/tools/clang_generator/types.cc
View File

@ -33,10 +33,9 @@ bool IsFunctionReferenceType(clang::QualType qual) {
} // namespace
void TypeCollector::CollectRelatedTypes(clang::QualType qual) {
if (seen_.count(qual) > 0) { // contains() is LLVM_VERSION_MAJOR >= 11
if (!seen_.insert(qual)) {
return;
}
seen_.insert(qual);
if (const auto* typedef_type = qual->getAs<clang::TypedefType>()) {
auto* typedef_decl = typedef_type->getDecl();
@ -95,7 +94,12 @@ void TypeCollector::CollectRelatedTypes(clang::QualType qual) {
for (const clang::FieldDecl* field : decl->fields()) {
CollectRelatedTypes(field->getType());
}
collected_.insert(qual);
// Do not collect structs/unions if they are declared within another
// record. The enclosing type is enough to reconstruct the AST when
// writing the header.
const clang::RecordDecl* outer = decl->getOuterLexicalRecordContext();
decl = outer ? outer : decl;
collected_.insert(clang::QualType(decl->getTypeForDecl(), 0));
return;
}
}