-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix various bugs uncovered in the wild
Signed-off-by: Anthony Burzillo <aburzillo@bloomberg.net>
- Loading branch information
Showing
10 changed files
with
267 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| #!/bin/bash | ||
|
|
||
| VERSION=$($1/../bin/clang --version | head -n 1 | cut -d '(' -f 1 | cut -d ' ' -f 3 | cut -d '-' -f 1) | ||
|
|
||
| echo $(realpath $1/../lib*/clang/$VERSION/include) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,166 @@ | ||
| #include "clangmetatool-testconfig.h" | ||
|
|
||
| #include <sstream> | ||
| #include <string> | ||
| #include <vector> | ||
| #include <utility> | ||
|
|
||
| #include <clang/ASTMatchers/ASTMatchers.h> | ||
| #include <clang/ASTMatchers/ASTMatchFinder.h> | ||
| #include <clang/Frontend/FrontendAction.h> | ||
| #include <clang/Tooling/Core/Replacement.h> | ||
| #include <clang/Tooling/CommonOptionsParser.h> | ||
| #include <clang/Tooling/Tooling.h> | ||
| #include <clang/Tooling/Refactoring.h> | ||
| #include <llvm/Support/CommandLine.h> | ||
| #include <clangmetatool/meta_tool_factory.h> | ||
| #include <clangmetatool/meta_tool.h> | ||
| #include <clangmetatool/propagation/constant_integer_propagator.h> | ||
|
|
||
| #include <gtest/gtest.h> | ||
|
|
||
| namespace { | ||
|
|
||
| using namespace clang::ast_matchers; | ||
|
|
||
| using FindVarDeclsDatum = std::pair<const clang::FunctionDecl*, const clang::DeclRefExpr*>; | ||
| using FindVarDeclsData = std::vector<FindVarDeclsDatum>; | ||
|
|
||
| class FindVarDeclsCallback : public MatchFinder::MatchCallback { | ||
| private: | ||
| clang::CompilerInstance* ci; | ||
| FindVarDeclsData* data; | ||
|
|
||
| public: | ||
| FindVarDeclsCallback(clang::CompilerInstance* ci, FindVarDeclsData* data) | ||
| : ci(ci), data(data) { | ||
| } | ||
|
|
||
| virtual void run(const MatchFinder::MatchResult& r) override { | ||
| const clang::FunctionDecl* f = r.Nodes.getNodeAs<clang::FunctionDecl>("func"); | ||
|
|
||
| const clang::DeclRefExpr* d = r.Nodes.getNodeAs<clang::DeclRefExpr>("declRef"); | ||
|
|
||
| data->push_back({f, d}); | ||
| } | ||
| }; | ||
|
|
||
| class FindVarDecls { | ||
| private: | ||
| FindVarDeclsData data; | ||
|
|
||
| StatementMatcher matcher = | ||
| (declRefExpr | ||
| (hasDeclaration | ||
| (varDecl | ||
| (hasAnyName | ||
| ( | ||
| "a", | ||
| "b", | ||
| "c", | ||
| "d", | ||
| "e" | ||
| ) | ||
| ) | ||
| ), | ||
| hasAncestor( | ||
| functionDecl().bind("func") | ||
| ) | ||
| ) | ||
| ).bind("declRef"); | ||
|
|
||
| FindVarDeclsCallback callback; | ||
|
|
||
| public: | ||
| FindVarDecls(clang::CompilerInstance* ci, | ||
| MatchFinder* f) | ||
| : callback(ci, &data) | ||
| { | ||
| f->addMatcher(matcher, &callback); | ||
| } | ||
|
|
||
| FindVarDeclsData* getData() { return &data; } | ||
| }; | ||
|
|
||
| class MyTool { | ||
| private: | ||
| clang::CompilerInstance* ci; | ||
| FindVarDecls fvd; | ||
| clangmetatool::propagation::ConstantIntegerPropagator cip; | ||
|
|
||
| public: | ||
| MyTool(clang::CompilerInstance* ci, MatchFinder *f) | ||
| : ci(ci), fvd(ci, f), cip(ci) { | ||
| } | ||
|
|
||
| void postProcessing | ||
| (std::map<std::string, clang::tooling::Replacements> &replacementsMap) { | ||
| FindVarDeclsData* decls = fvd.getData(); | ||
|
|
||
| for(auto decl : *decls) { | ||
| cip.runPropagation(decl.first, decl.second); | ||
| } | ||
|
|
||
| std::ostringstream stream; | ||
|
|
||
| cip.dump(stream); | ||
|
|
||
| const char* expectedResult = | ||
| "main >>>>>>>>>>>>>>>>>>>>>>>>>>\n" | ||
| " ** a\n" | ||
| " - 6:3 '0' (Changed by code)\n" | ||
| " ** b\n" | ||
| " - 7:3 '1' (Changed by code)\n" | ||
| " - 12:22 '<UNRESOLVED>' (Changed by code)\n" | ||
| " ** c\n" | ||
| " - 8:3 '2' (Changed by code)\n" | ||
| " - 12:22 '<UNRESOLVED>' (Changed by code)\n" | ||
| " ** d\n" | ||
| " - 9:3 '3' (Changed by code)\n" | ||
| " ** e\n" | ||
| " - 10:3 '4' (Changed by code)\n" | ||
| " - 12:22 '<UNRESOLVED>' (Changed by code)\n" | ||
| "main <<<<<<<<<<<<<<<<<<<<<<<<<<\n"; | ||
|
|
||
| EXPECT_STREQ(expectedResult, stream.str().c_str()); | ||
| } | ||
| }; | ||
|
|
||
| } // namespace anonymous | ||
|
|
||
| TEST(propagation_ConstantIntegerPropagation, functionArgs) { | ||
| llvm::cl::OptionCategory MyToolCategory("my-tool options"); | ||
| int argc = 4; | ||
| const char* argv[] = { | ||
| "foo", | ||
| CMAKE_SOURCE_DIR "/t/data/027-c-style-variadic-integer-propagation/main.cpp", | ||
| "--extra-arg-before=-I" CLANG_STD_INCLUDE_DIR, | ||
| "--", | ||
| // Test C++ for confirming that this works on a superset | ||
| "-xc++" | ||
| }; | ||
| clang::tooling::CommonOptionsParser optionsParser | ||
| (argc, argv, MyToolCategory); | ||
| clang::tooling::RefactoringTool tool | ||
| (optionsParser.getCompilations(), optionsParser.getSourcePathList()); | ||
| clangmetatool::MetaToolFactory<clangmetatool::MetaTool<MyTool>> | ||
| raf(tool.getReplacements()); | ||
| int r = tool.runAndSave(&raf); | ||
| ASSERT_EQ(0, r); | ||
| } | ||
|
|
||
| // ---------------------------------------------------------------------------- | ||
| // Copyright 2018 Bloomberg Finance L.P. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // ----------------------------- END-OF-FILE ---------------------------------- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| #include <stdarg.h> | ||
|
|
||
| int foo(int, int*, int&, ...); | ||
|
|
||
| int main(int argc, char* argv[]) { | ||
| int a = 0; | ||
| int b = 1; | ||
| int c = 2; | ||
| int d = 3; | ||
| int e = 4; | ||
|
|
||
| foo(a, &b, c, d, &e); | ||
|
|
||
| return 0; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters