Merge "Fix slang to compile with LLVM r275480"