From 369308061ba3f17ac471f49dbd6a7400a7ad5357 Mon Sep 17 00:00:00 2001
From: Tom Stellard <thomas.stellard@amd.com>
Date: Wed, 3 Dec 2014 04:08:00 +0000
Subject: R600/SI: Enable inline assembly

We just needed to remove the assertion in
AMDGPURegisterInfo::getFrameRegister(), which is called when
initializing the parser for inline assembly.

llvm-svn: 223197
---
 llvm/lib/Target/R600/AMDGPURegisterInfo.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'llvm/lib')

diff --git a/llvm/lib/Target/R600/AMDGPURegisterInfo.cpp b/llvm/lib/Target/R600/AMDGPURegisterInfo.cpp
index 34332808f86..57b054bc2a6 100644
--- a/llvm/lib/Target/R600/AMDGPURegisterInfo.cpp
+++ b/llvm/lib/Target/R600/AMDGPURegisterInfo.cpp
@@ -42,8 +42,7 @@ void AMDGPURegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator MI,
 }
 
 unsigned AMDGPURegisterInfo::getFrameRegister(const MachineFunction &MF) const {
-  assert(!"Subroutines not supported yet");
-  return 0;
+  return AMDGPU::NoRegister;
 }
 
 unsigned AMDGPURegisterInfo::getSubRegFromChannel(unsigned Channel) const {
-- 
cgit v1.2.3