Skip to content

Commit fe929aa

Browse files
scallananscallanan
committedDec 16, 2016
Testbed and skeleton of a new expression parser
LLVM's JIT is now the foundation of dynamic-compilation features for many languages. Clang also has low-level support for dynamic compilation (ASTImporter and ExternalASTSource, notably). How the compiler is set up for dynamic parsing is generally left up to individual clients, for example LLDB's C/C++/Objective-C expression parser and the ROOT project. Although this arrangement offers external clients the flexibility to implement dynamic features as they see fit, the lack of an in-tree client means that subtle bugs can be introduced that cause regressions in the external clients but aren't caught by tests (or users) until much later. LLDB for example regularly encounters complicated ODR violation scenarios where it is not immediately clear who is at fault. Other external clients (notably, Cling) rely on similar functionality, and another goal is to break this functionality up into composable parts so that any client can be built easily on top of Clang without requiring extensive additional code. I propose that the parts required to build a simple expression parser be added to Clang. Initially, I aim to have the following features: - A piece that looks up external declarations from a variety of sources (e.g., from previous dynamic compilations, from modules, or from DWARF) and uses clear conflict resolution rules to reconcile differences, with easily understood errors. This functionality will be supported by in-tree tests. - A piece that works hand in hand with the LLVM JIT to resolve the locations of external declarations so that e.g. variables can be redeclared and (for high-performance applications like DTrace) external variables can be accessed directly from the registers where they reside. This commit adds a tester that parses a sequence of source files and then uses them as source data for an expression. External references are resolved using an ExternalASTSource that responds to name queries using an ASTImporter. This is the setup that LLDB uses, and the motivating reason for MinimalImport in ASTImporter. When complete, this tester will implement the first of the above goals. Differential Revision: https://reviews.llvm.org/D27180 llvm-svn: 290004
1 parent 3b8011f commit fe929aa

File tree

13 files changed

+381
-0
lines changed

13 files changed

+381
-0
lines changed
 

‎clang/test/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ list(APPEND CLANG_TEST_DEPS
3939
c-index-test diagtool
4040
clang-tblgen
4141
clang-offload-bundler
42+
clang-import-test
4243
)
4344

4445
if(CLANG_ENABLE_STATIC_ANALYZER)

‎clang/test/Import/clang-flags/Inputs/S.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
STRUCT S {
2+
};

‎clang/test/Import/clang-flags/test.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// RUN: clang-import-test -import %S/Inputs/S.c -expression %s -Xcc -DSTRUCT=struct
2+
void expr() {
3+
STRUCT S MyS;
4+
void *MyPtr = &MyS;
5+
}

‎clang/test/Import/empty-struct/Inputs/S.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
struct S {
2+
};

‎clang/test/Import/empty-struct/test.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// RUN: clang-import-test -import %S/Inputs/S.c -expression %s
2+
void expr() {
3+
struct S MyS;
4+
void *MyPtr = &MyS;
5+
}

‎clang/test/Import/error-in-expression/Inputs/S.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
struct S {
2+
};

‎clang/test/Import/error-in-expression/test.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// RUN: not clang-import-test -import %S/Inputs/S.c -expression %s 2>&1 | FileCheck %s
2+
// CHECK: {{.*}}no viable conversion{{.*}}
3+
void expr() {
4+
struct S MyS;
5+
void *MyPtr = MyS;
6+
}

‎clang/test/Import/error-in-import/Inputs/S.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
struct S [
2+
];

‎clang/test/Import/error-in-import/test.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// RUN: not clang-import-test -import %S/Inputs/S.c -expression %s 2>&1 | FileCheck %s
2+
// CHECK: {{.*}}expected unqualified-id{{.*}}
3+
void expr() {
4+
struct S MyS;
5+
void *MyPtr = &MyS;
6+
}

‎clang/test/Import/missing-import/test.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// RUN: not clang-import-test -import %S/Inputs/S.c -expression %s 2>&1 | FileCheck %s
2+
// CHECK: {{.*}}Couldn't open{{.*}}Inputs/S.c{{.*}}
3+
void expr() {
4+
struct S MyS;
5+
void *MyPtr = &MyS;
6+
}

‎clang/tools/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ add_clang_subdirectory(driver)
55
add_clang_subdirectory(clang-format)
66
add_clang_subdirectory(clang-format-vs)
77
add_clang_subdirectory(clang-fuzzer)
8+
add_clang_subdirectory(clang-import-test)
89
add_clang_subdirectory(clang-offload-bundler)
910

1011
add_clang_subdirectory(c-index-test)

‎clang/tools/clang-import-test/CMakeLists.txt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
set(LLVM_LINK_COMPONENTS
2+
support
3+
)
4+
5+
if(NOT CLANG_BUILT_STANDALONE)
6+
set(tablegen_deps intrinsics_gen)
7+
endif()
8+
9+
add_clang_tool(clang-import-test
10+
clang-import-test.cpp
11+
DEPENDS
12+
${tablegen_deps}
13+
)
14+
15+
set(CLANG_IMPORT_TEST_LIB_DEPS
16+
clangAST
17+
clangBasic
18+
clangCodeGen
19+
clangFrontend
20+
)
21+
22+
target_link_libraries(clang-import-test
23+
${CLANG_IMPORT_TEST_LIB_DEPS}
24+
)

0 commit comments

Comments
 (0)
Please sign in to comment.