Peter Goodman

@seelabs Can you try with [this version](https://github.com/trailofbits/pasta/blob/token_context_refactor/lib/Compile/BuiltinsX86.h) of BuiltinsX86.h, and let me know if it makes any more progress? Thanks!

Hi @seelabs, I've updated the [previously linked](https://github.com/trailofbits/pasta/blob/token_context_refactor/lib/Compile/BuiltinsX86.h) `BuiltinsX86.h` file, can you try this new one?

I may need to patch clang if I want to generically handle (re)definitions of possible intrinsics. This will take deeper investigation.

Note to self: Try adding a check for `FD->getBuiltinID()` in this function from SemaDecl.cpp: ```c++ /// canRedefineFunction - checks if a function can be redefined. Currently, /// only extern inline...

Alright I've recently been making progress on this issue. I've been moving our various clang patches into our [pasta](https://github.com/trail-of-forks/llvm-project/tree/pasta) branch of [trail-of-forks/llvm-project](https://github.com/trail-of-forks/llvm-project). This has been going on as I [port](https://github.com/trailofbits/pasta/tree/llvm17)...

@seelabs Alright, the llvm17 branch of PASTA now works with `#include ` when using g++ as the compiler. This branch of PASTA now has a much simpler build process, and...

@seelabs if you have the time, can you test the `master` branch?

Excellent. It seems I didn't sufficiently patch clang. I thought I had covered this "definition of builtin function" error but didn't. This gives me something to go on :-)

It also still seems like the option setting isn't quite working:

Better but not totally there: