File 0009-llvm40-gep_type_iterator-has-no-operator.p... of Package klee

Overview Repositories Revisions Requests Users Attributes Meta

File 0009-llvm40-gep_type_iterator-has-no-operator.patch of Package klee (Revision ae9551a0f62db44d2a940c5235affc27)

Currently displaying revision ae9551a0f62db44d2a940c5235affc27 , Show latest

From: Jiri Slaby <jirislaby@gmail.com>
Date: Fri, 17 Nov 2017 17:56:18 +0100
Subject: llvm40: gep_type_iterator has no operator*
Patch-mainline: no

Starting with LLVM 4.0, we have getStructTypeOrNull(), so use it.
operator* in post-4 will have a different semantics.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
---
 lib/Core/ExecutorUtil.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/Core/ExecutorUtil.cpp b/lib/Core/ExecutorUtil.cpp
index a352db3339c4..7718ae9d0ccb 100644
--- a/lib/Core/ExecutorUtil.cpp
+++ b/lib/Core/ExecutorUtil.cpp
@@ -213,7 +213,11 @@ namespace klee {
           continue;
 
         // Handle a struct index, which adds its field offset to the pointer.
+#if LLVM_VERSION_CODE >= LLVM_VERSION(4, 0)
+        if (StructType *STy = ii.getStructTypeOrNull()) {
+#else
         if (StructType *STy = dyn_cast<StructType>(*ii)) {
+#endif
           unsigned ElementIdx = indexOp->getZExtValue();
           const StructLayout *SL = kmodule->targetData->getStructLayout(STy);
           base = base->Add(
-- 
2.17.0

Places

File 0009-llvm40-gep_type_iterator-has-no-operator.patch of Package klee (Revision ae9551a0f62db44d2a940c5235affc27)

Places