<div dir="ltr"><div>Hi Ted,<br><br></div>Thank you for the review.<div class="gmail_extra"><br><br><div class="gmail_quote">On 30 July 2014 08:18, Ted Kremenek <span dir="ltr"><<a href="mailto:kremenek@apple.com" target="_blank">kremenek@apple.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div style="word-wrap:break-word"><div>Hi Gábor,</div><div><br></div><div>Thanks for making progress on this very promising enhancement to the analyzer. I have an assortment of comments, in no particular order:</div>
<div><br></div><div>- ModelInjector.h and ModelConsumer.h</div><div><br></div><div>There is a comment at the top of these files, but I think a bit more explanation is needed. For example:</div><div><br></div><div> MetaConsumer.cpp:</div>
<div><br></div><div> +// "Meta" ASTConsumer for consuming model files.</div><div><br></div><div>That doesn't really explain anything. What does "Meta" in quotes mean? I think an explanation here on what this does is helpful when someone discovers this code for the first time.</div>
<div><br></div><div>Similarly, we should add some high-level comments for CodeInjector.h and ModelInjector.h. We have a good start in ModelInjector.h:</div><div><br></div><div><div>+/// \file</div><div>+/// \brief Defines the clang::ento::ModelInjector class which implements the</div>
<div>+/// clang::CodeInjector interface. This class is responsible for injecting</div><div>+/// function definitions that were synthetized from model files.</div><div>+///</div></div><div><br></div><div>Let's consider expanding it:</div>
<div><br></div><div><div> /// \brief This file defines the clang::ento::ModelInjector class which implements the</div><div> /// clang::CodeInjector interface. This class is responsible for injecting</div><div> /// function definitions that were synthesized from model files.</div>
</div><div><br></div><div><div> /// Model files allow definitions of functions to be lazily constituted for functions</div><div> /// which lack bodies in the original source code. This allows the analyzer</div></div><div>
/// to more precisely analyze code that calls such functions, analyzing the</div><div> /// artificial definitions (which typically approximate the semantics of the</div><div> /// called function) when called by client code. These definitions are</div>
<div> /// reconstituted lazily, on-demand, by the static analyzer engine.</div><div><br></div><div>CodeInjector.h provides some information, but it is a bit vague:</div><div><br></div><div><div>+///</div><div>+/// \file</div>
<div>+/// \brief Defines the clang::CodeInjector interface which is responsible for</div><div>+/// injecting AST of function definitions from external source.</div><div>+///</div></div><div><br></div><div>It's a bit unclear how this gets used. I think a bit of prose here would help clarify its role in the static analyzer. I also think the CodeInjector interface is also more abstract than the prose describes. There's nothing about CodeInjector's interface that requires the injected definitions to come from an external source. That's an implementation detail of a concrete subclass. Instead, all CodeInjector does is provide an interface that lazily provides definitions for functions and methods that may not be present in the original source.</div>
</div></blockquote><div><br></div><div>I have added some further documentation to address these issues.<br></div><div><br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div style="word-wrap:break-word"><div><br></div><div>I'm also looking at the change to StaticAnalyzer/Frontend/FrontendActions.cpp, and wonder if we can simplify things:</div><div><br></div><div><blockquote type="cite">
<div>+++ lib/StaticAnalyzer/Frontend/FrontendActions.cpp (working copy)</div><div>@@ -7,9 +7,11 @@</div><div> //</div><div> //===----------------------------------------------------------------------===//</div><div> </div>
<div>+#include "clang/Frontend/CompilerInstance.h"</div><div> #include "clang/StaticAnalyzer/Frontend/FrontendActions.h"</div><div>-#include "clang/Frontend/CompilerInstance.h"</div><div> #include "clang/StaticAnalyzer/Frontend/AnalysisConsumer.h"</div>
<div>+#include "clang/StaticAnalyzer/Frontend/ModelConsumer.h"</div><div>+#include "ModelInjector.h"</div><div> using namespace clang;</div><div> using namespace ento;</div><div> </div><div>@@ -18,6 +20,14 @@</div>
<div> return CreateAnalysisConsumer(CI.getPreprocessor(),</div><div> CI.getFrontendOpts().OutputFile,</div><div> CI.getAnalyzerOpts(),</div><div>- CI.getFrontendOpts().Plugins);</div>
<div>+ CI.getFrontendOpts().Plugins,</div><div>+ new ModelInjector(CI));</div><div> }</div><div> </div></blockquote></div><div><br></div><div>It looks like CreateAnalysisConsumer just continues to grow more arguments, all which derive from using 'CI'. This seems silly, since this function is called in one place. Instead of intro ducting a dependency on ModelInjector.h in this file, we can just sink these arguments into CreateAnalysisConsumer() itself, resulting in:</div>
<div><br></div><div> return CreateAnalysisConsumer(CI);</div><div><br></div><div>and let CreateAnalysisConsumer() do all that boilerplate.</div></div></blockquote><div><br></div><div>That was my original idea as well but it broke the compilation of some code in extra repository and I wasn't sure if it is ok to break the API with this patch. But I find it cleaner this way so I modified it in this iteration.<br>
<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div style="word-wrap:break-word"><div><br></div><div>Next, let's look at the change to FrontendAction:</div>
<div><br></div><div><blockquote type="cite"><div> class FrontendAction {</div><div>+ /// Is this action invoked on a model file? Model files are incomplete</div><div>+ /// translation units that relies on type information from another translation</div>
<div>+ /// unit. Check ParseModelFileAction for details.</div><div>+ bool ModelFile;</div></blockquote><div><br></div><div>Perhaps "IsModelFile"? "ModelFile" sounds like it should be a reference to the file itself.</div>
<br><blockquote type="cite"><div> FrontendInputFile CurrentInput;</div><div> std::unique_ptr<ASTUnit> CurrentASTUnit;</div><div> CompilerInstance *Instance;</div><div>@@ -105,7 +109,11 @@</div><div> /// @}</div>
<div> </div><div> public:</div><div>- FrontendAction();</div><div>+ /// \brief Constructor</div><div>+ ///</div><div>+ /// \param modelFile determines whether the source files this action invoked</div><div>+ /// on should be treated as a model file. Defaults to false.</div>
<div>+ FrontendAction(bool modelFile = false);</div></blockquote><div><br></div><div>It seems suboptimal to modify the interface of FrontendAction just for this one edge case. Instead of modifying the constructor arguments, we could default initialize "IsModelFile" to false, and have a setter to change it. For example:</div>
</div><div><br></div><div> ParseModelFileAction::ParseModelFileAction(llvm::StringMap<Stmt *> &Bodies)</div><div> : ASTFrontendAction(/*ModelFile=*/true), Bodies(Bodies) {}</div><div><br></div><div>becomes:</div>
<div> </div><div> ParseModelFileAction::ParseModelFileAction(llvm::StringMap<Stmt *> &Bodies)</div><div> : Bodies(Bodies) {</div><div> IsModelFile = true;</div><div> }</div><div><br></div><div>Looking at this more, I wonder if we should modify FrontendAction at all. The only place where isModelParsingAction() is called is in one spot in CompilerInstance.cpp:</div>
<div><br></div><div> if (hasSourceManager() && !Act.isModelParsingAction())</div><div><br></div><div>It *might* be cleaner to just have a virtual member function in FrontendAction, which defaults to returning false, but is generic for all subclasses to override. Then we don't need the "IsModelFile" field in FrontendAction at all, and we just have ParseModelFileAction override that single member function. We could then name that method to be something a bit more generic. That would allow us to not touch FrontendAction at all except for providing that single virtual method that can be overridden in subclasses. I somewhat prefer this approach because it provides a cleaner separation of concerns between FrontendAction (which is defined libFrontend) and the static analyzer. That would also allow you to get rid of isModelParsingAction() entirely (replacing it with something more generic).</div>
<div><br></div></div></blockquote><div><br></div><div>You are right, it is much cleaner to use a virtual function, so I modified the patch to use that approach. The new virtual function has the same name because I have yet to find any better and more general name yet. Do you have an idea for a better name?<br>
</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div style="word-wrap:break-word"><div></div><div>As for the test case:</div><div><br></div><div><blockquote type="cite">
<div>+typedef int* intptr;</div><div>+</div><div>+void modelled(intptr p);</div><div>+</div><div>+int main() {</div><div>+ modelled(0);</div><div>+ return 0;</div><div>+}</div></blockquote><br></div><div>Please add some comments in this test file explaining what is happening. Also, it would be great if this both used FileCheck (which it does now) but also verified the diagnostics so we get cross-checking of the output (we see this in some analyzer tests). It also makes it easier to understand the test.</div>
<div><br></div><div>Also, is there a reason to break up the tests between model-suppress-falsepos.cpp and model-file.cpp? It seems like one test file will do fine; just clearly comment on what is happening for each test. I also recommend called the modeled function "modeledFunction" instead of "modelled" (which according to my spell checker has an additional 'l'). </div>
</div></blockquote><div><br></div><div>I have merged the test files and also added some commets to explain what is going on. I have fixed the misspelling as well. The nullpointer dereference is only checked through plist because the point where the comment with the expected warning should be added is inside the model file and it did not work for me if the comment was in a separate file. If there is a different way to verify the warnings that are in a separate file and I did not find it, please let me know.<br>
<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div style="word-wrap:break-word"><div><br></div><div>As for the model files themselves:</div><div><br></div>
<div><blockquote type="cite"><div>Index: test/Analysis/modelled.model</div><div>===================================================================</div><div>--- test/Analysis/modelled.model (revision 0)</div><div>+++ test/Analysis/modelled.model (working copy)</div>
<div>@@ -0,0 +1,3 @@</div><div>+void modelled(intptr p) {</div><div>+ ++*p;</div><div>+}</div><div>\ No newline at end of file</div><div>Index: test/Analysis/notzero.model</div><div>===================================================================</div>
<div>--- test/Analysis/notzero.model (revision 0)</div><div>+++ test/Analysis/notzero.model (working copy)</div></blockquote><br></div><div>Let's put these in a separate subdirectory, for example, "models", instead of mixing them with the tests. This way they really serve as "inputs" to the analyzer.</div>
</div></blockquote><div><br></div><div>I have moved the model files to tests/Inputs/Models.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div style="word-wrap:break-word">
<div><br></div><div>Overall this is looking good. I think the explanatory comments will really help people understand what this is doing, and I think changing how we thread the information through FrontendAction will help not introduce an artificial tainting of FrontendAction with concepts specific to the static analyzer.</div>
<div><br></div><div>Cheers,</div><div>Ted</div><div><br></div></div></blockquote><div><br></div><div>Thanks,<br></div><div>Gábor<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div style="word-wrap:break-word"><div></div><br><div><div><div class="h5"><div>On Jul 16, 2014, at 2:45 AM, Gábor Horváth <<a href="mailto:xazax.hun@gmail.com" target="_blank">xazax.hun@gmail.com</a>> wrote:</div><br>
</div></div><blockquote type="cite"><div><div class="h5"><div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On 14 July 2014 19:32, Anna Zaks <span dir="ltr"><<a href="mailto:ganna@apple.com" target="_blank">ganna@apple.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<div style="word-wrap:break-word"><br><div><div><div><blockquote type="cite"><div>On Jul 13, 2014, at 6:11 AM, Gábor Horváth <<a href="mailto:xazax.hun@gmail.com" target="_blank">xazax.hun@gmail.com</a>> wrote:</div>
<br><div><div dir="ltr"><div>Hi Anna,<br><br></div>Thank you for the review. I have tweaked the test, so it no longer requires the error reporting tweak that is not done yet to pass. I have also added some high level comments to some files, if you think some information is lacking I will add them in the next iteration as well. The BugReporter patch is now separated into a different patch. <br>
<div class="gmail_extra"><br><br><div class="gmail_quote">On 11 July 2014 18:02, Anna Zaks <span dir="ltr"><<a href="mailto:ganna@apple.com" target="_blank">ganna@apple.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div style="word-wrap:break-word"><div><br></div><div>For example, modeling functions should allow you to find bugs and suppress false positives outside of those functions. I would suggest adding a few of those tests first.<br>
<div><br></div></div></div></blockquote><div><br></div></div></div></div></div></blockquote><blockquote type="cite"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div>How are the false positives suppressed? I did not find any resource on that. Found some analyzer attributes but I did not find them suitable for this purpuse at the first glance. But I think once the locations that are in a model file are omitted from the report path, the regular methods for suppressing false positives should work (and I will definitely add test case to ensure this once it is done).<br>
</div><div><br></div></div></div></div></blockquote><div><br></div></div></div>What I meant is that it is possible to construct a test where ability to model a function would eliminate a false positive. This would be another way to test your patch without worrying about BugReporter.<br>
</div></div></blockquote><div><br></div><div>I got it now, thansk. I have updated the patch with a test case where a false positive case is eliminated by a model file.<br><br></div><div>Thanks,<br></div><div>Gábor<br></div>
<div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div style="word-wrap:break-word"><div><blockquote type="cite"><div dir="ltr"><div class="gmail_extra">
<div class="gmail_quote"><div>Thanks,<br></div><div>Gábor<br></div></div></div></div>
<span><api_modeling.patch></span><span><bugreporter.patch></span></blockquote></div><br></div></blockquote></div><br></div></div>
</div></div><span><api_modeling.patch></span><span><bugreporter.patch></span></blockquote></div><br></div></blockquote></div><br></div></div>