6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-15 04:30:12 +00:00
Code Issues Projects Releases Wiki Activity

Let function call return aggregate.

Browse Source 
Now, we have very first multiple return value testcase!


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47424 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Devang Patel 2008-02-21 01:54:02 +00:00
parent ef00f9d377
commit bb4f8d4045
4 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/VMCore/Value.cpp
View File

@ -14,6 +14,7 @@
#include "llvm/Constant.h" #include "llvm/Constant.h"
#include "llvm/DerivedTypes.h" #include "llvm/DerivedTypes.h"
#include "llvm/InstrTypes.h" #include "llvm/InstrTypes.h"
#include "llvm/Instructions.h"
#include "llvm/Module.h" #include "llvm/Module.h"
#include "llvm/ValueSymbolTable.h" #include "llvm/ValueSymbolTable.h"
#include "llvm/Support/Debug.h" #include "llvm/Support/Debug.h"
@ -33,7 +34,11 @@ static inline const Type *checkType(const Type *Ty) {
Value::Value(const Type *ty, unsigned scid) Value::Value(const Type *ty, unsigned scid)
: SubclassID(scid), SubclassData(0), Ty(checkType(ty)), : SubclassID(scid), SubclassData(0), Ty(checkType(ty)),
UseList(0), Name(0) { UseList(0), Name(0) {
if (!isa<Constant>(this) && !isa<BasicBlock>(this)) if (isa<CallInst>(this))
assert((Ty->isFirstClassType() || Ty == Type::VoidTy ||
isa<OpaqueType>(ty) || Ty->getTypeID() == Type::StructTyID) &&
"invalid CallInst type!");
else if (!isa<Constant>(this) && !isa<BasicBlock>(this))
assert((Ty->isFirstClassType() || Ty == Type::VoidTy || assert((Ty->isFirstClassType() || Ty == Type::VoidTy ||
isa<OpaqueType>(ty)) && isa<OpaqueType>(ty)) &&
"Cannot create non-first-class values except for constants!"); "Cannot create non-first-class values except for constants!");

26
lib/VMCore/Verifier.cpp
View File

@ -1071,7 +1071,8 @@ void Verifier::visitInstruction(Instruction &I) {
// Check that the return value of the instruction is either void or a legal // Check that the return value of the instruction is either void or a legal
// value type. // value type.
Assert1(I.getType() == Type::VoidTy || I.getType()->isFirstClassType(), Assert1(I.getType() == Type::VoidTy || I.getType()->isFirstClassType()
|| (isa<CallInst>(I) && I.getType()->getTypeID() == Type::StructTyID),
"Instruction returns a non-scalar type!", &I); "Instruction returns a non-scalar type!", &I);
// Check that all uses of the instruction, if they are instructions // Check that all uses of the instruction, if they are instructions
@ -1091,11 +1092,24 @@ void Verifier::visitInstruction(Instruction &I) {
// Check to make sure that only first-class-values are operands to // Check to make sure that only first-class-values are operands to
// instructions. // instructions.
Assert1(I.getOperand(i)->getType()->isFirstClassType() if (!I.getOperand(i)->getType()->isFirstClassType()) {
|| (isa<ReturnInst>(I) if (isa<ReturnInst>(I) || isa<GetResultInst>(I))
&& I.getOperand(i)->getType()->getTypeID() == Type::StructTyID), Assert1(I.getOperand(i)->getType()->getTypeID() == Type::StructTyID,
"Instruction operands must be first-class values!", &I); "Invalid ReturnInst operands!", &I);
else if (isa<CallInst>(I)) {
if (const PointerType *PT = dyn_cast<PointerType>
(I.getOperand(i)->getType())) {
const Type *ETy = PT->getElementType();
Assert1(ETy->getTypeID() == Type::StructTyID,
"Invalid CallInst operands!", &I);
}
else
Assert1(0, "Invalid CallInst operands!", &I);
}
else
Assert1(0, "Instruction operands must be first-class values!", &I);
}
if (Function *F = dyn_cast<Function>(I.getOperand(i))) { if (Function *F = dyn_cast<Function>(I.getOperand(i))) {
// Check to make sure that the "address of" an intrinsic function is never // Check to make sure that the "address of" an intrinsic function is never
// taken. // taken.

1
test/Assembler/2005-01-31-CallingAggregateFunction.ll
View File

@ -1,5 +1,4 @@
; RUN: llvm-as < %s -o /dev/null -f ; RUN: llvm-as < %s -o /dev/null -f
; XFAIL: *
define void @test() { define void @test() {
call {} @foo() call {} @foo()

12
test/Assembler/2008-02-20-MultipleReturnValue.ll Normal file
View File

@ -0,0 +1,12 @@
; RUN: llvm-as < %s -disable-output
define {i32, i8} @foo(i32 %p) {
ret i32 1, i8 2
}
define i8 @f2(i32 %p) {
%c = call {i32, i8} @foo(i32 %p)
%d = getresult {i32, i8} %c, 1
%e = add i8 %d, 1
ret i8 %e
}