From cd5319a64fb1a9b080521a03e08202e48aca448e Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Sat, 28 Apr 2018 23:28:08 -0700 Subject: [PATCH] swr/rast: Fix include for createInstructionCombiningPass with llvm-7.0. Fix build error after llvm-7.0.0svn r330669 ("InstCombine: Fix layering by not including Scalar.h in InstCombine"). CXX rasterizer/jitter/libmesaswr_la-blend_jit.lo rasterizer/jitter/blend_jit.cpp:816:20: error: use of undeclared identifier 'createInstructionCombiningPass'; did you mean 'createInstructionSimplifierPass'? passes.add(createInstructionCombiningPass()); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ createInstructionSimplifierPass Suggested-by: George Kyriazis Signed-off-by: Vinson Lee Reviewed-By: George Kyriazis --- src/gallium/drivers/swr/rasterizer/jitter/jit_pch.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gallium/drivers/swr/rasterizer/jitter/jit_pch.hpp b/src/gallium/drivers/swr/rasterizer/jitter/jit_pch.hpp index 216938fa7b0..001a1ab241f 100644 --- a/src/gallium/drivers/swr/rasterizer/jitter/jit_pch.hpp +++ b/src/gallium/drivers/swr/rasterizer/jitter/jit_pch.hpp @@ -69,6 +69,7 @@ using PassManager = llvm::legacy::PassManager; #include "llvm/Transforms/Scalar.h" #if LLVM_VERSION_MAJOR >= 7 #include "llvm/Transforms/Utils.h" +#include "llvm/Transforms/InstCombine/InstCombine.h" #endif #include "llvm/Support/Host.h" #include "llvm/Support/DynamicLibrary.h" -- 2.30.2