[Lldb-commits] [clang] [clang-tools-extra] [flang] [lldb] [llvm] [clang] Refactor option-related code from clangDriver into new clangOptions library (PR #163659)

[Nikolay Panchenko via lldb-commits]

================
@@ -15,11 +15,11 @@
 #include "clang/Driver/Action.h"
 #include "clang/Driver/DriverDiagnostic.h"
 #include "clang/Driver/InputInfo.h"
-#include "clang/Driver/Options.h"
 #include "clang/Driver/Phases.h"
 #include "clang/Driver/ToolChain.h"
 #include "clang/Driver/Types.h"
 #include "clang/Driver/Util.h"
+#include "clang/Options/Options.h"
 #include "llvm/ADT/ArrayRef.h"
----------------
npanchen wrote:

> @npanchen can you point me to where you are seeing the failure?

Pardon, my machine is quite busy with the other work now, but the snapshot of the error I got is:
```
Compiling clang/lib/Driver/ToolChains/WebAssembly.cpp failed: (Exit 1): multi-platform-clang++.sh failed: error executing CppCompile command (from cc_library rule target @@+llvm_configure+llvm-project//clang:driver) bazel/internal/cc-toolchain/tools/multi-platform
-clang++.sh '--sysroot=external/sysroot-jammy-x86_64+' '-resource-dir=external/+http_archive+clang-linux-x86_64/lib/clang/20' -no-canonical-prefixes ... (remaining 242 arguments skipped)
                                                                                                          
Use --sandbox_debug to see verbose messages from the sandbox and retain the sandbox build root for debugging                                                                                                         
In file included from external/+llvm_configure+llvm-project/clang/lib/Driver/ToolChains/WebAssembly.cpp:9:            
In file included from external/+llvm_configure+llvm-project/clang/lib/Driver/ToolChains/WebAssembly.h:12:                                                                                                            
In file included from external/+llvm_configure+llvm-project/clang/lib/Driver/ToolChains/Gnu.h:12:                                                                                                                    
In file included from external/+llvm_configure+llvm-project/clang/include/clang/Driver/CudaInstallationDetector.h:13:                                            
external/+llvm_configure+llvm-project/clang/include/clang/Driver/Driver.h:22:10: fatal error: 'clang/Options/Options.h' file not found                                                                               
   22 | #include "clang/Options/Options.h"
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~ 
```

> Hmm this is odd. Looking at the git diff here, it should have been removed.

If I look at main state after the PR has been merged (which removed `Option.h`) , [Driver.h:22](https://github.com/llvm/llvm-project/blob/9a783b63e647d95e001f55464a9bc7fa0c3929c3/clang/include/clang/Driver/Driver.h#L22) does still include `Option.h`, right ?

https://github.com/llvm/llvm-project/pull/163659