LGTM, thanks for fixing ================ Comment at: lib/Driver/Driver.cpp:1620 @@ +1619,3 @@ + options::ID MaybeFe = + Ty == types::TY_Image ? options::OPT__SLASH_Fe : options::OPT_INVALID; + Arg *FinalOutput = C.getArgs().getLastArg(options::OPT_o, MaybeFA, MaybeFa, ---------------- I wish this was simpler :/ http://reviews.llvm.org/D3771