From 35e7751af455f2cc559cdc2d3424b53706e09bb3 Mon Sep 17 00:00:00 2001 From: David Majnemer Date: Tue, 4 Jun 2013 17:46:15 +0000 Subject: [PATCH] ARM: Fix crash in ARM backend inside of ARMConstantIslandPass The ARM backend did not expect LDRBi12 to hold a constant pool operand. Allow for LLVM to deal with the instruction similar to how it deals with LDRi12. This fixes PR16215. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@183238 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/ARM/ARMConstantIslandPass.cpp | 1 + test/CodeGen/ARM/load-address-masked.ll | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 test/CodeGen/ARM/load-address-masked.ll diff --git a/lib/Target/ARM/ARMConstantIslandPass.cpp b/lib/Target/ARM/ARMConstantIslandPass.cpp index 7c16ce78ff2..cff5ce27bca 100644 --- a/lib/Target/ARM/ARMConstantIslandPass.cpp +++ b/lib/Target/ARM/ARMConstantIslandPass.cpp @@ -753,6 +753,7 @@ initializeFunctionInfo(const std::vector &CPEMIs) { Scale = 4; break; + case ARM::LDRBi12: case ARM::LDRi12: case ARM::LDRcp: case ARM::t2LDRpci: diff --git a/test/CodeGen/ARM/load-address-masked.ll b/test/CodeGen/ARM/load-address-masked.ll new file mode 100644 index 00000000000..43c98e45d4d --- /dev/null +++ b/test/CodeGen/ARM/load-address-masked.ll @@ -0,0 +1,14 @@ +; RUN: llc < %s -mtriple=armv4t-unknown-linux-gnueabi -verify-machineinstrs | FileCheck %s + +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:64:128-a0:0:64-n32-S64" +target triple = "armv4t-unknown-linux-gnueabi" + +@a = global i32 0, align 4 + +define i32 @foo() { +entry: + ret i32 and (i32 ptrtoint (i32* @a to i32), i32 255) +} + +; CHECK: foo: +; CHECK: ldrb r0, .LCPI0_0 -- 2.34.1