Don't allow hybrid assembler unless filetype=iasm.

BUG=None R=stichnot@chromium.org Review URL: https://codereview.chromium.org/1424353003 .

Don't allow hybrid assembler unless filetype=iasm.
e849a572 · Karl Schimpf · a2efb9d0 · e849a572
Commit e849a572 authored Oct 30, 2015 by Karl Schimpf
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

IceClFlags.cpp src/IceClFlags.cpp +2 -1

No files found.
--- a/src/IceClFlags.cpp
+++ b/src/IceClFlags.cpp
@@ -451,7 +451,8 @@ void ClFlags::getParsedClFlags(ClFlags &OutFlags) {
  OutFlags.setDecorateAsm(::DecorateAsm);
  OutFlags.setDefaultFunctionPrefix(::DefaultFunctionPrefix);
  OutFlags.setDefaultGlobalPrefix(::DefaultGlobalPrefix);
-  OutFlags.setDisableHybridAssembly(::DisableHybridAssembly);
+  OutFlags.setDisableHybridAssembly(::DisableHybridAssembly ||
+                                    (::OutFileType != Ice::FT_Iasm));
  OutFlags.setDisableInternal(::DisableInternal);
  OutFlags.setDisableIRGeneration(::DisableIRGeneration);
  OutFlags.setDisableTranslation(::DisableTranslation);