From 3789171972381c2071ab094936ed50b88c448e00 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Mon, 15 Apr 2013 22:33:50 +0000 Subject: [PATCH] We are not able to bitcast a pointer to an integral value. Two return types are not equivalent if one is a pointer and the other is an integral. This is because we cannot bitcast a pointer to an integral value. PR15185 llvm-svn: 179569 --- llvm/lib/Transforms/IPO/MergeFunctions.cpp | 10 ++--- llvm/test/Transforms/MergeFunc/crash.ll | 46 ++++++++++++++++++++++ 2 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 llvm/test/Transforms/MergeFunc/crash.ll diff --git a/llvm/lib/Transforms/IPO/MergeFunctions.cpp b/llvm/lib/Transforms/IPO/MergeFunctions.cpp index 892100f0585a..ab31b1a96e77 100644 --- a/llvm/lib/Transforms/IPO/MergeFunctions.cpp +++ b/llvm/lib/Transforms/IPO/MergeFunctions.cpp @@ -185,7 +185,7 @@ private: } /// Compare two Types, treating all pointer types as equal. - bool isEquivalentType(Type *Ty1, Type *Ty2) const; + bool isEquivalentType(Type *Ty1, Type *Ty2, bool isReturnType = false) const; // The two functions undergoing comparison. const Function *F1, *F2; @@ -200,12 +200,12 @@ private: // Any two pointers in the same address space are equivalent, intptr_t and // pointers are equivalent. Otherwise, standard type equivalence rules apply. -bool FunctionComparator::isEquivalentType(Type *Ty1, - Type *Ty2) const { +bool FunctionComparator::isEquivalentType(Type *Ty1, Type *Ty2, + bool isReturnType) const { if (Ty1 == Ty2) return true; if (Ty1->getTypeID() != Ty2->getTypeID()) { - if (TD) { + if (TD && !isReturnType) { LLVMContext &Ctx = Ty1->getContext(); if (isa(Ty1) && Ty2 == TD->getIntPtrType(Ctx)) return true; if (isa(Ty2) && Ty1 == TD->getIntPtrType(Ctx)) return true; @@ -261,7 +261,7 @@ bool FunctionComparator::isEquivalentType(Type *Ty1, FTy1->isVarArg() != FTy2->isVarArg()) return false; - if (!isEquivalentType(FTy1->getReturnType(), FTy2->getReturnType())) + if (!isEquivalentType(FTy1->getReturnType(), FTy2->getReturnType(), true)) return false; for (unsigned i = 0, e = FTy1->getNumParams(); i != e; ++i) { diff --git a/llvm/test/Transforms/MergeFunc/crash.ll b/llvm/test/Transforms/MergeFunc/crash.ll new file mode 100644 index 000000000000..0897ba289337 --- /dev/null +++ b/llvm/test/Transforms/MergeFunc/crash.ll @@ -0,0 +1,46 @@ +; RUN: opt -mergefunc -disable-output < %s +; PR15185 +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32-S128" +target triple = "i386-pc-linux-gnu" + +%.qux.2496 = type { i32, %.qux.2497 } +%.qux.2497 = type { i8, i32 } +%.qux.2585 = type { i32, i32, i8* } + +@g2 = external unnamed_addr constant [9 x i8], align 1 +@g3 = internal hidden unnamed_addr constant [1 x i8*] [i8* bitcast (i8* (%.qux.2585*)* @func35 to i8*)] + +define internal hidden i32 @func1(i32* %ptr, { i32, i32 }* nocapture %method) align 2 { + br label %1 + +;