<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Aug 15, 2014 at 1:02 PM, David Blaikie <span dir="ltr"><<a href="mailto:dblaikie@gmail.com" target="_blank">dblaikie@gmail.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 class="">On Fri, Aug 15, 2014 at 11:50 AM, Sean Silva <<a href="mailto:chisophugis@gmail.com">chisophugis@gmail.com</a>> wrote:<br>

> Author: silvas<br>
> Date: Fri Aug 15 13:50:00 2014<br>
> New Revision: 215751<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=215751&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=215751&view=rev</a><br>
> Log:<br>
> [cleanup] Factor out some checks. NFC.<br>
><br>
> The core logic in main() is actually pretty simple, but there's lots of<br>
> stuff that has been added over time which obscures the flow of the code.<br>
> In upcoming patches, I'll be pulling more stuff out of the main<br>
> codepath.<br>
><br>
> I'm open to naming suggestions for these helper functions.<br>
><br>
> Modified:<br>
>     cfe/trunk/tools/driver/driver.cpp<br>
><br>
> Modified: cfe/trunk/tools/driver/driver.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/driver.cpp?rev=215751&r1=215750&r2=215751&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/driver.cpp?rev=215751&r1=215750&r2=215751&view=diff</a><br>

> ==============================================================================<br>
> --- cfe/trunk/tools/driver/driver.cpp (original)<br>
> +++ cfe/trunk/tools/driver/driver.cpp Fri Aug 15 13:50:00 2014<br>
> @@ -293,6 +293,23 @@ namespace {<br>
>    };<br>
>  }<br>
><br>
> +static void HandleDriverEnvVars(Driver &TheDriver) {<br>
<br>
</div>"Handle" seems a bit vague - Parse? (though there's not much parsing<br>
happening) Read? (<- probably my preference, given the options I've<br>
thought of) Load? Initialize? Populate?<br></blockquote><div><br></div><div>I've renamed the function to SetBackdoorDriverOutputsFromEnvVars in r<span style="font-family:arial,sans-serif;font-size:13px">215767.</span></div>
<div><span style="font-family:arial,sans-serif;font-size:13px"><br></span></div><div><span style="font-family:arial,sans-serif;font-size:13px">Thanks for getting me to take another look at this.</span></div><div><br></div>
<div>-- Sean Silva</div><div> </div><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 class=""><div class="h5"><br>
> +  // Handle CC_PRINT_OPTIONS and CC_PRINT_OPTIONS_FILE.<br>
> +  TheDriver.CCPrintOptions = !!::getenv("CC_PRINT_OPTIONS");<br>
> +  if (TheDriver.CCPrintOptions)<br>
> +    TheDriver.CCPrintOptionsFilename = ::getenv("CC_PRINT_OPTIONS_FILE");<br>
> +<br>
> +  // Handle CC_PRINT_HEADERS and CC_PRINT_HEADERS_FILE.<br>
> +  TheDriver.CCPrintHeaders = !!::getenv("CC_PRINT_HEADERS");<br>
> +  if (TheDriver.CCPrintHeaders)<br>
> +    TheDriver.CCPrintHeadersFilename = ::getenv("CC_PRINT_HEADERS_FILE");<br>
> +<br>
> +  // Handle CC_LOG_DIAGNOSTICS and CC_LOG_DIAGNOSTICS_FILE.<br>
> +  TheDriver.CCLogDiagnostics = !!::getenv("CC_LOG_DIAGNOSTICS");<br>
> +  if (TheDriver.CCLogDiagnostics)<br>
> +    TheDriver.CCLogDiagnosticsFilename = ::getenv("CC_LOG_DIAGNOSTICS_FILE");<br>
> +}<br>
> +<br>
>  int main(int argc_, const char **argv_) {<br>
>    llvm::sys::PrintStackTraceOnErrorSignal();<br>
>    llvm::PrettyStackTraceProgram X(argc_, argv_);<br>
> @@ -396,20 +413,7 @@ int main(int argc_, const char **argv_)<br>
>    llvm::InitializeAllTargets();<br>
>    ParseProgName(argv, SavedStrings, TheDriver);<br>
><br>
> -  // Handle CC_PRINT_OPTIONS and CC_PRINT_OPTIONS_FILE.<br>
> -  TheDriver.CCPrintOptions = !!::getenv("CC_PRINT_OPTIONS");<br>
> -  if (TheDriver.CCPrintOptions)<br>
> -    TheDriver.CCPrintOptionsFilename = ::getenv("CC_PRINT_OPTIONS_FILE");<br>
> -<br>
> -  // Handle CC_PRINT_HEADERS and CC_PRINT_HEADERS_FILE.<br>
> -  TheDriver.CCPrintHeaders = !!::getenv("CC_PRINT_HEADERS");<br>
> -  if (TheDriver.CCPrintHeaders)<br>
> -    TheDriver.CCPrintHeadersFilename = ::getenv("CC_PRINT_HEADERS_FILE");<br>
> -<br>
> -  // Handle CC_LOG_DIAGNOSTICS and CC_LOG_DIAGNOSTICS_FILE.<br>
> -  TheDriver.CCLogDiagnostics = !!::getenv("CC_LOG_DIAGNOSTICS");<br>
> -  if (TheDriver.CCLogDiagnostics)<br>
> -    TheDriver.CCLogDiagnosticsFilename = ::getenv("CC_LOG_DIAGNOSTICS_FILE");<br>
> +  HandleDriverEnvVars(TheDriver);<br>
><br>
>    std::unique_ptr<Compilation> C(TheDriver.BuildCompilation(argv));<br>
>    int Res = 0;<br>
><br>
><br>
> _______________________________________________<br>
> cfe-commits mailing list<br>
> <a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</div></div></blockquote></div><br></div></div>