Merge pull request #58483 from apple/egorzhdan/nfc-fix-warning

egorzhdan · web-flow · commit d4d12871c316 · 2022-04-28T18:27:00.000+02:00
[Frontend] NFC: fix compiler warning
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
@@ -801,7 +801,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
     Opts.ClangTarget = llvm::Triple(A->getValue());
   }
 
-  Opts.EnableCXXInterop |= Args.hasArg(OPT_enable_experimental_cxx_interop) |
+  Opts.EnableCXXInterop |= Args.hasArg(OPT_enable_experimental_cxx_interop) ||
                            Args.hasArg(OPT_enable_cxx_interop);
   Opts.EnableObjCInterop =
       Args.hasFlag(OPT_enable_objc_interop, OPT_disable_objc_interop,

Original file line number	Diff line number	Diff line change
`@@ -801,7 +801,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,`
`801`	`801`	`Opts.ClangTarget = llvm::Triple(A->getValue());`
`802`	`802`	`}`
`803`	`803`
`804`		`- Opts.EnableCXXInterop \|= Args.hasArg(OPT_enable_experimental_cxx_interop) \|`
	`804`	`+ Opts.EnableCXXInterop \|= Args.hasArg(OPT_enable_experimental_cxx_interop) \|\|`
`805`	`805`	`Args.hasArg(OPT_enable_cxx_interop);`
`806`	`806`	`Opts.EnableObjCInterop =`
`807`	`807`	`Args.hasFlag(OPT_enable_objc_interop, OPT_disable_objc_interop,`