Teach llvm-as to accept function types with multiple return types.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@49945 91177308-0d34-0410-b5e6-96231b3b80d8

lib/AsmParser/llvmAsmParser.h.cvs

@@ -1,4 +1,353 @@
-typedef union {
+/* A Bison parser, made by GNU Bison 2.3.  */
+
+/* Skeleton interface for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     ESINT64VAL = 258,
+     EUINT64VAL = 259,
+     ESAPINTVAL = 260,
+     EUAPINTVAL = 261,
+     LOCALVAL_ID = 262,
+     GLOBALVAL_ID = 263,
+     FPVAL = 264,
+     VOID = 265,
+     INTTYPE = 266,
+     FLOAT = 267,
+     DOUBLE = 268,
+     X86_FP80 = 269,
+     FP128 = 270,
+     PPC_FP128 = 271,
+     LABEL = 272,
+     TYPE = 273,
+     LOCALVAR = 274,
+     GLOBALVAR = 275,
+     LABELSTR = 276,
+     STRINGCONSTANT = 277,
+     ATSTRINGCONSTANT = 278,
+     PCTSTRINGCONSTANT = 279,
+     ZEROINITIALIZER = 280,
+     TRUETOK = 281,
+     FALSETOK = 282,
+     BEGINTOK = 283,
+     ENDTOK = 284,
+     DECLARE = 285,
+     DEFINE = 286,
+     GLOBAL = 287,
+     CONSTANT = 288,
+     SECTION = 289,
+     ALIAS = 290,
+     VOLATILE = 291,
+     THREAD_LOCAL = 292,
+     TO = 293,
+     DOTDOTDOT = 294,
+     NULL_TOK = 295,
+     UNDEF = 296,
+     INTERNAL = 297,
+     LINKONCE = 298,
+     WEAK = 299,
+     APPENDING = 300,
+     DLLIMPORT = 301,
+     DLLEXPORT = 302,
+     EXTERN_WEAK = 303,
+     OPAQUE = 304,
+     EXTERNAL = 305,
+     TARGET = 306,
+     TRIPLE = 307,
+     ALIGN = 308,
+     ADDRSPACE = 309,
+     DEPLIBS = 310,
+     CALL = 311,
+     TAIL = 312,
+     ASM_TOK = 313,
+     MODULE = 314,
+     SIDEEFFECT = 315,
+     CC_TOK = 316,
+     CCC_TOK = 317,
+     FASTCC_TOK = 318,
+     COLDCC_TOK = 319,
+     X86_STDCALLCC_TOK = 320,
+     X86_FASTCALLCC_TOK = 321,
+     DATALAYOUT = 322,
+     UNWINDS = 323,
+     RET = 324,
+     BR = 325,
+     SWITCH = 326,
+     INVOKE = 327,
+     UNWIND = 328,
+     UNREACHABLE = 329,
+     ADD = 330,
+     SUB = 331,
+     MUL = 332,
+     UDIV = 333,
+     SDIV = 334,
+     FDIV = 335,
+     UREM = 336,
+     SREM = 337,
+     FREM = 338,
+     AND = 339,
+     OR = 340,
+     XOR = 341,
+     SHL = 342,
+     LSHR = 343,
+     ASHR = 344,
+     ICMP = 345,
+     FCMP = 346,
+     EQ = 347,
+     NE = 348,
+     SLT = 349,
+     SGT = 350,
+     SLE = 351,
+     SGE = 352,
+     ULT = 353,
+     UGT = 354,
+     ULE = 355,
+     UGE = 356,
+     OEQ = 357,
+     ONE = 358,
+     OLT = 359,
+     OGT = 360,
+     OLE = 361,
+     OGE = 362,
+     ORD = 363,
+     UNO = 364,
+     UEQ = 365,
+     UNE = 366,
+     MALLOC = 367,
+     ALLOCA = 368,
+     FREE = 369,
+     LOAD = 370,
+     STORE = 371,
+     GETELEMENTPTR = 372,
+     TRUNC = 373,
+     ZEXT = 374,
+     SEXT = 375,
+     FPTRUNC = 376,
+     FPEXT = 377,
+     BITCAST = 378,
+     UITOFP = 379,
+     SITOFP = 380,
+     FPTOUI = 381,
+     FPTOSI = 382,
+     INTTOPTR = 383,
+     PTRTOINT = 384,
+     PHI_TOK = 385,
+     SELECT = 386,
+     VAARG = 387,
+     EXTRACTELEMENT = 388,
+     INSERTELEMENT = 389,
+     SHUFFLEVECTOR = 390,
+     GETRESULT = 391,
+     SIGNEXT = 392,
+     ZEROEXT = 393,
+     NORETURN = 394,
+     INREG = 395,
+     SRET = 396,
+     NOUNWIND = 397,
+     NOALIAS = 398,
+     BYVAL = 399,
+     NEST = 400,
+     READNONE = 401,
+     READONLY = 402,
+     GC = 403,
+     DEFAULT = 404,
+     HIDDEN = 405,
+     PROTECTED = 406
+   };
+#endif
+/* Tokens.  */
+#define ESINT64VAL 258
+#define EUINT64VAL 259
+#define ESAPINTVAL 260
+#define EUAPINTVAL 261
+#define LOCALVAL_ID 262
+#define GLOBALVAL_ID 263
+#define FPVAL 264
+#define VOID 265
+#define INTTYPE 266
+#define FLOAT 267
+#define DOUBLE 268
+#define X86_FP80 269
+#define FP128 270
+#define PPC_FP128 271
+#define LABEL 272
+#define TYPE 273
+#define LOCALVAR 274
+#define GLOBALVAR 275
+#define LABELSTR 276
+#define STRINGCONSTANT 277
+#define ATSTRINGCONSTANT 278
+#define PCTSTRINGCONSTANT 279
+#define ZEROINITIALIZER 280
+#define TRUETOK 281
+#define FALSETOK 282
+#define BEGINTOK 283
+#define ENDTOK 284
+#define DECLARE 285
+#define DEFINE 286
+#define GLOBAL 287
+#define CONSTANT 288
+#define SECTION 289
+#define ALIAS 290
+#define VOLATILE 291
+#define THREAD_LOCAL 292
+#define TO 293
+#define DOTDOTDOT 294
+#define NULL_TOK 295
+#define UNDEF 296
+#define INTERNAL 297
+#define LINKONCE 298
+#define WEAK 299
+#define APPENDING 300
+#define DLLIMPORT 301
+#define DLLEXPORT 302
+#define EXTERN_WEAK 303
+#define OPAQUE 304
+#define EXTERNAL 305
+#define TARGET 306
+#define TRIPLE 307
+#define ALIGN 308
+#define ADDRSPACE 309
+#define DEPLIBS 310
+#define CALL 311
+#define TAIL 312
+#define ASM_TOK 313
+#define MODULE 314
+#define SIDEEFFECT 315
+#define CC_TOK 316
+#define CCC_TOK 317
+#define FASTCC_TOK 318
+#define COLDCC_TOK 319
+#define X86_STDCALLCC_TOK 320
+#define X86_FASTCALLCC_TOK 321
+#define DATALAYOUT 322
+#define UNWINDS 323
+#define RET 324
+#define BR 325
+#define SWITCH 326
+#define INVOKE 327
+#define UNWIND 328
+#define UNREACHABLE 329
+#define ADD 330
+#define SUB 331
+#define MUL 332
+#define UDIV 333
+#define SDIV 334
+#define FDIV 335
+#define UREM 336
+#define SREM 337
+#define FREM 338
+#define AND 339
+#define OR 340
+#define XOR 341
+#define SHL 342
+#define LSHR 343
+#define ASHR 344
+#define ICMP 345
+#define FCMP 346
+#define EQ 347
+#define NE 348
+#define SLT 349
+#define SGT 350
+#define SLE 351
+#define SGE 352
+#define ULT 353
+#define UGT 354
+#define ULE 355
+#define UGE 356
+#define OEQ 357
+#define ONE 358
+#define OLT 359
+#define OGT 360
+#define OLE 361
+#define OGE 362
+#define ORD 363
+#define UNO 364
+#define UEQ 365
+#define UNE 366
+#define MALLOC 367
+#define ALLOCA 368
+#define FREE 369
+#define LOAD 370
+#define STORE 371
+#define GETELEMENTPTR 372
+#define TRUNC 373
+#define ZEXT 374
+#define SEXT 375
+#define FPTRUNC 376
+#define FPEXT 377
+#define BITCAST 378
+#define UITOFP 379
+#define SITOFP 380
+#define FPTOUI 381
+#define FPTOSI 382
+#define INTTOPTR 383
+#define PTRTOINT 384
+#define PHI_TOK 385
+#define SELECT 386
+#define VAARG 387
+#define EXTRACTELEMENT 388
+#define INSERTELEMENT 389
+#define SHUFFLEVECTOR 390
+#define GETRESULT 391
+#define SIGNEXT 392
+#define ZEROEXT 393
+#define NORETURN 394
+#define INREG 395
+#define SRET 396
+#define NOUNWIND 397
+#define NOALIAS 398
+#define BYVAL 399
+#define NEST 400
+#define READNONE 401
+#define READONLY 402
+#define GC 403
+#define DEFAULT 404
+#define HIDDEN 405
+#define PROTECTED 406
+
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 950 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+{
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
   llvm::BasicBlock                       *BasicBlockVal;
@@ -43,156 +392,14 @@ typedef union {
   llvm::Instruction::OtherOps       OtherOpVal;
   llvm::ICmpInst::Predicate         IPredicate;
   llvm::FCmpInst::Predicate         FPredicate;
-} YYSTYPE;
+}
-#define	ESINT64VAL	257
+/* Line 1529 of yacc.c.  */
-#define	EUINT64VAL	258
+#line 398 "llvmAsmParser.tab.h"
-#define	ESAPINTVAL	259
+	YYSTYPE;
-#define	EUAPINTVAL	260
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-#define	LOCALVAL_ID	261
+# define YYSTYPE_IS_DECLARED 1
-#define	GLOBALVAL_ID	262
+# define YYSTYPE_IS_TRIVIAL 1
-#define	FPVAL	263
+#endif
-#define	VOID	264
-#define	INTTYPE	265
-#define	FLOAT	266
-#define	DOUBLE	267
-#define	X86_FP80	268
-#define	FP128	269
-#define	PPC_FP128	270
-#define	LABEL	271
-#define	TYPE	272
-#define	LOCALVAR	273
-#define	GLOBALVAR	274
-#define	LABELSTR	275
-#define	STRINGCONSTANT	276
-#define	ATSTRINGCONSTANT	277
-#define	PCTSTRINGCONSTANT	278
-#define	ZEROINITIALIZER	279
-#define	TRUETOK	280
-#define	FALSETOK	281
-#define	BEGINTOK	282
-#define	ENDTOK	283
-#define	DECLARE	284
-#define	DEFINE	285
-#define	GLOBAL	286
-#define	CONSTANT	287
-#define	SECTION	288
-#define	ALIAS	289
-#define	VOLATILE	290
-#define	THREAD_LOCAL	291
-#define	TO	292
-#define	DOTDOTDOT	293
-#define	NULL_TOK	294
-#define	UNDEF	295
-#define	INTERNAL	296
-#define	LINKONCE	297
-#define	WEAK	298
-#define	APPENDING	299
-#define	DLLIMPORT	300
-#define	DLLEXPORT	301
-#define	EXTERN_WEAK	302
-#define	OPAQUE	303
-#define	EXTERNAL	304
-#define	TARGET	305
-#define	TRIPLE	306
-#define	ALIGN	307
-#define	ADDRSPACE	308
-#define	DEPLIBS	309
-#define	CALL	310
-#define	TAIL	311
-#define	ASM_TOK	312
-#define	MODULE	313
-#define	SIDEEFFECT	314
-#define	CC_TOK	315
-#define	CCC_TOK	316
-#define	FASTCC_TOK	317
-#define	COLDCC_TOK	318
-#define	X86_STDCALLCC_TOK	319
-#define	X86_FASTCALLCC_TOK	320
-#define	DATALAYOUT	321
-#define	UNWINDS	322
-#define	RET	323
-#define	BR	324
-#define	SWITCH	325
-#define	INVOKE	326
-#define	UNWIND	327
-#define	UNREACHABLE	328
-#define	ADD	329
-#define	SUB	330
-#define	MUL	331
-#define	UDIV	332
-#define	SDIV	333
-#define	FDIV	334
-#define	UREM	335
-#define	SREM	336
-#define	FREM	337
-#define	AND	338
-#define	OR	339
-#define	XOR	340
-#define	SHL	341
-#define	LSHR	342
-#define	ASHR	343
-#define	ICMP	344
-#define	FCMP	345
-#define	EQ	346
-#define	NE	347
-#define	SLT	348
-#define	SGT	349
-#define	SLE	350
-#define	SGE	351
-#define	ULT	352
-#define	UGT	353
-#define	ULE	354
-#define	UGE	355
-#define	OEQ	356
-#define	ONE	357
-#define	OLT	358
-#define	OGT	359
-#define	OLE	360
-#define	OGE	361
-#define	ORD	362
-#define	UNO	363
-#define	UEQ	364
-#define	UNE	365
-#define	MALLOC	366
-#define	ALLOCA	367
-#define	FREE	368
-#define	LOAD	369
-#define	STORE	370
-#define	GETELEMENTPTR	371
-#define	TRUNC	372
-#define	ZEXT	373
-#define	SEXT	374
-#define	FPTRUNC	375
-#define	FPEXT	376
-#define	BITCAST	377
-#define	UITOFP	378
-#define	SITOFP	379
-#define	FPTOUI	380
-#define	FPTOSI	381
-#define	INTTOPTR	382
-#define	PTRTOINT	383
-#define	PHI_TOK	384
-#define	SELECT	385
-#define	VAARG	386
-#define	EXTRACTELEMENT	387
-#define	INSERTELEMENT	388
-#define	SHUFFLEVECTOR	389
-#define	GETRESULT	390
-#define	SIGNEXT	391
-#define	ZEROEXT	392
-#define	NORETURN	393
-#define	INREG	394
-#define	SRET	395
-#define	NOUNWIND	396
-#define	NOALIAS	397
-#define	BYVAL	398
-#define	NEST	399
-#define	READNONE	400
-#define	READONLY	401
-#define	GC	402
-#define	DEFAULT	403
-#define	HIDDEN	404
-#define	PROTECTED	405
-
 
 extern YYSTYPE llvmAsmlval;
+

lib/AsmParser/llvmAsmParser.y

@@ -1351,6 +1351,7 @@ Types
     // FIXME: remove in LLVM 3.0.
     const Type* RetTy = *$1;
     if (!(RetTy->isFirstClassType() || RetTy == Type::VoidTy ||
+          isa<StructType>(RetTy) ||
           isa<OpaqueType>(RetTy)))
       GEN_ERROR("LLVM Functions cannot return aggregates");
 

lib/AsmParser/llvmAsmParser.y.cvs

@@ -1351,6 +1351,7 @@ Types
     // FIXME: remove in LLVM 3.0.
     const Type* RetTy = *$1;
     if (!(RetTy->isFirstClassType() || RetTy == Type::VoidTy ||
+          isa<StructType>(RetTy) ||
           isa<OpaqueType>(RetTy)))
       GEN_ERROR("LLVM Functions cannot return aggregates");
 

test/Assembler/MultipleReturnValueType.ll

@@ -0,0 +1,13 @@
+; RUN: llvm-as < %s
+
+        %struct.S_102 = type { float, float }
+
+declare %struct.S_102 @f_102() nounwind
+
+@callthis = external global void ()*            ; <void ()**> [#uses=50]
+
+
+define void @foo() {
+        store void ()* bitcast (%struct.S_102 ()* @f_102 to void ()*), void ()** @callthis, align 8
+        ret void
+}