From resistor at mac.com Mon Nov 26 01:17:21 2007 From: resistor at mac.com (Owen Anderson) Date: Mon, 26 Nov 2007 07:17:21 -0000 Subject: [llvm-commits] [llvm] r44325 - /llvm/trunk/lib/Transforms/Scalar/GVN.cpp Message-ID: <200711260717.lAQ7HLdp010525@zion.cs.uiuc.edu> Author: resistor Date: Mon Nov 26 01:17:19 2007 New Revision: 44325 URL: http://llvm.org/viewvc/llvm-project?rev=44325&view=rev Log: Fix another bug that was causing siod to fail. Modified: llvm/trunk/lib/Transforms/Scalar/GVN.cpp Modified: llvm/trunk/lib/Transforms/Scalar/GVN.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/GVN.cpp?rev=44325&r1=44324&r2=44325&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/GVN.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/GVN.cpp Mon Nov 26 01:17:19 2007 @@ -150,6 +150,7 @@ void erase(Value* v); unsigned size(); void setAliasAnalysis(AliasAnalysis* A) { AA = A; } + uint32_t hash_operand(Value* v); }; } @@ -338,6 +339,15 @@ } } +uint32_t ValueTable::hash_operand(Value* v) { + if (CallInst* CI = dyn_cast(v)) + if (CI->getCalledFunction() && + !AA->doesNotAccessMemory(CI->getCalledFunction())) + return nextValueNumber++; + + return lookup_or_add(v); +} + Expression ValueTable::create_expression(CallInst* C) { Expression e; @@ -350,7 +360,7 @@ for (CallInst::op_iterator I = C->op_begin()+1, E = C->op_end(); I != E; ++I) - e.varargs.push_back(lookup_or_add(*I)); + e.varargs.push_back(hash_operand(*I)); return e; } @@ -358,8 +368,8 @@ Expression ValueTable::create_expression(BinaryOperator* BO) { Expression e; - e.firstVN = lookup_or_add(BO->getOperand(0)); - e.secondVN = lookup_or_add(BO->getOperand(1)); + e.firstVN = hash_operand(BO->getOperand(0)); + e.secondVN = hash_operand(BO->getOperand(1)); e.thirdVN = 0; e.function = 0; e.type = BO->getType(); @@ -371,8 +381,8 @@ Expression ValueTable::create_expression(CmpInst* C) { Expression e; - e.firstVN = lookup_or_add(C->getOperand(0)); - e.secondVN = lookup_or_add(C->getOperand(1)); + e.firstVN = hash_operand(C->getOperand(0)); + e.secondVN = hash_operand(C->getOperand(1)); e.thirdVN = 0; e.function = 0; e.type = C->getType(); @@ -384,7 +394,7 @@ Expression ValueTable::create_expression(CastInst* C) { Expression e; - e.firstVN = lookup_or_add(C->getOperand(0)); + e.firstVN = hash_operand(C->getOperand(0)); e.secondVN = 0; e.thirdVN = 0; e.function = 0; @@ -397,9 +407,9 @@ Expression ValueTable::create_expression(ShuffleVectorInst* S) { Expression e; - e.firstVN = lookup_or_add(S->getOperand(0)); - e.secondVN = lookup_or_add(S->getOperand(1)); - e.thirdVN = lookup_or_add(S->getOperand(2)); + e.firstVN = hash_operand(S->getOperand(0)); + e.secondVN = hash_operand(S->getOperand(1)); + e.thirdVN = hash_operand(S->getOperand(2)); e.function = 0; e.type = S->getType(); e.opcode = Expression::SHUFFLE; @@ -410,8 +420,8 @@ Expression ValueTable::create_expression(ExtractElementInst* E) { Expression e; - e.firstVN = lookup_or_add(E->getOperand(0)); - e.secondVN = lookup_or_add(E->getOperand(1)); + e.firstVN = hash_operand(E->getOperand(0)); + e.secondVN = hash_operand(E->getOperand(1)); e.thirdVN = 0; e.function = 0; e.type = E->getType(); @@ -423,9 +433,9 @@ Expression ValueTable::create_expression(InsertElementInst* I) { Expression e; - e.firstVN = lookup_or_add(I->getOperand(0)); - e.secondVN = lookup_or_add(I->getOperand(1)); - e.thirdVN = lookup_or_add(I->getOperand(2)); + e.firstVN = hash_operand(I->getOperand(0)); + e.secondVN = hash_operand(I->getOperand(1)); + e.thirdVN = hash_operand(I->getOperand(2)); e.function = 0; e.type = I->getType(); e.opcode = Expression::INSERT; @@ -436,9 +446,9 @@ Expression ValueTable::create_expression(SelectInst* I) { Expression e; - e.firstVN = lookup_or_add(I->getCondition()); - e.secondVN = lookup_or_add(I->getTrueValue()); - e.thirdVN = lookup_or_add(I->getFalseValue()); + e.firstVN = hash_operand(I->getCondition()); + e.secondVN = hash_operand(I->getTrueValue()); + e.thirdVN = hash_operand(I->getFalseValue()); e.function = 0; e.type = I->getType(); e.opcode = Expression::SELECT; @@ -449,7 +459,7 @@ Expression ValueTable::create_expression(GetElementPtrInst* G) { Expression e; - e.firstVN = lookup_or_add(G->getPointerOperand()); + e.firstVN = hash_operand(G->getPointerOperand()); e.secondVN = 0; e.thirdVN = 0; e.function = 0; @@ -458,7 +468,7 @@ for (GetElementPtrInst::op_iterator I = G->idx_begin(), E = G->idx_end(); I != E; ++I) - e.varargs.push_back(lookup_or_add(*I)); + e.varargs.push_back(hash_operand(*I)); return e; } From dpatel at apple.com Mon Nov 26 13:26:53 2007 From: dpatel at apple.com (Devang Patel) Date: Mon, 26 Nov 2007 19:26:53 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r44329 - /llvm-gcc-4.2/trunk/GNUmakefile Message-ID: <200711261926.lAQJQrwY024785@zion.cs.uiuc.edu> Author: dpatel Date: Mon Nov 26 13:26:53 2007 New Revision: 44329 URL: http://llvm.org/viewvc/llvm-project?rev=44329&view=rev Log: Use DEVELOPER_DIR if it is set. Modified: llvm-gcc-4.2/trunk/GNUmakefile Modified: llvm-gcc-4.2/trunk/GNUmakefile URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/GNUmakefile?rev=44329&r1=44328&r2=44329&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/GNUmakefile (original) +++ llvm-gcc-4.2/trunk/GNUmakefile Mon Nov 26 13:26:53 2007 @@ -39,8 +39,12 @@ ifndef DISABLE_LLVM ENABLE_LLVM = true # LLVM gets installed into /usr/local, not /usr. +ifndef DEVELOPER_DIR PREFIX = /Developer/usr/llvm-gcc-4.2 else +PREFIX = ${DEVELOPER_DIR}/usr/llvm-gcc-4.2 +endif +else ENABLE_LLVM = false endif From dpatel at apple.com Mon Nov 26 13:28:19 2007 From: dpatel at apple.com (Devang Patel) Date: Mon, 26 Nov 2007 19:28:19 -0000 Subject: [llvm-commits] [llvm-gcc-4.0] r44330 - /llvm-gcc-4.0/trunk/GNUmakefile Message-ID: <200711261928.lAQJSJ6P024927@zion.cs.uiuc.edu> Author: dpatel Date: Mon Nov 26 13:28:19 2007 New Revision: 44330 URL: http://llvm.org/viewvc/llvm-project?rev=44330&view=rev Log: Use DEVELOPER_DIR if it is set. Modified: llvm-gcc-4.0/trunk/GNUmakefile Modified: llvm-gcc-4.0/trunk/GNUmakefile URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/GNUmakefile?rev=44330&r1=44329&r2=44330&view=diff ============================================================================== --- llvm-gcc-4.0/trunk/GNUmakefile (original) +++ llvm-gcc-4.0/trunk/GNUmakefile Mon Nov 26 13:28:19 2007 @@ -39,8 +39,12 @@ ifndef DISABLE_LLVM ENABLE_LLVM = true # LLVM gets installed into /usr/local, not /usr. +#ifndef DEVELOPER_DIR PREFIX = /Developer/usr/llvm-gcc-4.0 else +PREFIX = ${DEVELOPER_DIR}/usr/lvm-gcc-4.0 +endif +else ENABLE_LLVM = false endif From dpatel at apple.com Mon Nov 26 13:48:47 2007 From: dpatel at apple.com (Devang Patel) Date: Mon, 26 Nov 2007 19:48:47 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r44331 - /llvm-gcc-4.2/trunk/build_gcc Message-ID: <200711261948.lAQJmlD0026225@zion.cs.uiuc.edu> Author: dpatel Date: Mon Nov 26 13:48:47 2007 New Revision: 44331 URL: http://llvm.org/viewvc/llvm-project?rev=44331&view=rev Log: Do not hard code LLVM_BIN_DIR. Use $DEST_ROOT value. Modified: llvm-gcc-4.2/trunk/build_gcc Modified: llvm-gcc-4.2/trunk/build_gcc URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/build_gcc?rev=44331&r1=44330&r2=44331&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/build_gcc (original) +++ llvm-gcc-4.2/trunk/build_gcc Mon Nov 26 13:48:47 2007 @@ -82,7 +82,7 @@ LLVM_SUBMIT_SUBVERSION="${11}" # LLVM_BIN_DIR - This is the place where llvm-gcc/llvm-g++ symlinks get installed. -LLVM_BIN_DIR=/Developer/usr/bin +LLVM_BIN_DIR=$DEST_ROOT/../bin # LLVM_ARCHS - This tells us which architectures we'd like the libraries to be # build for. The default is 4-way. From dpatel at apple.com Mon Nov 26 13:49:17 2007 From: dpatel at apple.com (Devang Patel) Date: Mon, 26 Nov 2007 19:49:17 -0000 Subject: [llvm-commits] [llvm-gcc-4.0] r44332 - /llvm-gcc-4.0/trunk/build_gcc Message-ID: <200711261949.lAQJnHfO026276@zion.cs.uiuc.edu> Author: dpatel Date: Mon Nov 26 13:49:16 2007 New Revision: 44332 URL: http://llvm.org/viewvc/llvm-project?rev=44332&view=rev Log: Do not hard code LLVM_BIN_DIR. Use $DEST_ROOT value. Modified: llvm-gcc-4.0/trunk/build_gcc Modified: llvm-gcc-4.0/trunk/build_gcc URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/build_gcc?rev=44332&r1=44331&r2=44332&view=diff ============================================================================== --- llvm-gcc-4.0/trunk/build_gcc (original) +++ llvm-gcc-4.0/trunk/build_gcc Mon Nov 26 13:49:16 2007 @@ -80,7 +80,7 @@ LLVM_SUBMIT_SUBVERSION="${11}" # LLVM_BIN_DIR - This is the place where llvm-gcc/llvm-g++ symlinks get installed. -LLVM_BIN_DIR=/Developer/usr/bin +LLVM_BIN_DIR=$DEST_ROOT/../bin # LLVM_ARCHS - This tells us which architectures we'd like the libraries to be # build for. The default is 4-way. From pawel.kunio at gmail.com Mon Nov 26 06:46:51 2007 From: pawel.kunio at gmail.com (pawel kunio) Date: Mon, 26 Nov 2007 13:46:51 +0100 Subject: [llvm-commits] PR889 patch Message-ID: Hello, Please find attached the changelist for PR889. As suggested in bugzilla, I devirtualized the Value destructor, renamed the destructors of Value-inherited classes to static destroythis methods, added the code for type checking and destroythis scheduling to Value destructor. Currently i am not full-time available for this project but I will try to get some new tasks on llvmdev mailing list, as time allows. Best regards, Pawel -------------- next part -------------- A non-text attachment was scrubbed... Name: llvm PR889.patch Type: application/octet-stream Size: 19270 bytes Desc: not available Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20071126/55847f74/attachment.obj From cfr at adobe.com Mon Nov 26 17:20:00 2007 From: cfr at adobe.com (Chuck Rose III) Date: Mon, 26 Nov 2007 23:20:00 -0000 Subject: [llvm-commits] [llvm] r44340 - in /llvm/trunk: utils/TableGen/TGParser.cpp win32/TableGen/TableGen.vcproj Message-ID: <200711262320.lAQNK0nA005874@zion.cs.uiuc.edu> Author: cfr Date: Mon Nov 26 17:19:59 2007 New Revision: 44340 URL: http://llvm.org/viewvc/llvm-project?rev=44340&view=rev Log: Add TGParser files to VStudio project files. Removed generated files section from TableGen project file as it is no longer needed. #Include directly from TGParser.cpp so it can see std::reverse. Modified: llvm/trunk/utils/TableGen/TGParser.cpp llvm/trunk/win32/TableGen/TableGen.vcproj Modified: llvm/trunk/utils/TableGen/TGParser.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/TGParser.cpp?rev=44340&r1=44339&r2=44340&view=diff ============================================================================== --- llvm/trunk/utils/TableGen/TGParser.cpp (original) +++ llvm/trunk/utils/TableGen/TGParser.cpp Mon Nov 26 17:19:59 2007 @@ -11,6 +11,8 @@ // //===----------------------------------------------------------------------===// +#include + #include "TGParser.h" #include "Record.h" #include "llvm/ADT/StringExtras.h" Modified: llvm/trunk/win32/TableGen/TableGen.vcproj URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/win32/TableGen/TableGen.vcproj?rev=44340&r1=44339&r2=44340&view=diff ============================================================================== --- llvm/trunk/win32/TableGen/TableGen.vcproj (original) +++ llvm/trunk/win32/TableGen/TableGen.vcproj Mon Nov 26 17:19:59 2007 @@ -388,50 +388,6 @@ > - - - - - - - - - - - - - - @@ -463,6 +419,14 @@ RelativePath="..\..\utils\TableGen\TGLexer.cpp" > + + + + - - - - - - - - - - - - - - - - - - From djg at cray.com Mon Nov 26 17:46:12 2007 From: djg at cray.com (Dan Gohman) Date: Mon, 26 Nov 2007 23:46:12 -0000 Subject: [llvm-commits] [llvm] r44341 - in /llvm/trunk: lib/CodeGen/SelectionDAG/DAGCombiner.cpp test/CodeGen/X86/urem-i8-constant.ll Message-ID: <200711262346.lAQNkCr7007422@zion.cs.uiuc.edu> Author: djg Date: Mon Nov 26 17:46:11 2007 New Revision: 44341 URL: http://llvm.org/viewvc/llvm-project?rev=44341&view=rev Log: Don't lower srem/urem X%C to X-X/C*C unless the division is actually optimized. This avoids creating illegal divisions when the combiner is running after legalize; this fixes PR1815. Also, it produces better code in the included testcase by avoiding the subtract and multiply when the division isn't optimized. Added: llvm/trunk/test/CodeGen/X86/urem-i8-constant.ll Modified: llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Modified: llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp?rev=44341&r1=44340&r2=44341&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Mon Nov 26 17:46:11 2007 @@ -1306,15 +1306,17 @@ DAG.MaskedValueIsZero(N0, SignBit)) return DAG.getNode(ISD::UREM, VT, N0, N1); - // Unconditionally lower X%C -> X-X/C*C. This allows the X/C logic to hack on - // the remainder operation. + // If X/C can be simplified by the division-by-constant logic, lower + // X%C to the equivalent of X-X/C*C. if (N1C && !N1C->isNullValue()) { SDOperand Div = DAG.getNode(ISD::SDIV, VT, N0, N1); - SDOperand Mul = DAG.getNode(ISD::MUL, VT, Div, N1); - SDOperand Sub = DAG.getNode(ISD::SUB, VT, N0, Mul); - AddToWorkList(Div.Val); - AddToWorkList(Mul.Val); - return Sub; + SDOperand OptimizedDiv = combine(Div.Val); + if (OptimizedDiv.Val && OptimizedDiv.Val != Div.Val) { + SDOperand Mul = DAG.getNode(ISD::MUL, VT, OptimizedDiv, N1); + SDOperand Sub = DAG.getNode(ISD::SUB, VT, N0, Mul); + AddToWorkList(Mul.Val); + return Sub; + } } // undef % X -> 0 @@ -1351,15 +1353,17 @@ } } - // Unconditionally lower X%C -> X-X/C*C. This allows the X/C logic to hack on - // the remainder operation. + // If X/C can be simplified by the division-by-constant logic, lower + // X%C to the equivalent of X-X/C*C. if (N1C && !N1C->isNullValue()) { SDOperand Div = DAG.getNode(ISD::UDIV, VT, N0, N1); - SDOperand Mul = DAG.getNode(ISD::MUL, VT, Div, N1); - SDOperand Sub = DAG.getNode(ISD::SUB, VT, N0, Mul); - AddToWorkList(Div.Val); - AddToWorkList(Mul.Val); - return Sub; + SDOperand OptimizedDiv = combine(Div.Val); + if (OptimizedDiv.Val && OptimizedDiv.Val != Div.Val) { + SDOperand Mul = DAG.getNode(ISD::MUL, VT, OptimizedDiv, N1); + SDOperand Sub = DAG.getNode(ISD::SUB, VT, N0, Mul); + AddToWorkList(Mul.Val); + return Sub; + } } // undef % X -> 0 Added: llvm/trunk/test/CodeGen/X86/urem-i8-constant.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/urem-i8-constant.ll?rev=44341&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/urem-i8-constant.ll (added) +++ llvm/trunk/test/CodeGen/X86/urem-i8-constant.ll Mon Nov 26 17:46:11 2007 @@ -0,0 +1,6 @@ +; RUN: llvm-as < %s | llc -march=x86 | not grep mul + +define i8 @foo(i8 %tmp325) { + %t546 = urem i8 %tmp325, 37 + ret i8 %t546 +} From djg at cray.com Mon Nov 26 18:03:40 2007 From: djg at cray.com (Dan Gohman) Date: Tue, 27 Nov 2007 00:03:40 -0000 Subject: [llvm-commits] [llvm] r44342 - /llvm/trunk/test/CodeGen/X86/2007-07-03-GR64ToVR64.ll Message-ID: <200711270003.lAR03frT008249@zion.cs.uiuc.edu> Author: djg Date: Mon Nov 26 18:03:38 2007 New Revision: 44342 URL: http://llvm.org/viewvc/llvm-project?rev=44342&view=rev Log: Remove unnecessary && from the RUN lines of this test. Modified: llvm/trunk/test/CodeGen/X86/2007-07-03-GR64ToVR64.ll Modified: llvm/trunk/test/CodeGen/X86/2007-07-03-GR64ToVR64.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2007-07-03-GR64ToVR64.ll?rev=44342&r1=44341&r2=44342&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/X86/2007-07-03-GR64ToVR64.ll (original) +++ llvm/trunk/test/CodeGen/X86/2007-07-03-GR64ToVR64.ll Mon Nov 26 18:03:38 2007 @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86-64 -mattr=+mmx | grep {movd %rsi, %mm0} && -; RUN: llvm-as < %s | llc -march=x86-64 -mattr=+mmx | grep {movd %rdi, %mm1} && +; RUN: llvm-as < %s | llc -march=x86-64 -mattr=+mmx | grep {movd %rsi, %mm0} +; RUN: llvm-as < %s | llc -march=x86-64 -mattr=+mmx | grep {movd %rdi, %mm1} ; RUN: llvm-as < %s | llc -march=x86-64 -mattr=+mmx | grep {paddusw %mm0, %mm1} @R = external global <1 x i64> ; <<1 x i64>*> [#uses=1] From djg at cray.com Mon Nov 26 18:07:34 2007 From: djg at cray.com (Dan Gohman) Date: Tue, 27 Nov 2007 00:07:34 -0000 Subject: [llvm-commits] [llvm] r44343 - /llvm/trunk/test/Assembler/2007-04-20-AlignedLoad.ll Message-ID: <200711270007.lAR07YS3008471@zion.cs.uiuc.edu> Author: djg Date: Mon Nov 26 18:07:33 2007 New Revision: 44343 URL: http://llvm.org/viewvc/llvm-project?rev=44343&view=rev Log: Don't redirect llvm-as's stderr to llvm-dis. Change grep '' to grep {}. Modified: llvm/trunk/test/Assembler/2007-04-20-AlignedLoad.ll Modified: llvm/trunk/test/Assembler/2007-04-20-AlignedLoad.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2007-04-20-AlignedLoad.ll?rev=44343&r1=44342&r2=44343&view=diff ============================================================================== --- llvm/trunk/test/Assembler/2007-04-20-AlignedLoad.ll (original) +++ llvm/trunk/test/Assembler/2007-04-20-AlignedLoad.ll Mon Nov 26 18:07:33 2007 @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s |& llvm-dis |& grep 'align 1024' +; RUN: llvm-as < %s | llvm-dis |& grep {align 1024} define i32 @test(i32* %arg) { entry: From djg at cray.com Mon Nov 26 18:10:35 2007 From: djg at cray.com (Dan Gohman) Date: Tue, 27 Nov 2007 00:10:35 -0000 Subject: [llvm-commits] [llvm] r44344 - in /llvm/trunk/test/Analysis/ScalarEvolution: 2007-07-15-NegativeStride.ll 2007-09-27-LargeStepping.ll 2007-11-18-OrInstruction.ll Message-ID: <200711270010.lAR0AZDE008720@zion.cs.uiuc.edu> Author: djg Date: Mon Nov 26 18:10:35 2007 New Revision: 44344 URL: http://llvm.org/viewvc/llvm-project?rev=44344&view=rev Log: Change grep '' to grep {}. Change 2>&1 | to |&. Modified: llvm/trunk/test/Analysis/ScalarEvolution/2007-07-15-NegativeStride.ll llvm/trunk/test/Analysis/ScalarEvolution/2007-09-27-LargeStepping.ll llvm/trunk/test/Analysis/ScalarEvolution/2007-11-18-OrInstruction.ll Modified: llvm/trunk/test/Analysis/ScalarEvolution/2007-07-15-NegativeStride.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/2007-07-15-NegativeStride.ll?rev=44344&r1=44343&r2=44344&view=diff ============================================================================== --- llvm/trunk/test/Analysis/ScalarEvolution/2007-07-15-NegativeStride.ll (original) +++ llvm/trunk/test/Analysis/ScalarEvolution/2007-07-15-NegativeStride.ll Mon Nov 26 18:10:35 2007 @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -analyze -scalar-evolution 2>&1 | grep "Loop bb: 100 iterations" +; RUN: llvm-as < %s | opt -analyze -scalar-evolution |& grep {Loop bb: 100 iterations} ; PR1533 @array = weak global [101 x i32] zeroinitializer, align 32 ; <[100 x i32]*> [#uses=1] Modified: llvm/trunk/test/Analysis/ScalarEvolution/2007-09-27-LargeStepping.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/2007-09-27-LargeStepping.ll?rev=44344&r1=44343&r2=44344&view=diff ============================================================================== --- llvm/trunk/test/Analysis/ScalarEvolution/2007-09-27-LargeStepping.ll (original) +++ llvm/trunk/test/Analysis/ScalarEvolution/2007-09-27-LargeStepping.ll Mon Nov 26 18:10:35 2007 @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -analyze -scalar-evolution 2>&1 | grep "13 iterations" +; RUN: llvm-as < %s | opt -analyze -scalar-evolution |& grep {13 iterations} ; PR1706 define i32 @f() { Modified: llvm/trunk/test/Analysis/ScalarEvolution/2007-11-18-OrInstruction.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/2007-11-18-OrInstruction.ll?rev=44344&r1=44343&r2=44344&view=diff ============================================================================== --- llvm/trunk/test/Analysis/ScalarEvolution/2007-11-18-OrInstruction.ll (original) +++ llvm/trunk/test/Analysis/ScalarEvolution/2007-11-18-OrInstruction.ll Mon Nov 26 18:10:35 2007 @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -analyze -scalar-evolution 2>&1 | grep -e '--> %b' +; RUN: llvm-as < %s | opt -analyze -scalar-evolution |& grep -e {--> %b} ; PR1810 define void @fun() { From djg at cray.com Mon Nov 26 18:50:58 2007 From: djg at cray.com (Dan Gohman) Date: Tue, 27 Nov 2007 00:50:58 -0000 Subject: [llvm-commits] [llvm] r44345 - in /llvm/trunk/test/Verifier: invoke-1.ll invoke-2.ll Message-ID: <200711270050.lAR0oweB010963@zion.cs.uiuc.edu> Author: djg Date: Mon Nov 26 18:50:57 2007 New Revision: 44345 URL: http://llvm.org/viewvc/llvm-project?rev=44345&view=rev Log: Change &| to |&. Modified: llvm/trunk/test/Verifier/invoke-1.ll llvm/trunk/test/Verifier/invoke-2.ll Modified: llvm/trunk/test/Verifier/invoke-1.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Verifier/invoke-1.ll?rev=44345&r1=44344&r2=44345&view=diff ============================================================================== --- llvm/trunk/test/Verifier/invoke-1.ll (original) +++ llvm/trunk/test/Verifier/invoke-1.ll Mon Nov 26 18:50:57 2007 @@ -1,4 +1,4 @@ -; RUN: llvm-upgrade < %s | not llvm-as &| grep {not verify as correct} +; RUN: llvm-upgrade < %s | not llvm-as |& grep {not verify as correct} ; PR1042 int %foo() { Modified: llvm/trunk/test/Verifier/invoke-2.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Verifier/invoke-2.ll?rev=44345&r1=44344&r2=44345&view=diff ============================================================================== --- llvm/trunk/test/Verifier/invoke-2.ll (original) +++ llvm/trunk/test/Verifier/invoke-2.ll Mon Nov 26 18:50:57 2007 @@ -1,4 +1,4 @@ -; RUN: llvm-upgrade < %s | not llvm-as -f &| grep {not verify as correct} +; RUN: llvm-upgrade < %s | not llvm-as -f |& grep {not verify as correct} ; PR1042 int %foo() { From cfr at adobe.com Mon Nov 26 19:25:13 2007 From: cfr at adobe.com (Chuck Rose III) Date: Tue, 27 Nov 2007 01:25:13 -0000 Subject: [llvm-commits] [llvm] r44346 - /llvm/trunk/win32/TableGen/TableGen.vcproj Message-ID: <200711270125.lAR1PD86012723@zion.cs.uiuc.edu> Author: cfr Date: Mon Nov 26 19:25:12 2007 New Revision: 44346 URL: http://llvm.org/viewvc/llvm-project?rev=44346&view=rev Log: Moving TGLexer.h from source to header file tab in TableGen project file Modified: llvm/trunk/win32/TableGen/TableGen.vcproj Modified: llvm/trunk/win32/TableGen/TableGen.vcproj URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/win32/TableGen/TableGen.vcproj?rev=44346&r1=44345&r2=44346&view=diff ============================================================================== --- llvm/trunk/win32/TableGen/TableGen.vcproj (original) +++ llvm/trunk/win32/TableGen/TableGen.vcproj Mon Nov 26 19:25:12 2007 @@ -420,10 +420,6 @@ > - - @@ -490,6 +486,10 @@ > + + From resistor at mac.com Mon Nov 26 21:33:41 2007 From: resistor at mac.com (Owen Anderson) Date: Tue, 27 Nov 2007 03:33:41 -0000 Subject: [llvm-commits] [llvm] r44347 - in /llvm/trunk/include/llvm: Analysis/Dominators.h CodeGen/MachineDominators.h Message-ID: <200711270333.lAR3Xf89019995@zion.cs.uiuc.edu> Author: resistor Date: Mon Nov 26 21:33:40 2007 New Revision: 44347 URL: http://llvm.org/viewvc/llvm-project?rev=44347&view=rev Log: Add accessor for getting the underlying templated type. This is necessary for templated LoopInfo. Modified: llvm/trunk/include/llvm/Analysis/Dominators.h llvm/trunk/include/llvm/CodeGen/MachineDominators.h Modified: llvm/trunk/include/llvm/Analysis/Dominators.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/Dominators.h?rev=44347&r1=44346&r2=44347&view=diff ============================================================================== --- llvm/trunk/include/llvm/Analysis/Dominators.h (original) +++ llvm/trunk/include/llvm/Analysis/Dominators.h Mon Nov 26 21:33:40 2007 @@ -670,6 +670,8 @@ delete DT; } + DominatorTreeBase& getBase() { return *DT; } + /// getRoots - Return the root blocks of the current CFG. This may include /// multiple blocks if we are computing post dominators. For forward /// dominators, this will always be a single block (the entry node). Modified: llvm/trunk/include/llvm/CodeGen/MachineDominators.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineDominators.h?rev=44347&r1=44346&r2=44347&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/MachineDominators.h (original) +++ llvm/trunk/include/llvm/CodeGen/MachineDominators.h Mon Nov 26 21:33:40 2007 @@ -54,10 +54,12 @@ delete DT; } - virtual void getAnalysisUsage(AnalysisUsage &AU) const { - AU.setPreservesAll(); - MachineFunctionPass::getAnalysisUsage(AU); - } + DominatorTreeBase& getBase() { return *DT; } + + virtual void getAnalysisUsage(AnalysisUsage &AU) const { + AU.setPreservesAll(); + MachineFunctionPass::getAnalysisUsage(AU); + } /// getRoots - Return the root blocks of the current CFG. This may include /// multiple blocks if we are computing post dominators. For forward From resistor at mac.com Mon Nov 26 21:43:36 2007 From: resistor at mac.com (Owen Anderson) Date: Tue, 27 Nov 2007 03:43:36 -0000 Subject: [llvm-commits] [llvm] r44348 - in /llvm/trunk: include/llvm/Analysis/LoopInfo.h lib/Analysis/LoopInfo.cpp lib/Transforms/Scalar/LoopRotation.cpp lib/Transforms/Scalar/LoopUnroll.cpp lib/Transforms/Scalar/LoopUnswitch.cpp lib/Transforms/Utils/BasicBlockUtils.cpp lib/Transforms/Utils/BreakCriticalEdges.cpp lib/Transforms/Utils/CloneLoop.cpp lib/Transforms/Utils/LoopSimplify.cpp Message-ID: <200711270343.lAR3ha8m020685@zion.cs.uiuc.edu> Author: resistor Date: Mon Nov 26 21:43:35 2007 New Revision: 44348 URL: http://llvm.org/viewvc/llvm-project?rev=44348&view=rev Log: Make LoopInfoBase more generic, in preparation for having MachineLoopInfo. This involves a small interface change. Modified: llvm/trunk/include/llvm/Analysis/LoopInfo.h llvm/trunk/lib/Analysis/LoopInfo.cpp llvm/trunk/lib/Transforms/Scalar/LoopRotation.cpp llvm/trunk/lib/Transforms/Scalar/LoopUnroll.cpp llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp llvm/trunk/lib/Transforms/Utils/BasicBlockUtils.cpp llvm/trunk/lib/Transforms/Utils/BreakCriticalEdges.cpp llvm/trunk/lib/Transforms/Utils/CloneLoop.cpp llvm/trunk/lib/Transforms/Utils/LoopSimplify.cpp Modified: llvm/trunk/include/llvm/Analysis/LoopInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/LoopInfo.h?rev=44348&r1=44347&r2=44348&view=diff ============================================================================== --- llvm/trunk/include/llvm/Analysis/LoopInfo.h (original) +++ llvm/trunk/include/llvm/Analysis/LoopInfo.h Mon Nov 26 21:43:35 2007 @@ -65,7 +65,7 @@ template class LoopBase { LoopBase *ParentLoop; - std::vector*> SubLoops; // Loops contained entirely within this one + std::vector*> SubLoops; // Loops contained entirely within this one std::vector Blocks; // First entry is the header node LoopBase(const LoopBase &); // DO NOT IMPLEMENT @@ -113,8 +113,10 @@ /// that is outside of the current loop. /// bool isLoopExit(const BlockT *BB) const { - for (succ_const_iterator SI = succ_begin(BB), SE = succ_end(BB); - SI != SE; ++SI) { + typedef GraphTraits BlockTraits; + for (typename BlockTraits::ChildIteratorType SI = + BlockTraits::child_begin(const_cast(BB)), + SE = BlockTraits::child_end(const_cast(BB)); SI != SE; ++SI) { if (!contains(*SI)) return true; } @@ -127,7 +129,10 @@ unsigned NumBackEdges = 0; BlockT *H = getHeader(); - for (pred_iterator I = pred_begin(H), E = pred_end(H); I != E; ++I) + typedef GraphTraits > InvBlockTraits; + for (typename InvBlockTraits::ChildIteratorType I = + InvBlockTraits::child_begin(const_cast(H)), + E = InvBlockTraits::child_end(const_cast(H)); I != E; ++I) if (contains(*I)) ++NumBackEdges; @@ -160,9 +165,12 @@ SmallVector LoopBBs(block_begin(), block_end()); std::sort(LoopBBs.begin(), LoopBBs.end()); + typedef GraphTraits BlockTraits; for (typename std::vector::const_iterator BI = Blocks.begin(), BE = Blocks.end(); BI != BE; ++BI) - for (succ_iterator I = succ_begin(*BI), E = succ_end(*BI); I != E; ++I) + for (typename BlockTraits::ChildIteratorType I = + BlockTraits::child_begin(*BI), E = BlockTraits::child_end(*BI); + I != E; ++I) if (!std::binary_search(LoopBBs.begin(), LoopBBs.end(), *I)) { // Not in current loop? It must be an exit block. ExitingBlocks.push_back(*BI); @@ -179,9 +187,12 @@ SmallVector LoopBBs(block_begin(), block_end()); std::sort(LoopBBs.begin(), LoopBBs.end()); + typedef GraphTraits BlockTraits; for (typename std::vector::const_iterator BI = Blocks.begin(), BE = Blocks.end(); BI != BE; ++BI) - for (succ_iterator I = succ_begin(*BI), E = succ_end(*BI); I != E; ++I) + for (typename BlockTraits::ChildIteratorType I = + BlockTraits::child_begin(*BI), E = BlockTraits::child_end(*BI); + I != E; ++I) if (!std::binary_search(LoopBBs.begin(), LoopBBs.end(), *I)) // Not in current loop? It must be an exit block. ExitBlocks.push_back(*I); @@ -205,12 +216,17 @@ BlockT *current = *BI; switchExitBlocks.clear(); - for (succ_iterator I = succ_begin(*BI), E = succ_end(*BI); I != E; ++I) { + typedef GraphTraits BlockTraits; + typedef GraphTraits > InvBlockTraits; + for (typename BlockTraits::ChildIteratorType I = + BlockTraits::child_begin(*BI), E = BlockTraits::child_end(*BI); + I != E; ++I) { if (std::binary_search(LoopBBs.begin(), LoopBBs.end(), *I)) // If block is inside the loop then it is not a exit block. continue; - - pred_iterator PI = pred_begin(*I); + + typename InvBlockTraits::ChildIteratorType PI = + InvBlockTraits::child_begin(*I); BlockT *firstPred = *PI; // If current basic block is this exit block's first predecessor @@ -223,7 +239,8 @@ // If a terminator has more then two successors, for example SwitchInst, // then it is possible that there are multiple edges from current block // to one exit block. - if (current->getTerminator()->getNumSuccessors() <= 2) { + if (std::distance(BlockTraits::child_begin(current), + BlockTraits::child_end(current)) <= 2) { ExitBlocks.push_back(*I); continue; } @@ -253,8 +270,11 @@ // Loop over the predecessors of the header node... BlockT *Header = getHeader(); - for (pred_iterator PI = pred_begin(Header), PE = pred_end(Header); - PI != PE; ++PI) + typedef GraphTraits BlockTraits; + typedef GraphTraits > InvBlockTraits; + for (typename InvBlockTraits::ChildIteratorType PI = + InvBlockTraits::child_begin(Header), + PE = InvBlockTraits::child_end(Header); PI != PE; ++PI) if (!contains(*PI)) { // If the block is not in the loop... if (Out && Out != *PI) return 0; // Multiple predecessors outside the loop @@ -263,9 +283,9 @@ // Make sure there is only one exit out of the preheader. assert(Out && "Header of loop has no predecessors from outside loop?"); - succ_iterator SI = succ_begin(Out); + typename BlockTraits::ChildIteratorType SI = BlockTraits::child_begin(Out); ++SI; - if (SI != succ_end(Out)) + if (SI != BlockTraits::child_end(Out)) return 0; // Multiple exits from the block, must not be a preheader. // If there is exactly one preheader, return it. If there was zero, then Out @@ -279,7 +299,11 @@ /// block. BlockT *getLoopLatch() const { BlockT *Header = getHeader(); - pred_iterator PI = pred_begin(Header), PE = pred_end(Header); + typedef GraphTraits > InvBlockTraits; + typename InvBlockTraits::ChildIteratorType PI = + InvBlockTraits::child_begin(Header); + typename InvBlockTraits::ChildIteratorType PE = + InvBlockTraits::child_end(Header); if (PI == PE) return 0; // no preds? BlockT *Latch = 0; @@ -307,12 +331,15 @@ BlockT *H = getHeader(); BlockT *Incoming = 0, *Backedge = 0; - pred_iterator PI = pred_begin(H); - assert(PI != pred_end(H) && "Loop must have at least one backedge!"); + typedef GraphTraits > InvBlockTraits; + typename InvBlockTraits::ChildIteratorType PI = + InvBlockTraits::child_begin(H); + assert(PI != InvBlockTraits::child_end(H) && + "Loop must have at least one backedge!"); Backedge = *PI++; - if (PI == pred_end(H)) return 0; // dead loop + if (PI == InvBlockTraits::child_end(H)) return 0; // dead loop Incoming = *PI++; - if (PI != pred_end(H)) return 0; // multiple backedges? + if (PI != InvBlockTraits::child_end(H)) return 0; // multiple backedges? if (contains(Incoming)) { if (contains(Backedge)) @@ -414,7 +441,7 @@ /// to the specified LoopInfo object as being in the current basic block. It /// is not valid to replace the loop header with this method. /// - void addBasicBlockToLoop(BlockT *NewBB, LoopInfo &LI); + void addBasicBlockToLoop(BlockT *NewBB, LoopInfoBase &LI); /// replaceChildLoopWith - This is used when splitting loops up. It replaces /// the OldChild entry in our children list with NewChild, and updates the @@ -533,7 +560,7 @@ template class LoopInfoBase { // BBMap - Mapping of basic blocks to the inner most loop they occur in - std::map BBMap; + std::map*> BBMap; std::vector*> TopLevelLoops; friend class LoopBase; @@ -562,7 +589,7 @@ /// LoopBase *getLoopFor(const BlockT *BB) const { typename std::map*>::const_iterator I= - BBMap.find(const_cast(BB)); + BBMap.find(const_cast(BB)); return I != BBMap.end() ? I->second : 0; } @@ -575,13 +602,13 @@ /// getLoopDepth - Return the loop nesting level of the specified block... /// unsigned getLoopDepth(const BlockT *BB) const { - const Loop *L = getLoopFor(BB); + const LoopBase *L = getLoopFor(BB); return L ? L->getLoopDepth() : 0; } // isLoopHeader - True if the block is a loop header node bool isLoopHeader(BlockT *BB) const { - const Loop *L = getLoopFor(BB); + const LoopBase *L = getLoopFor(BB); return L && L->getHeader() == BB; } @@ -630,7 +657,7 @@ void removeBlock(BlockT *BB) { typename std::map*>::iterator I = BBMap.find(BB); if (I != BBMap.end()) { - for (Loop *L = I->second; L; L = L->getParentLoop()) + for (LoopBase *L = I->second; L; L = L->getParentLoop()) L->removeBlockFromLoop(BB); BBMap.erase(I); @@ -639,13 +666,14 @@ // Internals - static bool isNotAlreadyContainedIn(Loop *SubLoop, Loop *ParentLoop) { + static bool isNotAlreadyContainedIn(LoopBase *SubLoop, + LoopBase *ParentLoop) { if (SubLoop == 0) return true; if (SubLoop == ParentLoop) return false; return isNotAlreadyContainedIn(SubLoop->getParentLoop(), ParentLoop); } - void Calculate(DominatorTree &DT) { + void Calculate(DominatorTreeBase &DT) { BlockT *RootNode = DT.getRootNode()->getBlock(); for (df_iterator NI = df_begin(RootNode), @@ -654,14 +682,17 @@ TopLevelLoops.push_back(L); } - LoopBase *ConsiderForLoop(BlockT *BB, DominatorTree &DT) { + LoopBase *ConsiderForLoop(BlockT *BB, DominatorTreeBase &DT) { if (BBMap.find(BB) != BBMap.end()) return 0;// Haven't processed this node? std::vector TodoStack; // Scan the predecessors of BB, checking to see if BB dominates any of // them. This identifies backedges which target this node... - for (pred_iterator I = pred_begin(BB), E = pred_end(BB); I != E; ++I) + typedef GraphTraits > InvBlockTraits; + for (typename InvBlockTraits::ChildIteratorType I = + InvBlockTraits::child_begin(BB), E = InvBlockTraits::child_end(BB); + I != E; ++I) if (DT.dominates(BB, *I)) // If BB dominates it's predecessor... TodoStack.push_back(*I); @@ -702,9 +733,12 @@ // Normal case, add the block to our loop... L->Blocks.push_back(X); - + + typedef GraphTraits > InvBlockTraits; + // Add all of the predecessors of X to the end of the work stack... - TodoStack.insert(TodoStack.end(), pred_begin(X), pred_end(X)); + TodoStack.insert(TodoStack.end(), InvBlockTraits::child_begin(X), + InvBlockTraits::child_end(X)); } } @@ -826,7 +860,6 @@ LoopInfoBase* LI; friend class LoopBase; - LoopInfoBase& getBase() { return *LI; } public: static char ID; // Pass identification, replacement for typeid @@ -836,6 +869,8 @@ ~LoopInfo() { delete LI; } + LoopInfoBase& getBase() { return *LI; } + /// iterator/begin/end - The interface to the top-level loops in the current /// function. /// @@ -941,13 +976,11 @@ template void LoopBase::addBasicBlockToLoop(BlockT *NewBB, - LoopInfo &LI) { - assert((Blocks.empty() || LI[getHeader()] == this) && + LoopInfoBase &LIB) { + assert((Blocks.empty() || LIB[getHeader()] == this) && "Incorrect LI specified for this loop!"); assert(NewBB && "Cannot add a null basic block to the loop!"); - assert(LI[NewBB] == 0 && "BasicBlock already in the loop!"); - - LoopInfoBase& LIB = LI.getBase(); + assert(LIB[NewBB] == 0 && "BasicBlock already in the loop!"); // Add the loop mapping to the LoopInfo object... LIB.BBMap[NewBB] = this; Modified: llvm/trunk/lib/Analysis/LoopInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/LoopInfo.cpp?rev=44348&r1=44347&r2=44348&view=diff ============================================================================== --- llvm/trunk/lib/Analysis/LoopInfo.cpp (original) +++ llvm/trunk/lib/Analysis/LoopInfo.cpp Mon Nov 26 21:43:35 2007 @@ -43,7 +43,7 @@ // bool LoopInfo::runOnFunction(Function &) { releaseMemory(); - LI->Calculate(getAnalysis()); // Update + LI->Calculate(getAnalysis().getBase()); // Update return false; } Modified: llvm/trunk/lib/Transforms/Scalar/LoopRotation.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LoopRotation.cpp?rev=44348&r1=44347&r2=44348&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/LoopRotation.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/LoopRotation.cpp Mon Nov 26 21:43:35 2007 @@ -451,7 +451,7 @@ NewHeader); LoopInfo &LI = LPM.getAnalysis(); if (Loop *PL = LI.getLoopFor(OrigPreHeader)) - PL->addBasicBlockToLoop(NewPreHeader, LI); + PL->addBasicBlockToLoop(NewPreHeader, LI.getBase()); new BranchInst(NewHeader, NewPreHeader); BranchInst *OrigPH_BI = cast(OrigPreHeader->getTerminator()); Modified: llvm/trunk/lib/Transforms/Scalar/LoopUnroll.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LoopUnroll.cpp?rev=44348&r1=44347&r2=44348&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/LoopUnroll.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/LoopUnroll.cpp Mon Nov 26 21:43:35 2007 @@ -358,7 +358,7 @@ VI != VE; ++VI) LastValueMap[VI->first] = VI->second; - L->addBasicBlockToLoop(New, *LI); + L->addBasicBlockToLoop(New, LI->getBase()); // Add phi entries for newly created values to all exit blocks except // the successor of the latch block. The successor of the exit block will Modified: llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp?rev=44348&r1=44347&r2=44348&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp Mon Nov 26 21:43:35 2007 @@ -542,7 +542,7 @@ for (Loop::block_iterator I = L->block_begin(), E = L->block_end(); I != E; ++I) if (LI->getLoopFor(*I) == L) - New->addBasicBlockToLoop(cast(VM[*I]), *LI); + New->addBasicBlockToLoop(cast(VM[*I]), LI->getBase()); // Add all of the subloops to the new loop. for (Loop::iterator I = L->begin(), E = L->end(); I != E; ++I) @@ -793,14 +793,14 @@ if (ParentLoop) { // Make sure to add the cloned preheader and exit blocks to the parent loop // as well. - ParentLoop->addBasicBlockToLoop(NewBlocks[0], *LI); + ParentLoop->addBasicBlockToLoop(NewBlocks[0], LI->getBase()); } for (unsigned i = 0, e = ExitBlocks.size(); i != e; ++i) { BasicBlock *NewExit = cast(ValueMap[ExitBlocks[i]]); // The new exit block should be in the same loop as the old one. if (Loop *ExitBBLoop = LI->getLoopFor(ExitBlocks[i])) - ExitBBLoop->addBasicBlockToLoop(NewExit, *LI); + ExitBBLoop->addBasicBlockToLoop(NewExit, LI->getBase()); assert(NewExit->getTerminator()->getNumSuccessors() == 1 && "Exit block should have been split to have one successor!"); Modified: llvm/trunk/lib/Transforms/Utils/BasicBlockUtils.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/BasicBlockUtils.cpp?rev=44348&r1=44347&r2=44348&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Utils/BasicBlockUtils.cpp (original) +++ llvm/trunk/lib/Transforms/Utils/BasicBlockUtils.cpp Mon Nov 26 21:43:35 2007 @@ -163,7 +163,7 @@ // The new block lives in whichever loop the old one did. if (Loop *L = LI.getLoopFor(Old)) - L->addBasicBlockToLoop(New, LI); + L->addBasicBlockToLoop(New, LI.getBase()); if (DominatorTree *DT = P->getAnalysisToUpdate()) { Modified: llvm/trunk/lib/Transforms/Utils/BreakCriticalEdges.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/BreakCriticalEdges.cpp?rev=44348&r1=44347&r2=44348&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Utils/BreakCriticalEdges.cpp (original) +++ llvm/trunk/lib/Transforms/Utils/BreakCriticalEdges.cpp Mon Nov 26 21:43:35 2007 @@ -250,13 +250,13 @@ if (Loop *DestLoop = LI->getLoopFor(DestBB)) { if (TIL == DestLoop) { // Both in the same loop, the NewBB joins loop. - DestLoop->addBasicBlockToLoop(NewBB, *LI); + DestLoop->addBasicBlockToLoop(NewBB, LI->getBase()); } else if (TIL->contains(DestLoop->getHeader())) { // Edge from an outer loop to an inner loop. Add to the outer loop. - TIL->addBasicBlockToLoop(NewBB, *LI); + TIL->addBasicBlockToLoop(NewBB, LI->getBase()); } else if (DestLoop->contains(TIL->getHeader())) { // Edge from an inner loop to an outer loop. Add to the outer loop. - DestLoop->addBasicBlockToLoop(NewBB, *LI); + DestLoop->addBasicBlockToLoop(NewBB, LI->getBase()); } else { // Edge from two loops with no containment relation. Because these // are natural loops, we know that the destination block must be the @@ -265,7 +265,7 @@ assert(DestLoop->getHeader() == DestBB && "Should not create irreducible loops!"); if (Loop *P = DestLoop->getParentLoop()) - P->addBasicBlockToLoop(NewBB, *LI); + P->addBasicBlockToLoop(NewBB, LI->getBase()); } } } Modified: llvm/trunk/lib/Transforms/Utils/CloneLoop.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/CloneLoop.cpp?rev=44348&r1=44347&r2=44348&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Utils/CloneLoop.cpp (original) +++ llvm/trunk/lib/Transforms/Utils/CloneLoop.cpp Mon Nov 26 21:43:35 2007 @@ -109,7 +109,7 @@ ValueMap[BB] = NewBB; if (P) LPM->cloneBasicBlockSimpleAnalysis(BB, NewBB, L); - NewLoop->addBasicBlockToLoop(NewBB, *LI); + NewLoop->addBasicBlockToLoop(NewBB, LI->getBase()); NewBlocks.push_back(NewBB); } Modified: llvm/trunk/lib/Transforms/Utils/LoopSimplify.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/LoopSimplify.cpp?rev=44348&r1=44347&r2=44348&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Utils/LoopSimplify.cpp (original) +++ llvm/trunk/lib/Transforms/Utils/LoopSimplify.cpp Mon Nov 26 21:43:35 2007 @@ -380,7 +380,7 @@ // We know that we have loop information to update... update it now. if (Loop *Parent = L->getParentLoop()) - Parent->addBasicBlockToLoop(NewBB, *LI); + Parent->addBasicBlockToLoop(NewBB, LI->getBase()); DT->splitBlock(NewBB); if (DominanceFrontier *DF = getAnalysisToUpdate()) @@ -412,7 +412,7 @@ while (SuccLoop && !SuccLoop->contains(L->getHeader())) SuccLoop = SuccLoop->getParentLoop(); if (SuccLoop) - SuccLoop->addBasicBlockToLoop(NewBB, *LI); + SuccLoop->addBasicBlockToLoop(NewBB, LI->getBase()); // Update Dominator Information DT->splitBlock(NewBB); @@ -558,7 +558,7 @@ // This block is going to be our new header block: add it to this loop and all // parent loops. - NewOuter->addBasicBlockToLoop(NewBB, *LI); + NewOuter->addBasicBlockToLoop(NewBB, LI->getBase()); // L is now a subloop of our outer loop. NewOuter->addChildLoop(L); @@ -693,7 +693,7 @@ // Update Loop Information - we know that this block is now in the current // loop and all parent loops. - L->addBasicBlockToLoop(BEBlock, *LI); + L->addBasicBlockToLoop(BEBlock, LI->getBase()); // Update dominator information DT->splitBlock(BEBlock); From sabre at nondot.org Tue Nov 27 00:14:13 2007 From: sabre at nondot.org (Chris Lattner) Date: Tue, 27 Nov 2007 06:14:13 -0000 Subject: [llvm-commits] [llvm] r44351 - /llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Message-ID: <200711270614.lAR6EDfT028881@zion.cs.uiuc.edu> Author: lattner Date: Tue Nov 27 00:14:12 2007 New Revision: 44351 URL: http://llvm.org/viewvc/llvm-project?rev=44351&view=rev Log: don't depend on ADL. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp?rev=44351&r1=44350&r2=44351&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Tue Nov 27 00:14:12 2007 @@ -1915,7 +1915,7 @@ SI.getSuccessorValue(i), SMBB)); } - std::sort(Cases.begin(), Cases.end(), CaseCmp()); + sort(Cases.begin(), Cases.end(), CaseCmp()); // Merge case into clusters if (Cases.size()>=2) From sabre at nondot.org Tue Nov 27 00:14:32 2007 From: sabre at nondot.org (Chris Lattner) Date: Tue, 27 Nov 2007 06:14:32 -0000 Subject: [llvm-commits] [llvm] r44352 - /llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Message-ID: <200711270614.lAR6EWPA028921@zion.cs.uiuc.edu> Author: lattner Date: Tue Nov 27 00:14:32 2007 New Revision: 44352 URL: http://llvm.org/viewvc/llvm-project?rev=44352&view=rev Log: err, no really. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp?rev=44352&r1=44351&r2=44352&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Tue Nov 27 00:14:32 2007 @@ -1915,7 +1915,7 @@ SI.getSuccessorValue(i), SMBB)); } - sort(Cases.begin(), Cases.end(), CaseCmp()); + std::sort(Cases.begin(), Cases.end(), CaseCmp()); // Merge case into clusters if (Cases.size()>=2) From zhousheng00 at gmail.com Tue Nov 27 00:17:02 2007 From: zhousheng00 at gmail.com (Zhou Sheng) Date: Tue, 27 Nov 2007 06:17:02 -0000 Subject: [llvm-commits] [llvm] r44353 - /llvm/trunk/test/CFrontend/2005-02-20-AggregateSAVEEXPR.c Message-ID: <200711270617.lAR6H2EB029102@zion.cs.uiuc.edu> Author: sheng Date: Tue Nov 27 00:17:01 2007 New Revision: 44353 URL: http://llvm.org/viewvc/llvm-project?rev=44353&view=rev Log: Make this testcase compatible with CYGWIN. Modified: llvm/trunk/test/CFrontend/2005-02-20-AggregateSAVEEXPR.c Modified: llvm/trunk/test/CFrontend/2005-02-20-AggregateSAVEEXPR.c URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CFrontend/2005-02-20-AggregateSAVEEXPR.c?rev=44353&r1=44352&r2=44353&view=diff ============================================================================== --- llvm/trunk/test/CFrontend/2005-02-20-AggregateSAVEEXPR.c (original) +++ llvm/trunk/test/CFrontend/2005-02-20-AggregateSAVEEXPR.c Tue Nov 27 00:17:01 2007 @@ -8,7 +8,11 @@ // // XFAIL: sparc -#include +#ifdef __CYGWIN__ + #include +#else + #include +#endif int foo(complex float c) { return creal(c); From echristo at apple.com Tue Nov 27 00:22:29 2007 From: echristo at apple.com (Eric Christopher) Date: Mon, 26 Nov 2007 22:22:29 -0800 Subject: [llvm-commits] [llvm] r44353 - /llvm/trunk/test/CFrontend/2005-02-20-AggregateSAVEEXPR.c In-Reply-To: <200711270617.lAR6H2EB029102@zion.cs.uiuc.edu> References: <200711270617.lAR6H2EB029102@zion.cs.uiuc.edu> Message-ID: <03D4045C-7101-46DA-B73E-B379C56E312F@apple.com> > // > // XFAIL: sparc > > -#include > +#ifdef __CYGWIN__ > + #include > +#else > + #include > +#endif IIRC this isn't quite right, you can't depend on mingw with cygwin. I think cygwin should have a complex.h, if you want to make this work for mingw then you should use __MINGW32__. -eric From zhousheng00 at gmail.com Tue Nov 27 00:23:59 2007 From: zhousheng00 at gmail.com (Zhou Sheng) Date: Tue, 27 Nov 2007 06:23:59 -0000 Subject: [llvm-commits] [llvm] r44354 - /llvm/trunk/test/CFrontend/extern-weak.c Message-ID: <200711270623.lAR6Nxoi029422@zion.cs.uiuc.edu> Author: sheng Date: Tue Nov 27 00:23:59 2007 New Revision: 44354 URL: http://llvm.org/viewvc/llvm-project?rev=44354&view=rev Log: Make this pass for CYGWIN. Modified: llvm/trunk/test/CFrontend/extern-weak.c Modified: llvm/trunk/test/CFrontend/extern-weak.c URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CFrontend/extern-weak.c?rev=44354&r1=44353&r2=44354&view=diff ============================================================================== --- llvm/trunk/test/CFrontend/extern-weak.c (original) +++ llvm/trunk/test/CFrontend/extern-weak.c Tue Nov 27 00:23:59 2007 @@ -1,7 +1,8 @@ // RUN: %llvmgcc -O3 -S -o - -emit-llvm %s | grep extern_weak // RUN: %llvmgcc -O3 -S -o - -emit-llvm %s | llvm-as | llc -#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) +#if !defined(__linux__) && !defined(__FreeBSD__) && \ + !defined(__OpenBSD__) && !defined(__CYGWIN__) void foo() __attribute__((weak_import)); #else void foo() __attribute__((weak)); From clattner at apple.com Tue Nov 27 00:31:51 2007 From: clattner at apple.com (Chris Lattner) Date: Mon, 26 Nov 2007 22:31:51 -0800 Subject: [llvm-commits] PR889 patch In-Reply-To: References: Message-ID: On Nov 26, 2007, at 4:46 AM, pawel kunio wrote: > Hello, > Please find attached the changelist for PR889. As suggested in > bugzilla, I devirtualized the Value destructor, renamed the > destructors of Value-inherited classes to static destroythis methods, > added the code for type checking and destroythis scheduling to Value > destructor. > Currently i am not full-time available for this project but I will try > to get some new tasks on llvmdev mailing list, as time allows. Very nice work Pawel! Some specific comments: --- include/llvm/BasicBlock.h (revision 44322) +++ include/llvm/BasicBlock.h (working copy) @@ -76,7 +76,7 @@ /// explicit BasicBlock(const std::string &Name = "", Function *Parent = 0, BasicBlock *InsertBefore = 0); - ~BasicBlock(); + static void destroythis(BasicBlock*); Can this and other instances of 'destroyThis' be made private or protected? I think only the ~Value() method should be public. This may require making Value a friend of everything, but that is less confusing than having this as a public method. Index: include/llvm/Constants.h =================================================================== --- include/llvm/Constants.h (revision 44322) +++ include/llvm/Constants.h (working copy) @@ -24,6 +24,7 @@ #include "llvm/Type.h" #include "llvm/ADT/APInt.h" #include "llvm/ADT/APFloat.h" +#include "llvm/Instructions.h" Please don't add this #include. Instead, use forward declarations and move code that needs it out of line (I think that moving the GetElementPtrConstantExpr ctor out of line would be enough?) +/// GetElementPtrConstantExpr - Helper class for Constants.cpp, and is +/// used behind the scenes to implement getelementpr constant exprs. +struct GetElementPtrConstantExpr : public ConstantExpr { + GetElementPtrConstantExpr(Constant *C, const std::vector &IdxList, + const Type *DestTy) Please define this as a 'class' and use "public" instead of a 'struct'. This improves compatibility with MSVC++. --- include/llvm/InlineAsm.h (revision 44322) +++ include/llvm/InlineAsm.h (working copy) @@ -36,7 +36,8 @@ InlineAsm(const FunctionType *Ty, const std::string &AsmString, const std::string &Constraints, bool hasSideEffects); - virtual ~InlineAsm(); + //static void destroythis(InlineAsm*); + //friend Value; public: Please remove :), like wise in UnaryInstruction. +++ include/llvm/Value.h (working copy) @@ -64,14 +64,17 @@ friend class ValueSymbolTable; // Allow ValueSymbolTable to directly mod Name. friend class SymbolTable; // Allow SymbolTable to directly poke Name. - ValueName *Name; +public: + ValueName *Name; Why does this need to be public? If it really needs to be public, please add a comment explaining why. Also, please remove the tab. +void ConstantArray::destroythis(ConstantArray*v) +{ + delete [] v->OperandList; } Unlike destructors, we don't get free "Chaining" of destruction up through parent classes for free. I think it would be better to explicitly model the class hierarchy here, with something like: +void ConstantArray::destroythis(ConstantArray*v) +{ + delete [] v->OperandList; Constant::destroyThis(v); } And implement destroyThis for every class (even if it's a trivial empty forwarding method that just calls destroyThis on its immediate parent class). What do you think? +Value::~Value() +{ + if(SubclassID == BasicBlockVal) + { + BasicBlock::destroythis((BasicBlock*)this); + } + else if(SubclassID == ConstantArrayVal) + { Why not use a switch on subclassid? + else if(SubclassID == ConstantExprVal && ((ConstantExpr*)this)- >SubclassData == Instruction::GetElementPtr) I'd much prefer that this look like this: case ConstantExprVal: if (cast(this)->getOpcode() == Instruction::GetElementPtr) ... + else if(SubclassID >= InstructionVal) + { + if(SubclassID == InstructionVal + Instruction::Call) + { + CallInst::destroythis((CallInst*)this); + } + else if(SubclassID == InstructionVal + Instruction::PHI) Likewise, this can be: default: if (CallInst *CI = dyn_cast(this)) CallInst::destroyThis(CI); else if (PHINode *PN = dyn_cast(this)) PHINode::destroyThis(PN); .. else Instruction::destroyThis(PN); I really think it is cleaner if CallInst::destroyThis itself chains to Instruction::destroyThis, instead of having ~Value do it. Thanks for tackling this project, it will be very nice to shrinkify everything! -Chris From clattner at apple.com Tue Nov 27 00:33:18 2007 From: clattner at apple.com (Chris Lattner) Date: Mon, 26 Nov 2007 22:33:18 -0800 Subject: [llvm-commits] [llvm] r44354 - /llvm/trunk/test/CFrontend/extern-weak.c In-Reply-To: <200711270623.lAR6Nxoi029422@zion.cs.uiuc.edu> References: <200711270623.lAR6Nxoi029422@zion.cs.uiuc.edu> Message-ID: <6BB0F51B-9FF2-464C-AA98-CD499E8AC99E@apple.com> On Nov 26, 2007, at 10:23 PM, Zhou Sheng wrote: > Author: sheng > Date: Tue Nov 27 00:23:59 2007 > New Revision: 44354 > > URL: http://llvm.org/viewvc/llvm-project?rev=44354&view=rev > Log: > Make this pass for CYGWIN. Would this be better written as: #if defined(__APPLE__) void foo() __attribute__((weak_import)); #else void foo() __attribute__((weak)); #endif ? Does any other platform use weak_import? -Chris From asl at math.spbu.ru Tue Nov 27 02:58:57 2007 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Tue, 27 Nov 2007 11:58:57 +0300 Subject: [llvm-commits] [llvm] r44353 - /llvm/trunk/test/CFrontend/2005-02-20-AggregateSAVEEXPR.c In-Reply-To: <03D4045C-7101-46DA-B73E-B379C56E312F.SS496SS@apple.com> References: <200711270617.lAR6H2EB029102@zion.cs.uiuc.edu> <03D4045C-7101-46DA-B73E-B379C56E312F.SS496SS@apple.com> Message-ID: <1196153937.10604.3.camel@asl.dorms.spbu.ru> Hello, > IIRC this isn't quite right, you can't depend on mingw with cygwin. I > think cygwin > should have a complex.h, if you want to make this work for mingw then > you should use __MINGW32__. This pretty much looks like cygwin-related stuff. Actually it needs to store two sets of headers - "native" and mingw, thus such directory. My mingw32 installation has complex.h, not mingw/complex.h. However, I don't understand, why cygwin doesn't have it's complex.h and test should use mingw-provided one. -- With best regards, Anton Korobeynikov. Faculty of Mathematics & Mechanics, Saint Petersburg State University. From echristo at apple.com Tue Nov 27 03:22:06 2007 From: echristo at apple.com (Eric Christopher) Date: Tue, 27 Nov 2007 01:22:06 -0800 Subject: [llvm-commits] [llvm] r44353 - /llvm/trunk/test/CFrontend/2005-02-20-AggregateSAVEEXPR.c In-Reply-To: <1196153937.10604.3.camel@asl.dorms.spbu.ru> References: <200711270617.lAR6H2EB029102@zion.cs.uiuc.edu> <03D4045C-7101-46DA-B73E-B379C56E312F.SS496SS@apple.com> <1196153937.10604.3.camel@asl.dorms.spbu.ru> Message-ID: >> > This pretty much looks like cygwin-related stuff. Actually it needs to > store two sets of headers - "native" and mingw, thus such directory. > > My mingw32 installation has complex.h, not mingw/complex.h. However, I > don't understand, why cygwin doesn't have it's complex.h and test > should > use mingw-provided one. Agreed, I thought it did. It has been a while since I've had a cygwin box though. I can ask those guys tomorrow though. -eric From baldrick at free.fr Tue Nov 27 07:23:12 2007 From: baldrick at free.fr (Duncan Sands) Date: Tue, 27 Nov 2007 13:23:12 -0000 Subject: [llvm-commits] [llvm] r44359 - in /llvm/trunk: docs/ include/llvm/ include/llvm/Support/ lib/Analysis/ lib/AsmParser/ lib/Bitcode/Reader/ lib/Bitcode/Writer/ lib/CodeGen/SelectionDAG/ lib/Linker/ lib/Target/CBackend/ lib/Target/MSIL/ lib/Target/X86/ lib/Transforms/IPO/ lib/Transforms/Scalar/ lib/Transforms/Utils/ lib/VMCore/ test/Assembler/ test/Feature/ test/Integer/ test/Transforms/SimplifyCFG/ tools/llvm-upgrade/ tools/llvm2cpp/ Message-ID: <200711271323.lARDNHq8025649@zion.cs.uiuc.edu> Author: baldrick Date: Tue Nov 27 07:23:08 2007 New Revision: 44359 URL: http://llvm.org/viewvc/llvm-project?rev=44359&view=rev Log: Fix PR1146: parameter attributes are longer part of the function type, instead they belong to functions and function calls. This is an updated and slightly corrected version of Reid Spencer's original patch. The only known problem is that auto-upgrading of bitcode files doesn't seem to work properly (see test/Bitcode/AutoUpgradeIntrinsics.ll). Hopefully a bitcode guru (who might that be? :) ) will fix it. Added: llvm/trunk/test/Assembler/2007-11-26-AttributeOverload.ll llvm/trunk/test/Assembler/2007-11-27-AutoUpgradeAttributes.ll Modified: llvm/trunk/docs/LangRef.html llvm/trunk/include/llvm/DerivedTypes.h llvm/trunk/include/llvm/Function.h llvm/trunk/include/llvm/Instructions.h llvm/trunk/include/llvm/ParameterAttributes.h llvm/trunk/include/llvm/Support/CallSite.h llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs llvm/trunk/lib/AsmParser/llvmAsmParser.y llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.cpp llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp llvm/trunk/lib/Linker/LinkModules.cpp llvm/trunk/lib/Target/CBackend/CBackend.cpp llvm/trunk/lib/Target/MSIL/MSILWriter.cpp llvm/trunk/lib/Target/X86/X86AsmPrinter.cpp llvm/trunk/lib/Target/X86/X86ISelLowering.cpp llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp llvm/trunk/lib/Transforms/IPO/ExtractFunction.cpp llvm/trunk/lib/Transforms/IPO/LowerSetJmp.cpp llvm/trunk/lib/Transforms/IPO/PruneEH.cpp llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp llvm/trunk/lib/Transforms/Scalar/LowerGC.cpp llvm/trunk/lib/Transforms/Scalar/SimplifyCFG.cpp llvm/trunk/lib/Transforms/Utils/CloneFunction.cpp llvm/trunk/lib/Transforms/Utils/CloneModule.cpp llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp llvm/trunk/lib/Transforms/Utils/LowerInvoke.cpp llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp llvm/trunk/lib/VMCore/AsmWriter.cpp llvm/trunk/lib/VMCore/AutoUpgrade.cpp llvm/trunk/lib/VMCore/Function.cpp llvm/trunk/lib/VMCore/Instructions.cpp llvm/trunk/lib/VMCore/Type.cpp llvm/trunk/lib/VMCore/Verifier.cpp llvm/trunk/test/Assembler/2006-05-26-VarargsCallEncode.ll llvm/trunk/test/Assembler/2007-02-07-UpgradeCSRETCC.ll llvm/trunk/test/Feature/paramattrs.ll llvm/trunk/test/Integer/paramattrs_bt.ll llvm/trunk/test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll llvm/trunk/tools/llvm-upgrade/UpgradeParser.cpp.cvs llvm/trunk/tools/llvm-upgrade/UpgradeParser.h.cvs llvm/trunk/tools/llvm-upgrade/UpgradeParser.y llvm/trunk/tools/llvm-upgrade/UpgradeParser.y.cvs llvm/trunk/tools/llvm2cpp/CppWriter.cpp Modified: llvm/trunk/docs/LangRef.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/LangRef.html?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/docs/LangRef.html (original) +++ llvm/trunk/docs/LangRef.html Tue Nov 27 07:23:08 2007 @@ -764,9 +764,9 @@

The return type and each parameter of a function type may have a set of parameter attributes associated with them. Parameter attributes are used to communicate additional information about the result or parameters of - a function. Parameter attributes are considered to be part of the function - type so two functions types that differ only by the parameter attributes - are different function types.

+ a function. Parameter attributes are considered to be part of the function, + not of the function type, so functions with different parameter attributes + can have the same function type.

Parameter attributes are simple keywords that follow the type specified. If multiple parameter attributes are needed, they are space separated. For @@ -774,15 +774,13 @@ 

-%someFunc = i16 (i8 signext %someParam) zeroext
-%someFunc = i16 (i8 zeroext %someParam) zeroext
+declare i32 @printf(i8* noalias , ...) nounwind
+declare i32 @atoi(i8*) nounwind readonly
-

Note that the two function types above are unique because the parameter has - a different attribute (signext in the first one, zeroext in - the second). Also note that the attribute for the function result - (zeroext) comes immediately after the argument list.

+

Note that any attributes for the function result (nounwind, + readonly) come immediately after the argument list.

Currently, only the following parameter attributes are defined:

Modified: llvm/trunk/include/llvm/DerivedTypes.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DerivedTypes.h?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/include/llvm/DerivedTypes.h (original) +++ llvm/trunk/include/llvm/DerivedTypes.h Tue Nov 27 07:23:08 2007 @@ -31,7 +31,6 @@ class VectorValType; class IntegerValType; class APInt; -class ParamAttrsList; class DerivedType : public Type { friend class Type; @@ -140,12 +139,11 @@ class FunctionType : public DerivedType { friend class TypeMap; bool isVarArgs; - const ParamAttrsList *ParamAttrs; FunctionType(const FunctionType &); // Do not implement const FunctionType &operator=(const FunctionType &); // Do not implement FunctionType(const Type *Result, const std::vector &Params, - bool IsVarArgs, const ParamAttrsList *Attrs = 0); + bool IsVarArgs); public: /// FunctionType::get - This static method is the primary way of constructing @@ -154,12 +152,7 @@ static FunctionType *get( const Type *Result, ///< The result type const std::vector &Params, ///< The types of the parameters - bool isVarArg, ///< Whether this is a variable argument length function - const ParamAttrsList *Attrs = 0 - ///< Indicates the parameter attributes to use, if any. The 0th entry - ///< in the list refers to the return type. Parameters are numbered - ///< starting at 1. This argument must be on the heap and FunctionType - ///< owns it after its passed here. + bool isVarArg ///< Whether this is a variable argument length function ); inline bool isVarArg() const { return isVarArgs; } @@ -177,14 +170,6 @@ /// unsigned getNumParams() const { return NumContainedTys - 1; } - bool isStructReturn() const; - - /// The parameter attributes for the \p ith parameter are returned. The 0th - /// parameter refers to the return type of the function. - /// @returns The ParameterAttributes for the \p ith parameter. - /// @brief Get the attributes for a parameter - const ParamAttrsList *getParamAttrs() const { return ParamAttrs; } - // Implement the AbstractTypeUser interface. virtual void refineAbstractType(const DerivedType *OldTy, const Type *NewTy); virtual void typeBecameConcrete(const DerivedType *AbsTy); Modified: llvm/trunk/include/llvm/Function.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Function.h?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/include/llvm/Function.h (original) +++ llvm/trunk/include/llvm/Function.h Tue Nov 27 07:23:08 2007 @@ -68,7 +68,7 @@ BasicBlockListType BasicBlocks; ///< The basic blocks mutable ArgumentListType ArgumentList; ///< The formal arguments ValueSymbolTable *SymTab; ///< Symbol table of args/instructions - ParamAttrsList *ParamAttrs; ///< Parameter attributes + const ParamAttrsList *ParamAttrs; ///< Parameter attributes // The Calling Convention is stored in Value::SubclassData. /*unsigned CallingConvention;*/ @@ -150,7 +150,10 @@ /// Sets the parameter attributes for this Function. To construct a /// ParamAttrsList, see ParameterAttributes.h /// @brief Set the parameter attributes. - void setParamAttrs(ParamAttrsList *attrs); + void setParamAttrs(const ParamAttrsList *attrs); + + /// @brief Determine if the function returns a structure. + bool isStructReturn() const; /// deleteBody - This method deletes the body of the function, and converts /// the linkage to external. Modified: llvm/trunk/include/llvm/Instructions.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Instructions.h?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/include/llvm/Instructions.h (original) +++ llvm/trunk/include/llvm/Instructions.h Tue Nov 27 07:23:08 2007 @@ -836,7 +836,7 @@ /// class CallInst : public Instruction { - ParamAttrsList *ParamAttrs; ///< parameter attributes for call + const ParamAttrsList *ParamAttrs; ///< parameter attributes for call CallInst(const CallInst &CI); void init(Value *Func, Value* const *Params, unsigned NumParams); void init(Value *Func, Value *Actual1, Value *Actual2); @@ -916,12 +916,15 @@ /// parameter attributes information, if any. /// @returns 0 if no attributes have been set. /// @brief Get the parameter attributes. - ParamAttrsList *getParamAttrs() const { return ParamAttrs; } + const ParamAttrsList *getParamAttrs() const { return ParamAttrs; } /// Sets the parameter attributes for this CallInst. To construct a /// ParamAttrsList, see ParameterAttributes.h /// @brief Set the parameter attributes. - void setParamAttrs(ParamAttrsList *attrs); + void setParamAttrs(const ParamAttrsList *attrs); + + /// @brief Determine if the call returns a structure. + bool isStructReturn() const; /// getCalledFunction - Return the function being called by this instruction /// if it is a direct call. If it is a call through a function pointer, @@ -1620,7 +1623,7 @@ /// calling convention of the call. /// class InvokeInst : public TerminatorInst { - ParamAttrsList *ParamAttrs; + const ParamAttrsList *ParamAttrs; InvokeInst(const InvokeInst &BI); void init(Value *Fn, BasicBlock *IfNormal, BasicBlock *IfException, Value* const *Args, unsigned NumArgs); @@ -1691,12 +1694,15 @@ /// parameter attributes information, if any. /// @returns 0 if no attributes have been set. /// @brief Get the parameter attributes. - ParamAttrsList *getParamAttrs() const { return ParamAttrs; } + const ParamAttrsList *getParamAttrs() const { return ParamAttrs; } /// Sets the parameter attributes for this InvokeInst. To construct a /// ParamAttrsList, see ParameterAttributes.h /// @brief Set the parameter attributes. - void setParamAttrs(ParamAttrsList *attrs); + void setParamAttrs(const ParamAttrsList *attrs); + + /// @brief Determine if the call returns a structure. + bool isStructReturn() const; /// getCalledFunction - Return the function called, or null if this is an /// indirect function invocation. Modified: llvm/trunk/include/llvm/ParameterAttributes.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ParameterAttributes.h?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/include/llvm/ParameterAttributes.h (original) +++ llvm/trunk/include/llvm/ParameterAttributes.h Tue Nov 27 07:23:08 2007 @@ -77,7 +77,7 @@ /// with a parameter index. /// @brief ParameterAttributes with a parameter index. struct ParamAttrsWithIndex { - uint16_t attrs; ///< The attributes that are set, |'d together + uint16_t attrs; ///< The attributes that are set, or'd together uint16_t index; ///< Index of the parameter for which the attributes apply static ParamAttrsWithIndex get(uint16_t idx, uint16_t attrs) { @@ -219,6 +219,13 @@ /// @brief Return the number of parameter attributes this type has. unsigned size() const { return attrs.size(); } + /// @brief Return the number of references to this ParamAttrsList. + unsigned numRefs() const { return refCount; } + + /// @} + /// @name Mutators + /// @{ + public: /// Classes retaining references to ParamAttrsList objects should call this /// method to increment the reference count. This ensures that the /// ParamAttrsList object will not disappear until the class drops it. Modified: llvm/trunk/include/llvm/Support/CallSite.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/CallSite.h?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/include/llvm/Support/CallSite.h (original) +++ llvm/trunk/include/llvm/Support/CallSite.h Tue Nov 27 07:23:08 2007 @@ -27,6 +27,7 @@ class CallInst; class InvokeInst; +class ParamAttrsList; class CallSite { Instruction *I; @@ -57,6 +58,11 @@ unsigned getCallingConv() const; void setCallingConv(unsigned CC); + /// getParamAttrs/setParamAttrs - get or set the parameter attributes of + /// the call. + const ParamAttrsList *getParamAttrs() const; + void setParamAttrs(const ParamAttrsList *PAL); + /// getType - Return the type of the instruction that generated this call site /// const Type *getType() const { return I->getType(); } Modified: llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp (original) +++ llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp Tue Nov 27 07:23:08 2007 @@ -268,7 +268,7 @@ static bool isNoAliasArgument(const Argument *Arg) { const Function *Func = Arg->getParent(); - const ParamAttrsList *Attr = Func->getFunctionType()->getParamAttrs(); + const ParamAttrsList *Attr = Func->getParamAttrs(); if (Attr) { unsigned Idx = 1; for (Function::const_arg_iterator I = Func->arg_begin(), @@ -839,7 +839,7 @@ return UnknownModRefBehavior; } - const ParamAttrsList *Attrs = F->getFunctionType()->getParamAttrs(); + const ParamAttrsList *Attrs = F->getParamAttrs(); if (Attrs && Attrs->paramHasAttr(0, ParamAttr::ReadNone)) return DoesNotAccessMemory; if (Attrs && Attrs->paramHasAttr(0, ParamAttr::ReadOnly)) Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs (original) +++ llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs Tue Nov 27 07:23:08 2007 @@ -214,8 +214,8 @@ NOALIAS = 395, BYVAL = 396, NEST = 397, - CONST = 398, - PURE = 399, + READNONE = 398, + READONLY = 399, DEFAULT = 400, HIDDEN = 401, PROTECTED = 402 @@ -362,8 +362,8 @@ #define NOALIAS 395 #define BYVAL 396 #define NEST 397 -#define CONST 398 -#define PURE 399 +#define READNONE 398 +#define READONLY 399 #define DEFAULT 400 #define HIDDEN 401 #define PROTECTED 402 @@ -372,7 +372,7 @@ /* Copy the first part of user declarations. */ -#line 14 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 14 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" #include "ParserInternals.h" #include "llvm/CallingConv.h" @@ -391,9 +391,6 @@ #include #include #include -#ifndef NDEBUG -#define YYDEBUG 1 -#endif // The following is a gross hack. In order to rid the libAsmParser library of // exceptions, we have to have a way of getting the yyparse function to go into @@ -413,15 +410,6 @@ int yyerror(const char *ErrorMsg); // Forward declarations to prevent "implicit int yylex(); // declaration" of xxx warnings. int yyparse(); - -namespace llvm { - std::string CurFilename; -#if YYDEBUG -static cl::opt -Debug("debug-yacc", cl::desc("Print yacc debug state changes"), - cl::Hidden, cl::init(false)); -#endif -} using namespace llvm; static Module *ParserResult; @@ -875,7 +863,7 @@ // Remember where this forward reference came from. FIXME, shouldn't we try // to recycle these things?? CurModule.PlaceHolderInfo.insert(std::make_pair(V, std::make_pair(ID, - llvmAsmlineno))); + LLLgetLineNo()))); if (inFunctionScope()) InsertValue(V, CurFun.LateResolveValues); @@ -1307,22 +1295,11 @@ // static Module* RunParser(Module * M); -Module *llvm::RunVMAsmParser(const std::string &Filename, FILE *F) { - set_scan_file(F); - - CurFilename = Filename; - return RunParser(new Module(CurFilename)); -} - -Module *llvm::RunVMAsmParser(const char * AsmString, Module * M) { - set_scan_string(AsmString); - - CurFilename = "from_memory"; - if (M == NULL) { - return RunParser(new Module (CurFilename)); - } else { - return RunParser(M); - } +Module *llvm::RunVMAsmParser(llvm::MemoryBuffer *MB) { + InitLLLexer(MB); + Module *M = RunParser(new Module(LLLgetFilename())); + FreeLexer(); + return M; } @@ -1347,7 +1324,7 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 968 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 945 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { llvm::Module *ModuleVal; llvm::Function *FunctionVal; @@ -1394,8 +1371,8 @@ llvm::ICmpInst::Predicate IPredicate; llvm::FCmpInst::Predicate FPredicate; } -/* Line 193 of yacc.c. */ -#line 1399 "llvmAsmParser.tab.c" +/* Line 187 of yacc.c. */ +#line 1376 "llvmAsmParser.tab.c" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -1408,7 +1385,7 @@ /* Line 216 of yacc.c. */ -#line 1412 "llvmAsmParser.tab.c" +#line 1389 "llvmAsmParser.tab.c" #ifdef short # undef short @@ -1458,7 +1435,7 @@ #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) #ifndef YY_ -# if defined YYENABLE_NLS && YYENABLE_NLS +# if YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ # define YY_(msgid) dgettext ("bison-runtime", msgid) @@ -1623,7 +1600,7 @@ /* YYFINAL -- State number of the termination state. */ #define YYFINAL 43 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1754 +#define YYLAST 1816 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 162 @@ -1632,7 +1609,7 @@ /* YYNRULES -- Number of rules. */ #define YYNRULES 314 /* YYNRULES -- Number of states. */ -#define YYNSTATES 602 +#define YYNSTATES 608 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -1720,10 +1697,10 @@ 690, 692, 694, 696, 700, 702, 708, 710, 712, 714, 716, 718, 720, 723, 726, 729, 733, 736, 737, 739, 742, 745, 749, 759, 769, 778, 793, 795, 797, 804, - 810, 813, 820, 828, 832, 836, 842, 848, 849, 850, - 854, 857, 859, 865, 871, 878, 885, 890, 897, 902, - 907, 914, 921, 924, 933, 935, 937, 938, 942, 949, - 953, 960, 963, 969, 977 + 810, 813, 820, 828, 833, 838, 845, 852, 853, 854, + 858, 861, 863, 869, 875, 882, 889, 894, 901, 906, + 911, 918, 925, 928, 937, 939, 941, 942, 946, 953, + 957, 964, 967, 973, 981 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ @@ -1752,7 +1729,7 @@ 135, -1, 117, -1, 134, -1, 118, -1, 137, -1, 138, -1, 140, -1, 141, -1, 142, -1, -1, 184, 183, -1, 136, -1, 139, -1, 135, -1, 134, -1, - 144, -1, 143, -1, -1, 186, 185, -1, -1, 53, + 143, -1, 144, -1, -1, 186, 185, -1, -1, 53, 4, -1, -1, 149, 53, 4, -1, 34, 22, -1, -1, 189, -1, -1, 149, 192, 191, -1, 189, -1, 53, 4, -1, 11, -1, 12, -1, 13, -1, 16, @@ -1811,60 +1788,60 @@ 17, 229, -1, 71, -1, 72, -1, 235, 168, 227, 149, 17, 229, -1, 168, 227, 149, 17, 229, -1, 172, 241, -1, 194, 154, 229, 149, 229, 156, -1, - 237, 149, 154, 229, 149, 229, 156, -1, 194, 229, - 184, -1, 17, 229, 184, -1, 238, 149, 194, 229, - 184, -1, 238, 149, 17, 229, 184, -1, -1, -1, - 239, 149, 230, -1, 56, 55, -1, 55, -1, 163, - 194, 229, 149, 229, -1, 164, 194, 229, 149, 229, - -1, 88, 166, 194, 229, 149, 229, -1, 89, 167, - 194, 229, 149, 229, -1, 165, 230, 38, 194, -1, - 129, 230, 149, 230, 149, 230, -1, 130, 230, 149, - 194, -1, 131, 230, 149, 230, -1, 132, 230, 149, - 230, 149, 230, -1, 133, 230, 149, 230, 149, 230, - -1, 128, 237, -1, 240, 182, 196, 229, 152, 238, - 153, 186, -1, 243, -1, 36, -1, -1, 110, 194, - 188, -1, 110, 194, 149, 11, 229, 188, -1, 111, - 194, 188, -1, 111, 194, 149, 11, 229, 188, -1, - 112, 230, -1, 242, 113, 194, 229, 188, -1, 242, - 114, 230, 149, 194, 229, 188, -1, 115, 194, 229, - 239, -1 + 237, 149, 154, 229, 149, 229, 156, -1, 194, 184, + 229, 184, -1, 17, 184, 229, 184, -1, 238, 149, + 194, 184, 229, 184, -1, 238, 149, 17, 184, 229, + 184, -1, -1, -1, 239, 149, 230, -1, 56, 55, + -1, 55, -1, 163, 194, 229, 149, 229, -1, 164, + 194, 229, 149, 229, -1, 88, 166, 194, 229, 149, + 229, -1, 89, 167, 194, 229, 149, 229, -1, 165, + 230, 38, 194, -1, 129, 230, 149, 230, 149, 230, + -1, 130, 230, 149, 194, -1, 131, 230, 149, 230, + -1, 132, 230, 149, 230, 149, 230, -1, 133, 230, + 149, 230, 149, 230, -1, 128, 237, -1, 240, 182, + 196, 229, 152, 238, 153, 186, -1, 243, -1, 36, + -1, -1, 110, 194, 188, -1, 110, 194, 149, 11, + 229, 188, -1, 111, 194, 188, -1, 111, 194, 149, + 11, 229, 188, -1, 112, 230, -1, 242, 113, 194, + 229, 188, -1, 242, 114, 230, 149, 194, 229, 188, + -1, 115, 194, 229, 239, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 1128, 1128, 1128, 1128, 1128, 1128, 1128, 1128, 1128, - 1128, 1129, 1129, 1129, 1129, 1129, 1129, 1130, 1130, 1130, - 1130, 1130, 1130, 1131, 1131, 1131, 1131, 1131, 1131, 1134, - 1134, 1135, 1135, 1136, 1136, 1137, 1137, 1138, 1138, 1142, - 1142, 1143, 1143, 1144, 1144, 1145, 1145, 1146, 1146, 1147, - 1147, 1148, 1148, 1149, 1150, 1155, 1156, 1156, 1156, 1156, - 1156, 1158, 1158, 1158, 1159, 1159, 1163, 1167, 1172, 1172, - 1174, 1175, 1180, 1186, 1187, 1188, 1189, 1190, 1194, 1195, - 1196, 1200, 1201, 1202, 1203, 1207, 1208, 1209, 1213, 1214, - 1215, 1216, 1217, 1221, 1222, 1223, 1226, 1227, 1228, 1229, - 1230, 1231, 1232, 1239, 1240, 1241, 1242, 1243, 1244, 1245, - 1246, 1247, 1250, 1251, 1256, 1257, 1258, 1259, 1260, 1261, - 1264, 1265, 1272, 1273, 1279, 1280, 1288, 1296, 1297, 1302, - 1303, 1304, 1309, 1322, 1322, 1322, 1322, 1322, 1322, 1322, - 1325, 1329, 1333, 1340, 1345, 1353, 1383, 1414, 1419, 1429, - 1439, 1443, 1453, 1460, 1467, 1474, 1479, 1484, 1491, 1492, - 1499, 1506, 1514, 1520, 1532, 1560, 1576, 1603, 1631, 1657, - 1677, 1703, 1723, 1735, 1742, 1808, 1818, 1828, 1834, 1844, - 1850, 1860, 1865, 1870, 1883, 1895, 1917, 1925, 1931, 1942, - 1947, 1952, 1958, 1964, 1973, 1977, 1985, 1985, 1988, 1988, - 1991, 2003, 2024, 2029, 2037, 2038, 2042, 2042, 2046, 2046, - 2049, 2052, 2076, 2087, 2087, 2098, 2097, 2107, 2106, 2117, - 2157, 2160, 2166, 2176, 2180, 2185, 2187, 2192, 2197, 2206, - 2216, 2227, 2231, 2240, 2249, 2254, 2375, 2375, 2377, 2386, - 2386, 2388, 2393, 2405, 2409, 2414, 2418, 2422, 2426, 2430, - 2434, 2438, 2442, 2446, 2471, 2475, 2485, 2489, 2493, 2498, - 2505, 2505, 2511, 2520, 2524, 2533, 2542, 2551, 2555, 2562, - 2566, 2570, 2575, 2585, 2604, 2613, 2693, 2697, 2704, 2715, - 2728, 2738, 2749, 2759, 2768, 2774, 2783, 2789, 2792, 2793, - 2800, 2804, 2809, 2825, 2842, 2856, 2870, 2882, 2890, 2897, - 2903, 2909, 2915, 2930, 3015, 3020, 3024, 3031, 3038, 3046, - 3053, 3061, 3069, 3083, 3100 + 0, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, + 1105, 1106, 1106, 1106, 1106, 1106, 1106, 1107, 1107, 1107, + 1107, 1107, 1107, 1108, 1108, 1108, 1108, 1108, 1108, 1111, + 1111, 1112, 1112, 1113, 1113, 1114, 1114, 1115, 1115, 1119, + 1119, 1120, 1120, 1121, 1121, 1122, 1122, 1123, 1123, 1124, + 1124, 1125, 1125, 1126, 1127, 1132, 1133, 1133, 1133, 1133, + 1133, 1135, 1135, 1135, 1136, 1136, 1140, 1144, 1149, 1149, + 1151, 1152, 1157, 1163, 1164, 1165, 1166, 1167, 1171, 1172, + 1173, 1177, 1178, 1179, 1180, 1184, 1185, 1186, 1190, 1191, + 1192, 1193, 1194, 1198, 1199, 1200, 1203, 1204, 1205, 1206, + 1207, 1208, 1209, 1216, 1217, 1218, 1219, 1220, 1221, 1222, + 1223, 1224, 1227, 1228, 1233, 1234, 1235, 1236, 1237, 1238, + 1241, 1242, 1249, 1250, 1256, 1257, 1265, 1273, 1274, 1279, + 1280, 1281, 1286, 1299, 1299, 1299, 1299, 1299, 1299, 1299, + 1302, 1306, 1310, 1317, 1322, 1330, 1348, 1366, 1371, 1381, + 1391, 1395, 1405, 1412, 1421, 1428, 1433, 1438, 1445, 1446, + 1453, 1460, 1468, 1474, 1486, 1514, 1530, 1557, 1585, 1611, + 1631, 1657, 1677, 1689, 1696, 1762, 1772, 1782, 1788, 1798, + 1804, 1814, 1819, 1824, 1837, 1849, 1871, 1879, 1885, 1896, + 1901, 1906, 1912, 1918, 1927, 1931, 1939, 1939, 1942, 1942, + 1945, 1957, 1978, 1983, 1991, 1992, 1996, 1996, 2000, 2000, + 2003, 2006, 2030, 2041, 2041, 2052, 2051, 2061, 2060, 2071, + 2111, 2114, 2120, 2130, 2134, 2139, 2141, 2146, 2151, 2160, + 2170, 2181, 2185, 2194, 2203, 2208, 2338, 2338, 2340, 2349, + 2349, 2351, 2356, 2368, 2372, 2377, 2381, 2385, 2389, 2393, + 2397, 2401, 2405, 2409, 2434, 2438, 2448, 2452, 2456, 2461, + 2468, 2468, 2474, 2483, 2487, 2496, 2505, 2514, 2518, 2525, + 2529, 2533, 2538, 2548, 2567, 2576, 2660, 2664, 2671, 2682, + 2695, 2705, 2716, 2726, 2737, 2745, 2755, 2762, 2765, 2766, + 2773, 2777, 2782, 2798, 2815, 2829, 2843, 2855, 2863, 2870, + 2876, 2882, 2888, 2903, 2994, 2999, 3003, 3010, 3017, 3025, + 3032, 3040, 3048, 3062, 3079 }; #endif @@ -1894,27 +1871,28 @@ "FPEXT", "BITCAST", "UITOFP", "SITOFP", "FPTOUI", "FPTOSI", "INTTOPTR", "PTRTOINT", "PHI_TOK", "SELECT", "VAARG", "EXTRACTELEMENT", "INSERTELEMENT", "SHUFFLEVECTOR", "SIGNEXT", "ZEROEXT", "NORETURN", - "INREG", "SRET", "NOUNWIND", "NOALIAS", "BYVAL", "NEST", "CONST", "PURE", - "DEFAULT", "HIDDEN", "PROTECTED", "'='", "','", "'*'", "'\\\\'", "'('", - "')'", "'['", "'x'", "']'", "'<'", "'>'", "'{'", "'}'", "'c'", "$accept", - "ArithmeticOps", "LogicalOps", "CastOps", "IPredicates", "FPredicates", - "IntType", "FPType", "LocalName", "OptLocalName", "OptLocalAssign", - "GlobalName", "OptGlobalAssign", "GlobalAssign", "GVInternalLinkage", - "GVExternalLinkage", "GVVisibilityStyle", "FunctionDeclareLinkage", - "FunctionDefineLinkage", "AliasLinkage", "OptCallingConv", "ParamAttr", - "OptParamAttrs", "FuncAttr", "OptFuncAttrs", "OptAlign", "OptCAlign", - "SectionString", "OptSection", "GlobalVarAttributes", - "GlobalVarAttribute", "PrimType", "Types", "ArgType", "ResultTypes", - "ArgTypeList", "ArgTypeListI", "TypeListI", "ConstVal", "ConstExpr", - "ConstVector", "GlobalType", "ThreadLocal", "AliaseeRef", "Module", - "DefinitionList", "Definition", "@1", "@2", "@3", "@4", "@5", "AsmBlock", - "TargetDefinition", "LibrariesDefinition", "LibList", "ArgListH", - "ArgList", "FunctionHeaderH", "BEGIN", "FunctionHeader", "END", - "Function", "FunctionProto", "OptSideEffect", "ConstValueRef", - "SymbolicValueRef", "ValueRef", "ResolvedVal", "BasicBlockList", - "BasicBlock", "InstructionList", "BBTerminatorInst", "JumpTable", "Inst", - "PHIList", "ParamList", "IndexList", "OptTailCall", "InstVal", - "OptVolatile", "MemoryInst", 0 + "INREG", "SRET", "NOUNWIND", "NOALIAS", "BYVAL", "NEST", "READNONE", + "READONLY", "DEFAULT", "HIDDEN", "PROTECTED", "'='", "','", "'*'", + "'\\\\'", "'('", "')'", "'['", "'x'", "']'", "'<'", "'>'", "'{'", "'}'", + "'c'", "$accept", "ArithmeticOps", "LogicalOps", "CastOps", + "IPredicates", "FPredicates", "IntType", "FPType", "LocalName", + "OptLocalName", "OptLocalAssign", "GlobalName", "OptGlobalAssign", + "GlobalAssign", "GVInternalLinkage", "GVExternalLinkage", + "GVVisibilityStyle", "FunctionDeclareLinkage", "FunctionDefineLinkage", + "AliasLinkage", "OptCallingConv", "ParamAttr", "OptParamAttrs", + "FuncAttr", "OptFuncAttrs", "OptAlign", "OptCAlign", "SectionString", + "OptSection", "GlobalVarAttributes", "GlobalVarAttribute", "PrimType", + "Types", "ArgType", "ResultTypes", "ArgTypeList", "ArgTypeListI", + "TypeListI", "ConstVal", "ConstExpr", "ConstVector", "GlobalType", + "ThreadLocal", "AliaseeRef", "Module", "DefinitionList", "Definition", + "@1", "@2", "@3", "@4", "@5", "AsmBlock", "TargetDefinition", + "LibrariesDefinition", "LibList", "ArgListH", "ArgList", + "FunctionHeaderH", "BEGIN", "FunctionHeader", "END", "Function", + "FunctionProto", "OptSideEffect", "ConstValueRef", "SymbolicValueRef", + "ValueRef", "ResolvedVal", "BasicBlockList", "BasicBlock", + "InstructionList", "BBTerminatorInst", "JumpTable", "Inst", "PHIList", + "ParamList", "IndexList", "OptTailCall", "InstVal", "OptVolatile", + "MemoryInst", 0 }; #endif @@ -2011,7 +1989,7 @@ 1, 1, 1, 3, 1, 5, 1, 1, 1, 1, 1, 1, 2, 2, 2, 3, 2, 0, 1, 2, 2, 3, 9, 9, 8, 14, 1, 1, 6, 5, - 2, 6, 7, 3, 3, 5, 5, 0, 0, 3, + 2, 6, 7, 4, 4, 6, 6, 0, 0, 3, 2, 1, 5, 5, 6, 6, 4, 6, 4, 4, 6, 6, 2, 8, 1, 1, 0, 3, 6, 3, 6, 2, 5, 7, 4 @@ -2062,7 +2040,7 @@ 254, 261, 260, 262, 0, 271, 0, 0, 0, 0, 0, 307, 0, 309, 288, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 117, 116, - 114, 115, 119, 118, 121, 216, 218, 0, 0, 0, + 114, 115, 118, 119, 121, 216, 218, 0, 0, 0, 288, 0, 0, 0, 0, 0, 164, 150, 162, 0, 167, 168, 0, 0, 0, 0, 0, 131, 129, 233, 112, 231, 0, 244, 0, 0, 0, 0, 0, 0, @@ -2074,15 +2052,15 @@ 0, 0, 0, 0, 292, 293, 287, 0, 312, 0, 201, 0, 0, 185, 0, 0, 0, 0, 170, 0, 0, 0, 64, 230, 232, 112, 127, 0, 0, 0, - 139, 0, 0, 294, 295, 308, 310, 289, 0, 0, + 112, 112, 0, 294, 295, 308, 310, 289, 0, 0, 297, 300, 301, 0, 124, 0, 0, 0, 191, 0, 0, 187, 188, 184, 65, 128, 122, 255, 0, 0, - 112, 112, 0, 120, 281, 0, 120, 313, 189, 190, + 0, 0, 0, 120, 281, 0, 120, 313, 189, 190, 0, 0, 0, 229, 0, 235, 0, 274, 0, 0, - 284, 283, 139, 0, 0, 282, 303, 186, 192, 193, - 123, 272, 0, 273, 0, 112, 112, 0, 0, 0, - 286, 285, 0, 0, 0, 0, 279, 0, 0, 278, - 0, 275 + 104, 106, 112, 112, 112, 112, 0, 282, 303, 186, + 192, 193, 123, 272, 0, 273, 0, 284, 283, 0, + 0, 0, 0, 0, 112, 112, 0, 0, 0, 286, + 285, 0, 279, 0, 0, 278, 0, 275 }; /* YYDEFGOTO[NTERM-NUM]. */ @@ -2101,84 +2079,84 @@ /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -549 +#define YYPACT_NINF -546 static const yytype_int16 yypact[] = { - 322, -549, -549, -549, -549, -549, -549, -549, -18, -120, - 6, -117, 62, -60, 224, -549, 111, 464, -549, 103, - 184, -12, -7, -549, 21, 133, -549, 1309, -549, -549, - -549, -549, -549, -549, -549, -549, -549, -549, -549, -549, - 140, 140, 211, -549, -549, -549, -549, 140, -549, -549, - -549, -549, -549, 140, 139, -549, -14, 157, 174, 182, - -549, -549, -549, -549, -549, 60, -549, -549, -549, -549, - -549, -549, -549, -549, 215, 233, 2, 526, -549, -549, - -549, 150, -549, 178, 178, 269, -549, 14, 274, 274, - -549, -549, 134, -549, -549, -549, -549, -549, -549, -549, - -23, 54, -549, 97, 105, 993, 60, -549, 150, -125, - -549, 54, 14, 14, -549, -549, 1093, -549, -549, 1340, - 260, -549, -549, -549, -549, -549, 1358, -549, -17, 1584, - -549, 251, -549, -549, 150, -549, 128, 146, 1380, 1380, - 145, -106, 1380, -549, 151, 1340, 1380, 60, 155, 150, - 231, -549, 101, 303, 305, 308, 312, 315, 229, 320, - 808, -549, -549, 187, -549, -549, -549, -549, -549, 275, - 1423, 85, 321, 274, -549, -549, -549, -549, -549, -549, - -549, -549, -549, -549, -549, -549, -549, -549, -549, -549, - -549, 461, 481, 1380, 1380, 1380, 1380, -549, -549, -549, - -549, -549, -549, -549, -549, -549, -549, -549, -549, 1380, - 1380, 1380, 1380, 1380, 1380, 1380, 1380, 1380, -549, 274, - -549, 110, -549, -549, -85, 1116, -549, -2, -33, -549, - 173, 150, -549, -549, 150, 1093, -549, -549, -549, -549, - -549, -549, -549, -549, -549, -549, -549, 461, 481, 191, - 198, 199, 203, 204, 1156, 1534, 1033, 335, 206, 207, - 208, -549, -549, 217, 223, -549, 60, 649, -549, 785, - 785, -549, 785, 1358, -549, -549, -549, -549, -549, -549, - -549, -549, -549, -549, 1380, -549, -549, -549, -549, -549, - -549, -549, -549, -549, -549, -549, -549, -549, -549, -549, - -549, 1380, 107, 113, -549, 649, 26, 218, 236, 237, - 238, 239, 240, 649, 649, 340, 1358, 1380, 1380, -549, - -549, -549, -549, -549, -549, -549, -549, -549, -549, -549, - -549, 162, -549, -549, -549, 162, 217, 217, 344, 242, - 243, 1340, 1340, 1340, 1340, 1340, -549, -549, -9, 1073, - -50, -549, -63, -549, 1340, 1340, 1340, -11, -549, 1187, - -549, -549, -549, -549, -549, -549, -549, -549, 333, 1340, - -549, -549, -549, -549, 247, -549, 248, 785, 649, 649, - 7, -549, 34, -549, -549, 785, 244, 1380, 1380, 1380, - 1380, 1380, 256, 257, 1380, 785, 649, 258, -549, -549, - -549, -549, -549, -549, -549, -549, -549, 1380, 1340, 1340, - -549, 261, 264, 267, 268, 1340, -549, 263, 808, -51, - -549, -549, 270, 273, 362, 396, 419, -549, 217, -549, - 150, 276, 271, -549, 405, -48, 411, 412, 280, 284, - 287, 785, 433, 785, 289, 290, 785, 293, 150, -549, - 294, 295, 785, 785, 150, 296, 297, 1380, 90, 298, - 300, 13, 1340, 1340, 1340, 1340, -549, -549, 299, 1340, - 1340, 1380, -549, -549, -549, -3, 1269, -549, 304, -549, - 785, 785, 1577, 785, 785, 297, -549, 297, 1380, 785, - 306, 1380, 1380, 1380, -549, -549, 1577, 401, -549, 649, - -549, 1340, 1340, -549, 309, 310, 319, 323, -549, 316, - 318, 126, -549, -549, -549, 150, 38, 437, 324, 307, - 785, 649, 44, -549, -549, -549, -549, -549, 325, 785, - -549, -549, -549, 53, 297, 327, 332, 1340, -549, 1340, - 1340, -549, -549, -549, -3, -549, 421, -549, 460, 1, - -549, -549, 1595, -549, -549, 334, -549, -549, -549, -549, - 336, 338, 339, -549, 489, -549, 785, -549, 945, 3, - -85, -85, 785, 649, 86, -549, 162, -549, -549, -549, - -549, -549, 347, -549, 945, -549, -549, 484, 485, 356, - -85, -85, 785, 785, 492, 439, -549, 785, 494, -549, - 785, -549 + 47, -546, -546, -546, -546, -546, -546, -546, -17, -95, + 52, -90, 86, 14, 183, -546, 135, 1758, -546, -10, + 64, 18, 33, -546, 5, 180, -546, 1341, -546, -546, + -546, -546, -546, -546, -546, -546, -546, -546, -546, -546, + 76, 76, 59, -546, -546, -546, -546, 76, -546, -546, + -546, -546, -546, 76, 193, -546, 13, 202, 224, 233, + -546, -546, -546, -546, -546, 111, -546, -546, -546, -546, + -546, -546, -546, -546, 260, 261, 1, 378, -546, -546, + -546, -7, -546, 231, 231, 150, -546, 55, 309, 309, + -546, -546, 100, -546, -546, -546, -546, -546, -546, -546, + -99, 1088, -546, 116, 122, 988, 111, -546, -7, -106, + -546, 1088, 55, 55, -546, -546, 1142, -546, -546, 1359, + 274, -546, -546, -546, -546, -546, 1414, -546, -18, 1624, + -546, 257, -546, -546, -7, -546, 131, 128, 1454, 1454, + 129, -105, 1454, -546, 136, 1359, 1454, 111, 141, -7, + 237, -546, 214, 279, 285, 289, 291, 294, 145, 299, + 803, -546, -546, 103, -546, -546, -546, -546, -546, 254, + 1512, 57, 301, 309, -546, -546, -546, -546, -546, -546, + -546, -546, -546, -546, -546, -546, -546, -546, -546, -546, + -546, 596, 646, 1454, 1454, 1454, 1454, -546, -546, -546, + -546, -546, -546, -546, -546, -546, -546, -546, -546, 1454, + 1454, 1454, 1454, 1454, 1454, 1454, 1454, 1454, -546, 309, + -546, 61, -546, -546, 132, 1182, -546, -57, -69, -546, + 155, -7, -546, -546, -7, 1142, -546, -546, -546, -546, + -546, -546, -546, -546, -546, -546, -546, 596, 646, 162, + 163, 164, 166, 167, 1242, 1530, 1028, 303, 169, 174, + 179, -546, -546, 185, 191, -546, 111, 644, -546, 780, + 780, -546, 780, 1414, -546, -546, -546, -546, -546, -546, + -546, -546, -546, -546, 1454, -546, -546, -546, -546, -546, + -546, -546, -546, -546, -546, -546, -546, -546, -546, -546, + -546, 1454, 30, 48, -546, 644, -21, 197, 199, 203, + 204, 205, 206, 644, 644, 313, 1414, 1454, 1454, -546, + -546, -546, -546, -546, -546, -546, -546, -546, -546, -546, + -546, 201, -546, -546, -546, 201, 185, 185, 320, 207, + 208, 1359, 1359, 1359, 1359, 1359, -546, -546, -65, 1068, + -86, -546, -104, -546, 1359, 1359, 1359, -20, -546, 1261, + -546, -546, -546, -546, -546, -546, -546, -546, 273, 1359, + -546, -546, -546, -546, 217, -546, 218, 780, 644, 644, + 8, -546, 11, -546, -546, 780, 221, 1454, 1454, 1454, + 1454, 1454, 227, 234, 1454, 780, 644, 235, -546, -546, + -546, -546, -546, -546, -546, -546, -546, 1454, 1359, 1359, + -546, 247, 258, 263, 265, 1359, -546, 259, 803, -101, + -546, -546, 269, 270, 344, 398, 419, -546, 185, -546, + -7, 276, 275, -546, 404, -76, 412, 413, 282, 288, + 292, 780, 440, 780, 297, 300, 780, 302, -7, -546, + 304, 308, 780, 780, -7, 306, 310, 1454, -35, 311, + 314, -73, 1359, 1359, 1359, 1359, -546, -546, 315, 1359, + 1359, 1454, -546, -546, -546, 298, 1301, -546, 319, -546, + 780, 780, 1570, 780, 780, 310, -546, 310, 1454, 780, + 322, 1454, 1454, 1454, -546, -546, 1570, 399, -546, 644, + -546, 1359, 1359, -546, 323, 316, 325, 327, -546, 324, + 326, 60, -546, -546, -546, -7, 3, 460, 334, 330, + 82, -7, -13, -546, -546, -546, -546, -546, 332, 780, + -546, -546, -546, 12, 310, 336, 337, 1359, -546, 1359, + 1359, -546, -546, -546, 298, -546, 438, -546, 475, -4, + 493, 493, 1610, -546, -546, 338, -546, -546, -546, -546, + 342, 345, 346, -546, 501, -546, 780, -546, 940, 2, + 354, 355, -546, -546, 82, -7, 72, -546, 201, -546, + -546, -546, -546, -546, 359, -546, 940, 132, 132, 493, + 493, 492, 494, 361, -546, -546, 780, 780, 497, 132, + 132, 450, -546, 780, 505, -546, 780, -546 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -549, 383, 384, 385, 272, 277, -170, -549, 0, -24, - 429, 8, -549, -549, -549, -549, 42, -549, -549, -549, - -160, -549, -421, -549, -228, -549, -293, 11, -549, -310, - -549, -549, -26, 341, -121, -549, 418, 425, -61, -157, - -226, 9, 205, 326, -549, -549, 515, -549, -549, -549, - -549, -549, -549, -549, -549, -549, -549, -549, 446, -549, - -549, -549, -549, -549, -549, -548, -69, 121, -173, -549, - 491, -549, -549, -549, -549, -549, 67, 158, -549, -549, - -549, -549 + -546, 394, 395, 396, 280, 283, -170, -546, 0, -16, + 444, 15, -546, -546, -546, -546, -1, -546, -546, -546, + -157, -546, -418, -546, -229, -546, -292, 23, -546, -307, + -546, -546, -26, 305, -120, -546, 429, 436, -59, -156, + -235, 126, 168, 307, -546, -546, 526, -546, -546, -546, + -546, -546, -546, -546, -546, -546, -546, -546, 456, -546, + -546, -546, -546, -546, -546, -545, -142, 108, -186, -546, + 490, -546, -546, -546, -546, -546, 51, 138, -546, -546, + -546, -546 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -2188,362 +2166,374 @@ #define YYTABLE_NINF -204 static const yytype_int16 yytable[] = { - 11, 81, 272, 261, 335, 163, 104, 90, 13, 475, - 383, 164, 271, 273, 271, 93, 1, 11, 441, 3, - 582, 5, 304, 425, 142, 13, 405, 406, 24, 350, - 352, 26, 319, 320, 21, 143, 589, 308, 309, 310, - 311, 312, 426, 142, 315, 443, 117, 118, 22, 321, - 322, 108, 323, 324, 230, 325, 326, 327, 161, 316, - 442, 63, 64, 25, 106, 66, 67, 68, 69, 70, - 71, 72, 425, 1, 2, 134, 3, 4, 5, 108, - 27, 236, 83, 84, 233, 134, 415, 442, 28, 88, - 149, 262, 11, 133, 544, 89, 269, 421, 415, 415, - 149, 415, 270, 73, -55, -55, -55, -55, 420, 468, - 479, 43, 227, 228, 319, 320, 231, 110, 474, 111, - 234, 145, 146, 419, 587, 333, 131, 237, 238, 570, - 571, 321, 322, 132, 323, 324, 57, 325, 326, 327, - 415, 58, 165, 435, 267, 397, 94, 416, 110, 45, - 111, 46, 377, 1, 332, 61, 3, 567, 5, 583, - 90, 105, 488, 498, 590, 591, 503, 302, 303, 267, - 305, 264, 398, 399, 400, 59, 110, 401, 111, 97, - 385, 402, 403, 306, 267, 267, 267, 267, 267, 313, - 314, 267, 525, 552, 526, 395, 98, 553, 372, 134, - 372, 372, 552, 372, 99, 74, 556, 2, 75, 149, - 4, 76, 101, 77, 447, 86, 449, 450, 451, 102, - 398, 399, 400, 317, 318, 401, 49, 50, 51, 402, - 403, 52, 239, 240, 241, 242, 372, 103, 63, 64, - 110, 557, 111, 500, 372, 372, 85, 149, 86, 516, - 1, 2, 138, 3, 4, 5, 380, 110, 378, 111, - 139, 261, 382, 110, 162, 111, 29, 30, 31, 32, - 33, 34, 35, 223, 36, 379, 110, 225, 111, 543, - 410, 411, 412, 413, 414, 37, 38, 39, 112, 113, - 149, 396, 267, 422, 423, 424, 398, 399, 400, 226, - 110, 401, 111, 229, 232, 402, 403, 235, 372, 372, - 372, 114, -56, 115, -57, 527, 372, -60, 530, 531, - 532, -59, -203, 418, -58, 574, 372, 372, 576, 243, - 265, 334, 271, 430, 120, 121, 122, 123, 124, 125, - -67, 1, 2, 341, 3, 4, 5, 459, 460, 262, - 342, 343, 6, 7, 466, 344, 345, 353, 354, 355, - 356, 267, 448, 267, 267, 267, 357, 386, 454, 37, - 38, 39, 372, 8, 372, 359, 9, 372, 394, 568, - 10, 458, 407, 372, 372, 387, 388, 389, 390, 391, - 374, 375, 433, 376, 408, 409, 436, 437, 446, 584, - 471, 504, 505, 506, 507, 452, 453, 457, 509, 510, - 462, 372, 372, 463, 372, 372, 464, 465, 472, 469, - 372, 467, 470, 473, 477, 476, 384, 478, 480, 481, - 372, 499, 482, 483, 392, 393, 484, 486, 488, 489, - 535, 536, 491, 492, 493, 511, 497, 501, 496, 502, - 515, 372, 372, 517, 442, 529, 521, 508, 537, 547, - 372, 549, 267, 538, -202, 267, 267, 267, 539, 541, - 521, 542, 540, 548, 564, 512, 560, 566, 561, 562, - 558, 554, -67, 1, 2, 559, 3, 4, 5, 577, - 575, 578, 579, 580, 6, 7, 588, 372, 438, 439, - 440, 592, 593, 372, 372, 594, 445, 285, 286, 597, - 598, 600, 215, 216, 217, 8, 455, 456, 9, 339, - 563, 129, 10, 372, 372, 340, 573, 545, 372, 144, - 141, 372, 44, 63, 64, 128, 106, 66, 67, 68, - 69, 70, 71, 72, 512, 1, 2, 96, 3, 4, - 5, 274, 275, 276, 277, 278, 279, 280, 281, 282, - 283, 338, 485, 533, 487, 0, 330, 490, 461, 0, - 0, 0, 0, 494, 495, 73, 0, 287, 288, 289, - 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, - 300, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 518, 519, 0, 523, 524, 0, 0, 0, 0, - 528, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 534, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 550, 551, 0, 0, 0, 0, 0, 0, 0, - 555, 0, 360, 361, 0, 0, 63, 64, 362, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, - 0, 3, 4, 5, 363, 364, 365, 74, 0, 0, - 75, 0, 0, 76, 0, 77, 107, 581, 0, 366, - 367, 0, 0, 585, 586, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 368, 0, 0, 0, - 0, 0, 0, 595, 596, 0, 0, 0, 599, 0, - 0, 601, 176, 177, 178, 179, 180, 181, 182, 183, - 184, 185, 186, 187, 188, 189, 190, 247, 248, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 249, 197, 198, 199, 200, 201, - 202, 203, 204, 205, 206, 207, 208, 0, 250, 0, - 251, 252, 253, 0, 0, 0, 0, 0, 360, 361, - 0, 0, 63, 64, 362, 0, 0, 0, 0, 110, - 0, 111, 0, 0, 1, 2, 369, 3, 4, 5, - 363, 364, 365, 0, 0, 63, 64, 0, 0, 0, - 0, 0, 0, 0, 0, 366, 367, 1, 2, 0, - 3, 4, 5, 244, 0, 0, 0, 0, 0, 0, - 0, 0, 368, 0, 0, 0, 0, 0, 245, 246, - 0, 0, 0, 0, 0, 0, 0, 0, 176, 177, - 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, - 188, 189, 190, 247, 248, 0, 0, 0, 0, 0, - 0, 176, 177, 178, 179, 180, 181, 182, 183, 184, - 185, 186, 187, 188, 189, 190, 247, 248, 0, 0, - 249, 197, 198, 199, 200, 201, 202, 203, 204, 205, - 206, 207, 208, 0, 250, 0, 251, 252, 253, 0, - 0, 0, 0, 249, 197, 198, 199, 200, 201, 202, - 203, 204, 205, 206, 207, 208, 0, 250, 0, 251, - 252, 253, 369, 0, 0, 0, 0, 0, 360, 361, - 0, 0, 0, 0, 362, 0, 0, 0, 110, 0, - 111, 0, 254, 0, 0, 255, 0, 256, 0, 257, - 363, 364, 365, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 366, 367, 0, 0, 0, + 11, 81, 272, 335, 261, 104, 163, 271, 236, 304, + 164, 383, 475, 271, 425, 13, 273, 11, 262, 441, + 350, 352, 443, 584, 308, 309, 310, 311, 312, 405, + 406, 315, 13, 426, 90, 21, 45, 425, 46, 83, + 84, 593, 93, 142, 142, 415, 88, -203, 415, 22, + 131, 108, 89, 24, 143, 230, 421, 132, 26, 468, + 161, 442, 316, 415, 442, -67, 1, 2, 269, 3, + 4, 5, 420, 415, 270, 134, 488, 6, 7, 108, + 503, 110, 479, 111, 415, 134, 233, 117, 118, 333, + 149, 416, 11, 110, 85, 111, 86, 544, 8, 332, + 149, 9, 550, 551, 27, 10, 49, 50, 51, 25, + 591, 52, 227, 228, 419, 110, 231, 111, 500, 1, + 234, 474, 3, 2, 5, 372, 4, 372, 372, 110, + 372, 111, 397, 385, 435, 43, 552, 398, 399, 400, + 553, 165, 401, 110, 267, 111, 402, 403, 239, 240, + 241, 242, 567, 377, 587, 588, 589, 590, 585, 59, + 105, 552, 28, 372, 498, 556, 57, 302, 303, 267, + 305, 372, 372, 94, 317, 318, 599, 600, 264, 380, + 110, 58, 111, 306, 267, 267, 267, 267, 267, 313, + 314, 267, 114, 525, 115, 526, 395, 382, 110, 134, + 111, 447, 61, 449, 450, 451, 398, 399, 400, 149, + 110, 401, 111, 543, 90, 402, 403, -55, -55, -55, + -55, 37, 38, 39, 97, 29, 30, 31, 32, 33, + 34, 35, -139, 36, -139, 372, 372, 372, 145, 146, + 237, 238, 557, 372, 63, 64, 98, 149, 516, 319, + 320, 112, 113, 372, 372, 99, 1, 2, 378, 3, + 4, 5, 261, 101, 102, 103, 321, 322, 86, 323, + 324, 138, 325, 326, 327, 379, 262, 139, 162, 223, + 225, 226, 410, 411, 412, 413, 414, 229, -56, 232, + 149, 396, 267, 235, -57, 422, 423, 424, -60, 372, + -59, 372, 527, -58, 372, 530, 531, 532, 243, 265, + 372, 372, 271, 334, 341, 342, 343, 1, 344, 345, + 3, 354, 5, 418, 576, 353, 355, 578, 37, 38, + 39, 356, 433, 430, 357, 398, 399, 400, 372, 372, + 401, 372, 372, 359, 402, 403, 386, 372, 387, 459, + 460, 394, 388, 389, 390, 391, 466, 372, 407, 408, + 409, 267, 448, 267, 267, 267, 436, 437, 454, 120, + 121, 122, 123, 124, 125, 446, 452, 374, 375, 568, + 376, 458, 471, 453, 457, 63, 64, 372, 106, 66, + 67, 68, 69, 70, 71, 72, 462, 1, 2, 586, + 3, 4, 5, 504, 505, 506, 507, 463, 372, 372, + 509, 510, 464, 384, 465, 319, 320, 467, 469, 470, + 472, 392, 393, 473, 372, 476, 478, 73, 477, 480, + 481, 499, 321, 322, 482, 323, 324, 483, 325, 326, + 327, 484, 535, 536, 486, 511, 488, 372, 372, 489, + 515, 491, 442, 492, 372, 372, 521, 493, 496, 497, + 501, 372, 267, 502, 372, 267, 267, 267, 517, 538, + 521, 529, 537, 508, 539, 512, 540, 541, 560, 542, + 561, 562, 547, 548, 549, 438, 439, 440, 554, 558, + 559, 564, 566, 445, 577, 579, 360, 361, 580, 581, + 63, 64, 362, 455, 456, 582, -18, -19, 592, 596, + 598, 597, 1, 2, 603, 3, 4, 5, 363, 364, + 365, 604, 606, 215, 216, 217, 575, 339, 563, 74, + 330, 340, 75, 366, 367, 76, 129, 77, 107, 545, + 144, 141, 338, 44, 512, 128, 96, 533, 461, 485, + 368, 487, 0, 0, 490, 0, 0, 0, 0, 0, + 494, 495, 0, 0, 0, 0, 176, 177, 178, 179, + 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, + 190, 247, 248, 0, 0, 0, 0, 0, 518, 519, + 0, 523, 524, 0, 0, 0, 0, 528, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 534, 249, 197, + 570, 571, 200, 201, 202, 203, 204, 205, 206, 207, + 208, 0, 250, 0, 251, 252, 253, 321, 322, 0, + 323, 324, 0, 325, 326, 327, 0, 555, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 360, 361, 0, + 369, 63, 64, 362, 0, 0, 0, 0, 572, 573, + 0, 0, 0, 1, 2, 0, 3, 4, 5, 363, + 364, 365, 285, 286, 583, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 366, 367, 274, 275, 276, 277, + 278, 279, 280, 281, 282, 283, 0, 594, 595, 0, + 0, 368, 0, 0, 601, 602, 0, 0, 0, 0, + 0, 605, 0, 0, 607, 0, 0, 176, 177, 178, + 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, + 189, 190, 247, 248, 0, 0, 0, 0, 0, 0, + 0, 0, 287, 288, 289, 290, 291, 292, 293, 294, + 295, 296, 297, 298, 299, 300, 0, 0, 0, 249, + 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, + 207, 208, 0, 250, 0, 251, 252, 253, 0, 0, + 0, 0, 0, 360, 361, 0, 0, 63, 64, 362, + 0, 0, 0, 0, 110, 0, 111, 0, 0, 1, + 2, 369, 3, 4, 5, 363, 364, 365, 0, 0, + 63, 64, 0, 0, 0, 0, 0, 0, 0, 0, + 366, 367, 1, 2, 0, 3, 4, 5, 244, 0, + 0, 0, 0, 0, 0, 0, 0, 368, 0, 0, + 0, 0, 0, 245, 246, 0, 0, 0, 0, 0, + 0, 0, 0, 176, 177, 178, 179, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 189, 190, 247, 248, + 0, 0, 0, 0, 0, 0, 176, 177, 178, 179, + 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, + 190, 247, 248, 0, 0, 249, 197, 198, 199, 200, + 201, 202, 203, 204, 205, 206, 207, 208, 0, 250, + 0, 251, 252, 253, 0, 0, 0, 0, 249, 197, + 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, + 208, 0, 250, 0, 251, 252, 253, 369, 0, 0, + 0, 0, 0, 360, 361, 0, 0, 0, 0, 362, + 0, 0, 0, 110, 0, 111, 0, 254, 0, 0, + 255, 0, 256, 0, 257, 363, 364, 365, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 63, 64, 368, 106, 66, 67, 68, 69, 70, 71, - 72, 0, 1, 2, 0, 3, 4, 5, 176, 177, - 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, - 188, 189, 190, 247, 248, 0, 0, 0, 0, 0, - 63, 64, 73, 106, 152, 153, 154, 155, 156, 157, - 72, 0, 1, 2, 0, 3, 4, 5, 0, 0, - 249, 197, 198, 199, 200, 201, 202, 203, 204, 205, - 206, 207, 208, 0, 250, 0, 251, 252, 253, 0, - 63, 64, 73, 106, 152, 153, 154, 155, 156, 157, - 72, 0, 1, 2, 0, 3, 4, 5, 0, 0, - 63, 64, 369, 147, 66, 67, 68, 69, 70, 71, - 72, 0, 1, 2, 0, 3, 4, 5, 0, 0, - 0, 0, 73, 63, 64, 0, 106, 66, 67, 68, - 69, 70, 71, 72, 0, 1, 2, 0, 3, 4, - 5, 0, 73, 0, 74, 0, 0, 75, 0, 0, - 76, 0, 77, 140, 0, 329, 0, 0, 0, 0, - 0, 0, 0, 63, 64, 73, 106, 152, 153, 154, - 155, 156, 157, 72, 0, 1, 2, 0, 3, 4, - 5, 0, 0, 0, 74, 0, 0, 75, 0, 0, - 76, 0, 77, 351, 63, 64, 0, 106, 66, 67, - 68, 69, 70, 71, 72, 73, 1, 2, 0, 3, - 4, 5, 0, 0, 148, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 74, 0, 429, 75, 0, 0, - 76, 0, 77, 417, 0, 0, 73, 0, 0, 0, - 0, 0, 0, 0, 74, 0, 0, 75, 0, 0, - 76, 0, 77, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 74, 0, 0, - 75, 0, 0, 76, 0, 77, 63, 64, 0, 106, - 66, 67, 68, 69, 70, 71, 72, 0, 1, 2, - 0, 3, 4, 5, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 74, 514, 0, - 75, 0, 346, 76, 0, 77, 63, 64, 73, 65, - 66, 67, 68, 69, 70, 71, 72, 0, 1, 2, - 0, 3, 4, 5, 0, 0, 0, 0, 74, 0, - 0, 75, 0, 0, 76, 0, 77, 63, 64, 0, - 106, 152, 153, 154, 155, 156, 157, 72, 73, 1, - 2, 0, 3, 4, 5, 63, 64, 0, 147, 66, + 366, 367, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 63, 64, 368, 106, 66, 67, 68, 69, 70, 71, 72, 0, 1, 2, 0, - 3, 4, 5, 0, 0, 0, 0, 63, 64, 73, - 106, 66, 67, 68, 69, 70, 71, 72, 0, 1, - 2, 0, 3, 4, 5, 0, 0, 73, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 74, 0, 0, 75, 0, 0, 76, 0, 77, 73, - 63, 64, 0, 266, 66, 67, 68, 69, 70, 71, - 72, 0, 1, 2, 0, 3, 4, 5, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 74, 0, 0, 75, 0, 0, 76, 0, 77, 0, - 0, 0, 73, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 74, 0, 0, 75, 0, 0, 76, 0, 77, + 3, 4, 5, 176, 177, 178, 179, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 189, 190, 247, 248, + 0, 0, 0, 0, 0, 63, 64, 73, 106, 152, + 153, 154, 155, 156, 157, 72, 0, 1, 2, 0, + 3, 4, 5, 0, 0, 249, 197, 198, 199, 200, + 201, 202, 203, 204, 205, 206, 207, 208, 0, 250, + 0, 251, 252, 253, 0, 63, 64, 73, 106, 152, + 153, 154, 155, 156, 157, 72, 0, 1, 2, 0, + 3, 4, 5, 0, 0, 63, 64, 369, 106, 66, + 67, 68, 69, 70, 71, 72, 0, 1, 2, 0, + 3, 4, 5, 0, 0, 0, 0, 73, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 133, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 73, 0, 74, + 0, 0, 75, 0, 0, 76, 0, 77, 140, 63, + 64, 0, 147, 66, 67, 68, 69, 70, 71, 72, + 0, 1, 2, 0, 3, 4, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 74, - 0, 0, 75, 0, 0, 76, 0, 77, 0, 0, + 0, 0, 75, 0, 0, 76, 0, 77, 351, 63, + 64, 73, 106, 66, 67, 68, 69, 70, 71, 72, + 0, 1, 2, 0, 3, 4, 5, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 74, + 0, 329, 75, 0, 0, 76, 0, 77, 417, 0, + 0, 73, 0, 0, 0, 0, 0, 0, 0, 74, + 0, 0, 75, 0, 0, 76, 0, 77, 0, 63, + 64, 0, 106, 152, 153, 154, 155, 156, 157, 72, + 0, 1, 2, 148, 3, 4, 5, 0, 63, 64, + 0, 106, 66, 67, 68, 69, 70, 71, 72, 0, + 1, 2, 0, 3, 4, 5, 0, 0, 0, 0, + 0, 73, 0, 74, 0, 0, 75, 0, 0, 76, + 429, 77, 0, 0, 0, 0, 0, 0, 63, 64, + 73, 106, 66, 67, 68, 69, 70, 71, 72, 0, + 1, 2, 0, 3, 4, 5, 0, 0, 0, 0, + 0, 0, 0, 74, 0, 0, 75, 0, 0, 76, + 514, 77, 0, 0, 0, 0, 0, 0, 63, 64, + 73, 65, 66, 67, 68, 69, 70, 71, 72, 0, + 1, 2, 0, 3, 4, 5, 63, 64, 0, 106, + 152, 153, 154, 155, 156, 157, 72, 0, 1, 2, + 0, 3, 4, 5, 0, 0, 0, 0, 0, 0, + 73, 0, 0, 74, 0, 0, 75, 0, 346, 76, + 0, 77, 0, 0, 0, 0, 0, 0, 73, 0, + 0, 0, 74, 0, 0, 75, 0, 0, 76, 0, + 77, 63, 64, 0, 147, 66, 67, 68, 69, 70, + 71, 72, 0, 1, 2, 0, 3, 4, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 74, 0, 0, 75, 0, 0, 76, 0, 77, - 0, 63, 64, 0, 106, 152, 153, 154, 155, 156, - 157, 72, 0, 1, 2, 0, 3, 4, 5, 0, + 0, 0, 74, 0, 0, 75, 0, 0, 76, 0, + 77, 63, 64, 73, 106, 66, 67, 68, 69, 70, + 71, 72, 0, 1, 2, 0, 3, 4, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 74, 0, 0, 75, 0, 0, - 76, 0, 77, 73, 63, 64, 0, 106, 66, 67, - 68, 69, 70, 71, 520, 0, 1, 2, 0, 3, - 4, 5, 63, 64, 0, 106, 66, 67, 68, 69, - 70, 71, 572, 0, 1, 2, 0, 3, 4, 5, - 167, 0, 0, 0, 0, 0, 73, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 168, - 169, 0, 0, 0, 73, 0, 0, 0, 0, 0, + 0, 0, 74, 0, 0, 75, 0, 0, 76, 0, + 77, 0, 0, 73, 0, 0, 0, 0, 0, 0, + 74, 0, 0, 75, 0, 0, 76, 0, 77, 63, + 64, 0, 266, 66, 67, 68, 69, 70, 71, 72, + 0, 1, 2, 0, 3, 4, 5, 63, 64, 0, + 106, 152, 153, 154, 155, 156, 157, 72, 0, 1, + 2, 0, 3, 4, 5, 0, 0, 0, 0, 0, + 0, 73, 0, 0, 0, 74, 0, 0, 75, 0, + 0, 76, 0, 77, 0, 0, 0, 63, 64, 73, + 106, 66, 67, 68, 69, 70, 71, 520, 0, 1, + 2, 0, 3, 4, 5, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 74, 0, 0, 75, 0, + 0, 76, 0, 77, 0, 0, 0, 63, 64, 73, + 106, 66, 67, 68, 69, 70, 71, 574, 0, 1, + 2, 0, 3, 4, 5, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 73, + 167, 0, 0, 74, 0, 0, 75, 0, 0, 76, + 0, 77, 0, 0, 0, 0, 0, 0, 0, 168, + 169, 74, 0, 0, 75, 0, 0, 76, 0, 349, 0, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 74, 0, 0, 75, 0, - 0, 76, 0, 349, 193, 194, 195, 0, 0, 196, + 0, 74, 0, 0, 75, 0, 0, 76, 0, 77, + 0, 0, 0, 0, 193, 194, 195, 0, 0, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, - 207, 208, 209, 210, 211, 212, 213, 214, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 74, 0, - 0, 75, 0, 0, 76, 0, 77, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 74, 0, 0, 75, - 0, 0, 76, 0, 77 + 207, 208, 209, 210, 211, 212, 213, 214, -202, 0, + 0, 74, 0, 0, 75, 0, 0, 76, 0, 77, + 0, 0, 0, 0, 0, 0, -67, 1, 2, 0, + 3, 4, 5, 0, 0, 0, 0, 0, 6, 7, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, + 0, 0, 9, 0, 0, 0, 10 }; static const yytype_int16 yycheck[] = { - 0, 27, 172, 160, 232, 126, 4, 21, 0, 430, - 303, 28, 11, 173, 11, 29, 19, 17, 11, 22, - 568, 24, 195, 34, 149, 17, 336, 337, 148, 255, - 256, 148, 117, 118, 52, 160, 584, 210, 211, 212, - 213, 214, 53, 149, 217, 11, 32, 33, 66, 134, - 135, 77, 137, 138, 160, 140, 141, 142, 119, 219, - 53, 7, 8, 57, 10, 11, 12, 13, 14, 15, - 16, 17, 34, 19, 20, 101, 22, 23, 24, 105, - 18, 150, 40, 41, 145, 111, 149, 53, 148, 47, - 116, 160, 92, 39, 515, 53, 11, 160, 149, 149, - 126, 149, 17, 49, 3, 4, 5, 6, 158, 160, - 158, 0, 138, 139, 117, 118, 142, 150, 428, 152, - 146, 112, 113, 349, 38, 158, 149, 26, 27, 550, - 551, 134, 135, 156, 137, 138, 148, 140, 141, 142, - 149, 148, 159, 369, 170, 318, 160, 156, 150, 46, - 152, 48, 273, 19, 156, 22, 22, 156, 24, 156, - 21, 159, 149, 456, 585, 586, 153, 193, 194, 195, - 196, 163, 134, 135, 136, 154, 150, 139, 152, 22, - 154, 143, 144, 209, 210, 211, 212, 213, 214, 215, - 216, 217, 485, 149, 487, 316, 22, 153, 267, 225, - 269, 270, 149, 272, 22, 151, 153, 20, 154, 235, - 23, 157, 152, 159, 387, 37, 389, 390, 391, 4, - 134, 135, 136, 113, 114, 139, 42, 43, 44, 143, - 144, 47, 3, 4, 5, 6, 305, 4, 7, 8, - 150, 534, 152, 153, 313, 314, 35, 273, 37, 477, - 19, 20, 155, 22, 23, 24, 149, 150, 284, 152, - 155, 418, 149, 150, 4, 152, 42, 43, 44, 45, - 46, 47, 48, 22, 50, 301, 150, 149, 152, 153, - 341, 342, 343, 344, 345, 145, 146, 147, 83, 84, - 316, 317, 318, 354, 355, 356, 134, 135, 136, 153, - 150, 139, 152, 158, 153, 143, 144, 152, 377, 378, - 379, 42, 9, 44, 9, 488, 385, 9, 491, 492, - 493, 9, 0, 349, 9, 553, 395, 396, 556, 9, - 55, 158, 11, 359, 60, 61, 62, 63, 64, 65, - 18, 19, 20, 152, 22, 23, 24, 408, 409, 418, - 152, 152, 30, 31, 415, 152, 152, 22, 152, 152, - 152, 387, 388, 389, 390, 391, 149, 149, 394, 145, - 146, 147, 441, 51, 443, 152, 54, 446, 38, 549, - 58, 407, 38, 452, 453, 149, 149, 149, 149, 149, - 269, 270, 59, 272, 152, 152, 149, 149, 154, 569, - 38, 462, 463, 464, 465, 149, 149, 149, 469, 470, - 149, 480, 481, 149, 483, 484, 149, 149, 22, 149, - 489, 158, 149, 4, 153, 149, 305, 22, 17, 17, - 499, 457, 152, 149, 313, 314, 149, 4, 149, 149, - 501, 502, 149, 149, 149, 471, 149, 149, 152, 149, - 476, 520, 521, 149, 53, 149, 482, 158, 149, 22, - 529, 154, 488, 153, 0, 491, 492, 493, 149, 153, - 496, 153, 149, 149, 53, 475, 537, 17, 539, 540, - 153, 156, 18, 19, 20, 153, 22, 23, 24, 153, - 156, 153, 153, 4, 30, 31, 149, 566, 377, 378, - 379, 17, 17, 572, 573, 149, 385, 26, 27, 17, - 71, 17, 129, 129, 129, 51, 395, 396, 54, 247, - 544, 92, 58, 592, 593, 248, 552, 516, 597, 111, - 105, 600, 17, 7, 8, 89, 10, 11, 12, 13, - 14, 15, 16, 17, 544, 19, 20, 56, 22, 23, - 24, 90, 91, 92, 93, 94, 95, 96, 97, 98, - 99, 235, 441, 496, 443, -1, 225, 446, 410, -1, - -1, -1, -1, 452, 453, 49, -1, 96, 97, 98, - 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, - 109, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 480, 481, -1, 483, 484, -1, -1, -1, -1, - 489, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 499, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 520, 521, -1, -1, -1, -1, -1, -1, -1, - 529, -1, 3, 4, -1, -1, 7, 8, 9, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 19, 20, - -1, 22, 23, 24, 25, 26, 27, 151, -1, -1, - 154, -1, -1, 157, -1, 159, 160, 566, -1, 40, - 41, -1, -1, 572, 573, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 57, -1, -1, -1, - -1, -1, -1, 592, 593, -1, -1, -1, 597, -1, - -1, 600, 73, 74, 75, 76, 77, 78, 79, 80, - 81, 82, 83, 84, 85, 86, 87, 88, 89, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 115, 116, 117, 118, 119, 120, - 121, 122, 123, 124, 125, 126, 127, -1, 129, -1, - 131, 132, 133, -1, -1, -1, -1, -1, 3, 4, - -1, -1, 7, 8, 9, -1, -1, -1, -1, 150, - -1, 152, -1, -1, 19, 20, 157, 22, 23, 24, - 25, 26, 27, -1, -1, 7, 8, -1, -1, -1, - -1, -1, -1, -1, -1, 40, 41, 19, 20, -1, - 22, 23, 24, 25, -1, -1, -1, -1, -1, -1, - -1, -1, 57, -1, -1, -1, -1, -1, 40, 41, - -1, -1, -1, -1, -1, -1, -1, -1, 73, 74, - 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 85, 86, 87, 88, 89, -1, -1, -1, -1, -1, - -1, 73, 74, 75, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 86, 87, 88, 89, -1, -1, - 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, - 125, 126, 127, -1, 129, -1, 131, 132, 133, -1, - -1, -1, -1, 115, 116, 117, 118, 119, 120, 121, - 122, 123, 124, 125, 126, 127, -1, 129, -1, 131, - 132, 133, 157, -1, -1, -1, -1, -1, 3, 4, - -1, -1, -1, -1, 9, -1, -1, -1, 150, -1, - 152, -1, 154, -1, -1, 157, -1, 159, -1, 161, - 25, 26, 27, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 40, 41, -1, -1, -1, + 0, 27, 172, 232, 160, 4, 126, 11, 150, 195, + 28, 303, 430, 11, 34, 0, 173, 17, 160, 11, + 255, 256, 11, 568, 210, 211, 212, 213, 214, 336, + 337, 217, 17, 53, 21, 52, 46, 34, 48, 40, + 41, 586, 29, 149, 149, 149, 47, 0, 149, 66, + 149, 77, 53, 148, 160, 160, 160, 156, 148, 160, + 119, 53, 219, 149, 53, 18, 19, 20, 11, 22, + 23, 24, 158, 149, 17, 101, 149, 30, 31, 105, + 153, 150, 158, 152, 149, 111, 145, 32, 33, 158, + 116, 156, 92, 150, 35, 152, 37, 515, 51, 156, + 126, 54, 520, 521, 18, 58, 42, 43, 44, 57, + 38, 47, 138, 139, 349, 150, 142, 152, 153, 19, + 146, 428, 22, 20, 24, 267, 23, 269, 270, 150, + 272, 152, 318, 154, 369, 0, 149, 134, 135, 136, + 153, 159, 139, 150, 170, 152, 143, 144, 3, 4, + 5, 6, 156, 273, 572, 573, 574, 575, 156, 154, + 159, 149, 148, 305, 456, 153, 148, 193, 194, 195, + 196, 313, 314, 160, 113, 114, 594, 595, 163, 149, + 150, 148, 152, 209, 210, 211, 212, 213, 214, 215, + 216, 217, 42, 485, 44, 487, 316, 149, 150, 225, + 152, 387, 22, 389, 390, 391, 134, 135, 136, 235, + 150, 139, 152, 153, 21, 143, 144, 3, 4, 5, + 6, 145, 146, 147, 22, 42, 43, 44, 45, 46, + 47, 48, 150, 50, 152, 377, 378, 379, 112, 113, + 26, 27, 534, 385, 7, 8, 22, 273, 477, 117, + 118, 83, 84, 395, 396, 22, 19, 20, 284, 22, + 23, 24, 418, 152, 4, 4, 134, 135, 37, 137, + 138, 155, 140, 141, 142, 301, 418, 155, 4, 22, + 149, 153, 341, 342, 343, 344, 345, 158, 9, 153, + 316, 317, 318, 152, 9, 354, 355, 356, 9, 441, + 9, 443, 488, 9, 446, 491, 492, 493, 9, 55, + 452, 453, 11, 158, 152, 152, 152, 19, 152, 152, + 22, 152, 24, 349, 553, 22, 152, 556, 145, 146, + 147, 152, 59, 359, 149, 134, 135, 136, 480, 481, + 139, 483, 484, 152, 143, 144, 149, 489, 149, 408, + 409, 38, 149, 149, 149, 149, 415, 499, 38, 152, + 152, 387, 388, 389, 390, 391, 149, 149, 394, 60, + 61, 62, 63, 64, 65, 154, 149, 269, 270, 549, + 272, 407, 38, 149, 149, 7, 8, 529, 10, 11, + 12, 13, 14, 15, 16, 17, 149, 19, 20, 569, + 22, 23, 24, 462, 463, 464, 465, 149, 550, 551, + 469, 470, 149, 305, 149, 117, 118, 158, 149, 149, + 22, 313, 314, 4, 566, 149, 22, 49, 153, 17, + 17, 457, 134, 135, 152, 137, 138, 149, 140, 141, + 142, 149, 501, 502, 4, 471, 149, 589, 590, 149, + 476, 149, 53, 149, 596, 597, 482, 149, 152, 149, + 149, 603, 488, 149, 606, 491, 492, 493, 149, 153, + 496, 149, 149, 158, 149, 475, 149, 153, 537, 153, + 539, 540, 22, 149, 154, 377, 378, 379, 156, 153, + 153, 53, 17, 385, 156, 153, 3, 4, 153, 153, + 7, 8, 9, 395, 396, 4, 152, 152, 149, 17, + 149, 17, 19, 20, 17, 22, 23, 24, 25, 26, + 27, 71, 17, 129, 129, 129, 552, 247, 544, 151, + 225, 248, 154, 40, 41, 157, 92, 159, 160, 516, + 111, 105, 235, 17, 544, 89, 56, 496, 410, 441, + 57, 443, -1, -1, 446, -1, -1, -1, -1, -1, + 452, 453, -1, -1, -1, -1, 73, 74, 75, 76, + 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, + 87, 88, 89, -1, -1, -1, -1, -1, 480, 481, + -1, 483, 484, -1, -1, -1, -1, 489, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 499, 115, 116, + 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, + 127, -1, 129, -1, 131, 132, 133, 134, 135, -1, + 137, 138, -1, 140, 141, 142, -1, 529, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 3, 4, -1, + 157, 7, 8, 9, -1, -1, -1, -1, 550, 551, + -1, -1, -1, 19, 20, -1, 22, 23, 24, 25, + 26, 27, 26, 27, 566, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 40, 41, 90, 91, 92, 93, + 94, 95, 96, 97, 98, 99, -1, 589, 590, -1, + -1, 57, -1, -1, 596, 597, -1, -1, -1, -1, + -1, 603, -1, -1, 606, -1, -1, 73, 74, 75, + 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, + 86, 87, 88, 89, -1, -1, -1, -1, -1, -1, + -1, -1, 96, 97, 98, 99, 100, 101, 102, 103, + 104, 105, 106, 107, 108, 109, -1, -1, -1, 115, + 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, + 126, 127, -1, 129, -1, 131, 132, 133, -1, -1, + -1, -1, -1, 3, 4, -1, -1, 7, 8, 9, + -1, -1, -1, -1, 150, -1, 152, -1, -1, 19, + 20, 157, 22, 23, 24, 25, 26, 27, -1, -1, + 7, 8, -1, -1, -1, -1, -1, -1, -1, -1, + 40, 41, 19, 20, -1, 22, 23, 24, 25, -1, + -1, -1, -1, -1, -1, -1, -1, 57, -1, -1, + -1, -1, -1, 40, 41, -1, -1, -1, -1, -1, + -1, -1, -1, 73, 74, 75, 76, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, + -1, -1, -1, -1, -1, -1, 73, 74, 75, 76, + 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, + 87, 88, 89, -1, -1, 115, 116, 117, 118, 119, + 120, 121, 122, 123, 124, 125, 126, 127, -1, 129, + -1, 131, 132, 133, -1, -1, -1, -1, 115, 116, + 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, + 127, -1, 129, -1, 131, 132, 133, 157, -1, -1, + -1, -1, -1, 3, 4, -1, -1, -1, -1, 9, + -1, -1, -1, 150, -1, 152, -1, 154, -1, -1, + 157, -1, 159, -1, 161, 25, 26, 27, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 7, 8, 57, 10, 11, 12, 13, 14, 15, 16, - 17, -1, 19, 20, -1, 22, 23, 24, 73, 74, - 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 85, 86, 87, 88, 89, -1, -1, -1, -1, -1, - 7, 8, 49, 10, 11, 12, 13, 14, 15, 16, - 17, -1, 19, 20, -1, 22, 23, 24, -1, -1, - 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, - 125, 126, 127, -1, 129, -1, 131, 132, 133, -1, - 7, 8, 49, 10, 11, 12, 13, 14, 15, 16, - 17, -1, 19, 20, -1, 22, 23, 24, -1, -1, - 7, 8, 157, 10, 11, 12, 13, 14, 15, 16, - 17, -1, 19, 20, -1, 22, 23, 24, -1, -1, - -1, -1, 49, 7, 8, -1, 10, 11, 12, 13, - 14, 15, 16, 17, -1, 19, 20, -1, 22, 23, - 24, -1, 49, -1, 151, -1, -1, 154, -1, -1, - 157, -1, 159, 160, -1, 39, -1, -1, -1, -1, - -1, -1, -1, 7, 8, 49, 10, 11, 12, 13, - 14, 15, 16, 17, -1, 19, 20, -1, 22, 23, - 24, -1, -1, -1, 151, -1, -1, 154, -1, -1, - 157, -1, 159, 160, 7, 8, -1, 10, 11, 12, - 13, 14, 15, 16, 17, 49, 19, 20, -1, 22, - 23, 24, -1, -1, 121, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 151, -1, 39, 154, -1, -1, - 157, -1, 159, 160, -1, -1, 49, -1, -1, -1, - -1, -1, -1, -1, 151, -1, -1, 154, -1, -1, - 157, -1, 159, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 151, -1, -1, - 154, -1, -1, 157, -1, 159, 7, 8, -1, 10, - 11, 12, 13, 14, 15, 16, 17, -1, 19, 20, - -1, 22, 23, 24, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 151, 39, -1, - 154, -1, 156, 157, -1, 159, 7, 8, 49, 10, - 11, 12, 13, 14, 15, 16, 17, -1, 19, 20, - -1, 22, 23, 24, -1, -1, -1, -1, 151, -1, - -1, 154, -1, -1, 157, -1, 159, 7, 8, -1, - 10, 11, 12, 13, 14, 15, 16, 17, 49, 19, - 20, -1, 22, 23, 24, 7, 8, -1, 10, 11, + 40, 41, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 7, 8, 57, 10, 11, 12, 13, 14, 15, 16, 17, -1, 19, 20, -1, - 22, 23, 24, -1, -1, -1, -1, 7, 8, 49, - 10, 11, 12, 13, 14, 15, 16, 17, -1, 19, - 20, -1, 22, 23, 24, -1, -1, 49, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 151, -1, -1, 154, -1, -1, 157, -1, 159, 49, - 7, 8, -1, 10, 11, 12, 13, 14, 15, 16, - 17, -1, 19, 20, -1, 22, 23, 24, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 151, -1, -1, 154, -1, -1, 157, -1, 159, -1, - -1, -1, 49, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 151, -1, -1, 154, -1, -1, 157, -1, 159, + 22, 23, 24, 73, 74, 75, 76, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, + -1, -1, -1, -1, -1, 7, 8, 49, 10, 11, + 12, 13, 14, 15, 16, 17, -1, 19, 20, -1, + 22, 23, 24, -1, -1, 115, 116, 117, 118, 119, + 120, 121, 122, 123, 124, 125, 126, 127, -1, 129, + -1, 131, 132, 133, -1, 7, 8, 49, 10, 11, + 12, 13, 14, 15, 16, 17, -1, 19, 20, -1, + 22, 23, 24, -1, -1, 7, 8, 157, 10, 11, + 12, 13, 14, 15, 16, 17, -1, 19, 20, -1, + 22, 23, 24, -1, -1, -1, -1, 49, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 39, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 49, -1, 151, + -1, -1, 154, -1, -1, 157, -1, 159, 160, 7, + 8, -1, 10, 11, 12, 13, 14, 15, 16, 17, + -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 151, - -1, -1, 154, -1, -1, 157, -1, 159, -1, -1, + -1, -1, 154, -1, -1, 157, -1, 159, 160, 7, + 8, 49, 10, 11, 12, 13, 14, 15, 16, 17, + -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 151, + -1, 39, 154, -1, -1, 157, -1, 159, 160, -1, + -1, 49, -1, -1, -1, -1, -1, -1, -1, 151, + -1, -1, 154, -1, -1, 157, -1, 159, -1, 7, + 8, -1, 10, 11, 12, 13, 14, 15, 16, 17, + -1, 19, 20, 121, 22, 23, 24, -1, 7, 8, + -1, 10, 11, 12, 13, 14, 15, 16, 17, -1, + 19, 20, -1, 22, 23, 24, -1, -1, -1, -1, + -1, 49, -1, 151, -1, -1, 154, -1, -1, 157, + 39, 159, -1, -1, -1, -1, -1, -1, 7, 8, + 49, 10, 11, 12, 13, 14, 15, 16, 17, -1, + 19, 20, -1, 22, 23, 24, -1, -1, -1, -1, + -1, -1, -1, 151, -1, -1, 154, -1, -1, 157, + 39, 159, -1, -1, -1, -1, -1, -1, 7, 8, + 49, 10, 11, 12, 13, 14, 15, 16, 17, -1, + 19, 20, -1, 22, 23, 24, 7, 8, -1, 10, + 11, 12, 13, 14, 15, 16, 17, -1, 19, 20, + -1, 22, 23, 24, -1, -1, -1, -1, -1, -1, + 49, -1, -1, 151, -1, -1, 154, -1, 156, 157, + -1, 159, -1, -1, -1, -1, -1, -1, 49, -1, + -1, -1, 151, -1, -1, 154, -1, -1, 157, -1, + 159, 7, 8, -1, 10, 11, 12, 13, 14, 15, + 16, 17, -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 151, -1, -1, 154, -1, -1, 157, -1, 159, - -1, 7, 8, -1, 10, 11, 12, 13, 14, 15, + -1, -1, 151, -1, -1, 154, -1, -1, 157, -1, + 159, 7, 8, 49, 10, 11, 12, 13, 14, 15, 16, 17, -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 151, -1, -1, 154, -1, -1, - 157, -1, 159, 49, 7, 8, -1, 10, 11, 12, - 13, 14, 15, 16, 17, -1, 19, 20, -1, 22, - 23, 24, 7, 8, -1, 10, 11, 12, 13, 14, - 15, 16, 17, -1, 19, 20, -1, 22, 23, 24, - 36, -1, -1, -1, -1, -1, 49, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 55, - 56, -1, -1, -1, 49, -1, -1, -1, -1, -1, + -1, -1, 151, -1, -1, 154, -1, -1, 157, -1, + 159, -1, -1, 49, -1, -1, -1, -1, -1, -1, + 151, -1, -1, 154, -1, -1, 157, -1, 159, 7, + 8, -1, 10, 11, 12, 13, 14, 15, 16, 17, + -1, 19, 20, -1, 22, 23, 24, 7, 8, -1, + 10, 11, 12, 13, 14, 15, 16, 17, -1, 19, + 20, -1, 22, 23, 24, -1, -1, -1, -1, -1, + -1, 49, -1, -1, -1, 151, -1, -1, 154, -1, + -1, 157, -1, 159, -1, -1, -1, 7, 8, 49, + 10, 11, 12, 13, 14, 15, 16, 17, -1, 19, + 20, -1, 22, 23, 24, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 151, -1, -1, 154, -1, + -1, 157, -1, 159, -1, -1, -1, 7, 8, 49, + 10, 11, 12, 13, 14, 15, 16, 17, -1, 19, + 20, -1, 22, 23, 24, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 49, + 36, -1, -1, 151, -1, -1, 154, -1, -1, 157, + -1, 159, -1, -1, -1, -1, -1, -1, -1, 55, + 56, 151, -1, -1, 154, -1, -1, 157, -1, 159, -1, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 151, -1, -1, 154, -1, - -1, 157, -1, 159, 110, 111, 112, -1, -1, 115, + -1, 151, -1, -1, 154, -1, -1, 157, -1, 159, + -1, -1, -1, -1, 110, 111, 112, -1, -1, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, - 126, 127, 128, 129, 130, 131, 132, 133, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 151, -1, - -1, 154, -1, -1, 157, -1, 159, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 151, -1, -1, 154, - -1, -1, 157, -1, 159 + 126, 127, 128, 129, 130, 131, 132, 133, 0, -1, + -1, 151, -1, -1, 154, -1, -1, 157, -1, 159, + -1, -1, -1, -1, -1, -1, 18, 19, 20, -1, + 22, 23, 24, -1, -1, -1, -1, -1, 30, 31, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 51, + -1, -1, 54, -1, -1, -1, 58 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -2605,12 +2595,12 @@ 17, 194, 238, 229, 229, 188, 188, 230, 229, 149, 230, 230, 230, 238, 229, 200, 200, 149, 153, 149, 149, 153, 153, 153, 184, 189, 190, 22, 149, 154, - 229, 229, 149, 153, 156, 229, 153, 188, 153, 153, + 184, 184, 149, 153, 156, 229, 153, 188, 153, 153, 200, 200, 200, 171, 53, 187, 17, 156, 168, 235, - 184, 184, 17, 194, 186, 156, 186, 153, 153, 153, - 4, 229, 227, 156, 168, 229, 229, 38, 149, 227, - 184, 184, 17, 17, 149, 229, 229, 17, 71, 229, - 17, 229 + 117, 118, 229, 229, 17, 194, 186, 156, 186, 153, + 153, 153, 4, 229, 227, 156, 168, 184, 184, 184, + 184, 38, 149, 227, 229, 229, 17, 17, 149, 184, + 184, 229, 229, 17, 71, 229, 17, 229 }; #define yyerrok (yyerrstatus = 0) @@ -2684,7 +2674,7 @@ we won't break user code: when these are the locations we know. */ #ifndef YY_LOCATION_PRINT -# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL +# if YYLTYPE_IS_TRIVIAL # define YY_LOCATION_PRINT(File, Loc) \ fprintf (File, "%d.%d-%d.%d", \ (Loc).first_line, (Loc).first_column, \ @@ -3425,142 +3415,142 @@ switch (yyn) { case 29: -#line 1134 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1111 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_EQ; ;} break; case 30: -#line 1134 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1111 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_NE; ;} break; case 31: -#line 1135 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1112 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_SLT; ;} break; case 32: -#line 1135 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1112 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_SGT; ;} break; case 33: -#line 1136 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1113 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_SLE; ;} break; case 34: -#line 1136 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1113 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_SGE; ;} break; case 35: -#line 1137 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1114 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_ULT; ;} break; case 36: -#line 1137 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1114 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_UGT; ;} break; case 37: -#line 1138 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1115 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_ULE; ;} break; case 38: -#line 1138 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1115 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_UGE; ;} break; case 39: -#line 1142 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1119 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_OEQ; ;} break; case 40: -#line 1142 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1119 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_ONE; ;} break; case 41: -#line 1143 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1120 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_OLT; ;} break; case 42: -#line 1143 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1120 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_OGT; ;} break; case 43: -#line 1144 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1121 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_OLE; ;} break; case 44: -#line 1144 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1121 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_OGE; ;} break; case 45: -#line 1145 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1122 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_ORD; ;} break; case 46: -#line 1145 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1122 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_UNO; ;} break; case 47: -#line 1146 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1123 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_UEQ; ;} break; case 48: -#line 1146 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1123 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_UNE; ;} break; case 49: -#line 1147 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1124 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_ULT; ;} break; case 50: -#line 1147 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1124 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_UGT; ;} break; case 51: -#line 1148 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1125 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_ULE; ;} break; case 52: -#line 1148 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1125 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_UGE; ;} break; case 53: -#line 1149 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1126 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_TRUE; ;} break; case 54: -#line 1150 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1127 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_FALSE; ;} break; case 65: -#line 1159 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1136 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = 0; ;} break; case 66: -#line 1163 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1140 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal); CHECK_FOR_ERROR @@ -3568,7 +3558,7 @@ break; case 67: -#line 1167 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1144 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = 0; CHECK_FOR_ERROR @@ -3576,7 +3566,7 @@ break; case 71: -#line 1175 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1152 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = 0; CHECK_FOR_ERROR @@ -3584,7 +3574,7 @@ break; case 72: -#line 1180 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1157 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal); CHECK_FOR_ERROR @@ -3592,152 +3582,152 @@ break; case 73: -#line 1186 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1163 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::InternalLinkage; ;} break; case 74: -#line 1187 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1164 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::WeakLinkage; ;} break; case 75: -#line 1188 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1165 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;} break; case 76: -#line 1189 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1166 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;} break; case 77: -#line 1190 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1167 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;} break; case 78: -#line 1194 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1171 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;} break; case 79: -#line 1195 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1172 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;} break; case 80: -#line 1196 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1173 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;} break; case 81: -#line 1200 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1177 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Visibility) = GlobalValue::DefaultVisibility; ;} break; case 82: -#line 1201 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1178 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Visibility) = GlobalValue::DefaultVisibility; ;} break; case 83: -#line 1202 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1179 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Visibility) = GlobalValue::HiddenVisibility; ;} break; case 84: -#line 1203 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1180 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Visibility) = GlobalValue::ProtectedVisibility; ;} break; case 85: -#line 1207 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1184 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;} break; case 86: -#line 1208 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1185 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;} break; case 87: -#line 1209 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1186 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;} break; case 88: -#line 1213 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1190 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;} break; case 89: -#line 1214 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1191 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::InternalLinkage; ;} break; case 90: -#line 1215 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1192 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;} break; case 91: -#line 1216 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1193 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::WeakLinkage; ;} break; case 92: -#line 1217 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1194 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;} break; case 93: -#line 1221 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1198 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;} break; case 94: -#line 1222 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1199 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::WeakLinkage; ;} break; case 95: -#line 1223 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1200 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::InternalLinkage; ;} break; case 96: -#line 1226 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1203 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::C; ;} break; case 97: -#line 1227 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1204 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::C; ;} break; case 98: -#line 1228 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1205 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::Fast; ;} break; case 99: -#line 1229 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1206 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::Cold; ;} break; case 100: -#line 1230 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1207 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::X86_StdCall; ;} break; case 101: -#line 1231 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1208 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::X86_FastCall; ;} break; case 102: -#line 1232 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1209 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val)) GEN_ERROR("Calling conv too large"); @@ -3747,111 +3737,111 @@ break; case 103: -#line 1239 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1216 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::ZExt; ;} break; case 104: -#line 1240 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1217 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::ZExt; ;} break; case 105: -#line 1241 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1218 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::SExt; ;} break; case 106: -#line 1242 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1219 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::SExt; ;} break; case 107: -#line 1243 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1220 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::InReg; ;} break; case 108: -#line 1244 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1221 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::StructRet; ;} break; case 109: -#line 1245 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1222 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::NoAlias; ;} break; case 110: -#line 1246 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1223 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::ByVal; ;} break; case 111: -#line 1247 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1224 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::Nest; ;} break; case 112: -#line 1250 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1227 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::None; ;} break; case 113: -#line 1251 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1228 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs); ;} break; case 114: -#line 1256 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1233 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::NoReturn; ;} break; case 115: -#line 1257 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1234 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::NoUnwind; ;} break; case 116: -#line 1258 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1235 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::ZExt; ;} break; case 117: -#line 1259 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1236 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::SExt; ;} break; case 118: -#line 1260 "/llvm/lib/AsmParser/llvmAsmParser.y" - { (yyval.ParamAttrs) = ParamAttr::Pure; ;} +#line 1237 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.ParamAttrs) = ParamAttr::ReadNone; ;} break; case 119: -#line 1261 "/llvm/lib/AsmParser/llvmAsmParser.y" - { (yyval.ParamAttrs) = ParamAttr::Const; ;} +#line 1238 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.ParamAttrs) = ParamAttr::ReadOnly; ;} break; case 120: -#line 1264 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1241 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::None; ;} break; case 121: -#line 1265 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1242 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs); ;} break; case 122: -#line 1272 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1249 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = 0; ;} break; case 123: -#line 1273 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1250 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = (yyvsp[(2) - (2)].UInt64Val); if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal))) @@ -3861,12 +3851,12 @@ break; case 124: -#line 1279 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1256 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = 0; ;} break; case 125: -#line 1280 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1257 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = (yyvsp[(3) - (3)].UInt64Val); if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal))) @@ -3876,7 +3866,7 @@ break; case 126: -#line 1288 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1265 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { for (unsigned i = 0, e = (yyvsp[(2) - (2)].StrVal)->length(); i != e; ++i) if ((*(yyvsp[(2) - (2)].StrVal))[i] == '"' || (*(yyvsp[(2) - (2)].StrVal))[i] == '\\') @@ -3887,27 +3877,27 @@ break; case 127: -#line 1296 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1273 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = 0; ;} break; case 128: -#line 1297 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1274 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = (yyvsp[(1) - (1)].StrVal); ;} break; case 129: -#line 1302 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1279 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" {;} break; case 130: -#line 1303 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1280 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" {;} break; case 131: -#line 1304 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1281 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CurGV->setSection(*(yyvsp[(1) - (1)].StrVal)); delete (yyvsp[(1) - (1)].StrVal); @@ -3916,7 +3906,7 @@ break; case 132: -#line 1309 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1286 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[(2) - (2)].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[(2) - (2)].UInt64Val))) GEN_ERROR("Alignment must be a power of two"); @@ -3926,7 +3916,7 @@ break; case 140: -#line 1325 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1302 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeVal) = new PATypeHolder(OpaqueType::get()); CHECK_FOR_ERROR @@ -3934,7 +3924,7 @@ break; case 141: -#line 1329 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1306 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeVal) = new PATypeHolder((yyvsp[(1) - (1)].PrimType)); CHECK_FOR_ERROR @@ -3942,7 +3932,7 @@ break; case 142: -#line 1333 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1310 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Pointer type? if (*(yyvsp[(1) - (2)].TypeVal) == Type::LabelTy) GEN_ERROR("Cannot form a pointer to a basic block"); @@ -3953,7 +3943,7 @@ break; case 143: -#line 1340 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1317 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Named types are also simple types... const Type* tmp = getTypeVal((yyvsp[(1) - (1)].ValIDVal)); CHECK_FOR_ERROR @@ -3962,7 +3952,7 @@ break; case 144: -#line 1345 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1322 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Type UpReference if ((yyvsp[(2) - (2)].UInt64Val) > (uint64_t)~0U) GEN_ERROR("Value out of range"); OpaqueType *OT = OpaqueType::get(); // Use temporary placeholder @@ -3974,32 +3964,20 @@ break; case 145: -#line 1353 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1330 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { + // Allow but ignore attributes on function types; this permits auto-upgrade. + // FIXME: remove in LLVM 3.0. std::vector Params; - ParamAttrsVector Attrs; - if ((yyvsp[(5) - (5)].ParamAttrs) != ParamAttr::None) { - ParamAttrsWithIndex X; X.index = 0; X.attrs = (yyvsp[(5) - (5)].ParamAttrs); - Attrs.push_back(X); - } - unsigned index = 1; TypeWithAttrsList::iterator I = (yyvsp[(3) - (5)].TypeWithAttrsList)->begin(), E = (yyvsp[(3) - (5)].TypeWithAttrsList)->end(); - for (; I != E; ++I, ++index) { + for (; I != E; ++I ) { const Type *Ty = I->Ty->get(); Params.push_back(Ty); - if (Ty != Type::VoidTy) - if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex X; X.index = index; X.attrs = I->Attrs; - Attrs.push_back(X); - } } bool isVarArg = Params.size() && Params.back() == Type::VoidTy; if (isVarArg) Params.pop_back(); - ParamAttrsList *ActualAttrs = 0; - if (!Attrs.empty()) - ActualAttrs = ParamAttrsList::get(Attrs); - FunctionType *FT = FunctionType::get(*(yyvsp[(1) - (5)].TypeVal), Params, isVarArg, ActualAttrs); + FunctionType *FT = FunctionType::get(*(yyvsp[(1) - (5)].TypeVal), Params, isVarArg); delete (yyvsp[(3) - (5)].TypeWithAttrsList); // Delete the argument list delete (yyvsp[(1) - (5)].TypeVal); // Delete the return type handle (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(FT)); @@ -4008,33 +3986,20 @@ break; case 146: -#line 1383 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1348 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { + // Allow but ignore attributes on function types; this permits auto-upgrade. + // FIXME: remove in LLVM 3.0. std::vector Params; - ParamAttrsVector Attrs; - if ((yyvsp[(5) - (5)].ParamAttrs) != ParamAttr::None) { - ParamAttrsWithIndex X; X.index = 0; X.attrs = (yyvsp[(5) - (5)].ParamAttrs); - Attrs.push_back(X); - } TypeWithAttrsList::iterator I = (yyvsp[(3) - (5)].TypeWithAttrsList)->begin(), E = (yyvsp[(3) - (5)].TypeWithAttrsList)->end(); - unsigned index = 1; - for ( ; I != E; ++I, ++index) { + for ( ; I != E; ++I ) { const Type* Ty = I->Ty->get(); Params.push_back(Ty); - if (Ty != Type::VoidTy) - if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex X; X.index = index; X.attrs = I->Attrs; - Attrs.push_back(X); - } } bool isVarArg = Params.size() && Params.back() == Type::VoidTy; if (isVarArg) Params.pop_back(); - ParamAttrsList *ActualAttrs = 0; - if (!Attrs.empty()) - ActualAttrs = ParamAttrsList::get(Attrs); - - FunctionType *FT = FunctionType::get((yyvsp[(1) - (5)].PrimType), Params, isVarArg, ActualAttrs); + FunctionType *FT = FunctionType::get((yyvsp[(1) - (5)].PrimType), Params, isVarArg); delete (yyvsp[(3) - (5)].TypeWithAttrsList); // Delete the argument list (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(FT)); CHECK_FOR_ERROR @@ -4042,7 +4007,7 @@ break; case 147: -#line 1414 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1366 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Sized array type? (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(ArrayType::get(*(yyvsp[(4) - (5)].TypeVal), (unsigned)(yyvsp[(2) - (5)].UInt64Val)))); delete (yyvsp[(4) - (5)].TypeVal); @@ -4051,7 +4016,7 @@ break; case 148: -#line 1419 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1371 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Vector type? const llvm::Type* ElemTy = (yyvsp[(4) - (5)].TypeVal)->get(); if ((unsigned)(yyvsp[(2) - (5)].UInt64Val) != (yyvsp[(2) - (5)].UInt64Val)) @@ -4065,7 +4030,7 @@ break; case 149: -#line 1429 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1381 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Structure type? std::vector Elements; for (std::list::iterator I = (yyvsp[(2) - (3)].TypeList)->begin(), @@ -4079,7 +4044,7 @@ break; case 150: -#line 1439 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1391 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Empty structure type? (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector())); CHECK_FOR_ERROR @@ -4087,7 +4052,7 @@ break; case 151: -#line 1443 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1395 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { std::vector Elements; for (std::list::iterator I = (yyvsp[(3) - (5)].TypeList)->begin(), @@ -4101,7 +4066,7 @@ break; case 152: -#line 1453 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1405 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Empty structure type? (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector(), true)); CHECK_FOR_ERROR @@ -4109,15 +4074,17 @@ break; case 153: -#line 1460 "/llvm/lib/AsmParser/llvmAsmParser.y" - { +#line 1412 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" + { + // Allow but ignore attributes on function types; this permits auto-upgrade. + // FIXME: remove in LLVM 3.0. (yyval.TypeWithAttrs).Ty = (yyvsp[(1) - (2)].TypeVal); - (yyval.TypeWithAttrs).Attrs = (yyvsp[(2) - (2)].ParamAttrs); + (yyval.TypeWithAttrs).Attrs = ParamAttr::None; ;} break; case 154: -#line 1467 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1421 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (1)].TypeVal))->getDescription()); @@ -4128,14 +4095,14 @@ break; case 155: -#line 1474 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1428 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeVal) = new PATypeHolder(Type::VoidTy); ;} break; case 156: -#line 1479 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1433 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeWithAttrsList) = new TypeWithAttrsList(); (yyval.TypeWithAttrsList)->push_back((yyvsp[(1) - (1)].TypeWithAttrs)); @@ -4144,7 +4111,7 @@ break; case 157: -#line 1484 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1438 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { ((yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList))->push_back((yyvsp[(3) - (3)].TypeWithAttrs)); CHECK_FOR_ERROR @@ -4152,7 +4119,7 @@ break; case 159: -#line 1492 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1446 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList); TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None; @@ -4163,7 +4130,7 @@ break; case 160: -#line 1499 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1453 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeWithAttrsList) = new TypeWithAttrsList; TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None; @@ -4174,7 +4141,7 @@ break; case 161: -#line 1506 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1460 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeWithAttrsList) = new TypeWithAttrsList(); CHECK_FOR_ERROR @@ -4182,7 +4149,7 @@ break; case 162: -#line 1514 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1468 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeList) = new std::list(); (yyval.TypeList)->push_back(*(yyvsp[(1) - (1)].TypeVal)); @@ -4192,7 +4159,7 @@ break; case 163: -#line 1520 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1474 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { ((yyval.TypeList)=(yyvsp[(1) - (3)].TypeList))->push_back(*(yyvsp[(3) - (3)].TypeVal)); delete (yyvsp[(3) - (3)].TypeVal); @@ -4201,7 +4168,7 @@ break; case 164: -#line 1532 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1486 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Nonempty unsized arr if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription()); @@ -4233,7 +4200,7 @@ break; case 165: -#line 1560 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1514 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription()); @@ -4253,7 +4220,7 @@ break; case 166: -#line 1576 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1530 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription()); @@ -4284,7 +4251,7 @@ break; case 167: -#line 1603 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1557 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Nonempty unsized arr if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription()); @@ -4316,7 +4283,7 @@ break; case 168: -#line 1631 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1585 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { const StructType *STy = dyn_cast((yyvsp[(1) - (4)].TypeVal)->get()); if (STy == 0) @@ -4346,7 +4313,7 @@ break; case 169: -#line 1657 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1611 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription()); @@ -4370,7 +4337,7 @@ break; case 170: -#line 1677 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1631 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { const StructType *STy = dyn_cast((yyvsp[(1) - (6)].TypeVal)->get()); if (STy == 0) @@ -4400,7 +4367,7 @@ break; case 171: -#line 1703 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1657 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (5)].TypeVal))->getDescription()); @@ -4424,7 +4391,7 @@ break; case 172: -#line 1723 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1677 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription()); @@ -4440,7 +4407,7 @@ break; case 173: -#line 1735 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1689 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription()); @@ -4451,7 +4418,7 @@ break; case 174: -#line 1742 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1696 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription()); @@ -4521,7 +4488,7 @@ break; case 175: -#line 1808 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1762 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription()); @@ -4535,7 +4502,7 @@ break; case 176: -#line 1818 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1772 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription()); @@ -4549,7 +4516,7 @@ break; case 177: -#line 1828 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1782 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // integral constants if (!ConstantInt::isValueValidForType((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].SInt64Val))) GEN_ERROR("Constant value doesn't fit in type"); @@ -4559,7 +4526,7 @@ break; case 178: -#line 1834 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1788 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // arbitrary precision integer constants uint32_t BitWidth = cast((yyvsp[(1) - (2)].PrimType))->getBitWidth(); if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > BitWidth) { @@ -4573,7 +4540,7 @@ break; case 179: -#line 1844 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1798 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // integral constants if (!ConstantInt::isValueValidForType((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].UInt64Val))) GEN_ERROR("Constant value doesn't fit in type"); @@ -4583,7 +4550,7 @@ break; case 180: -#line 1850 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1804 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // arbitrary precision integer constants uint32_t BitWidth = cast((yyvsp[(1) - (2)].PrimType))->getBitWidth(); if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > BitWidth) { @@ -4597,7 +4564,7 @@ break; case 181: -#line 1860 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1814 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Boolean constants assert(cast((yyvsp[(1) - (2)].PrimType))->getBitWidth() == 1 && "Not Bool?"); (yyval.ConstVal) = ConstantInt::getTrue(); @@ -4606,7 +4573,7 @@ break; case 182: -#line 1865 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1819 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Boolean constants assert(cast((yyvsp[(1) - (2)].PrimType))->getBitWidth() == 1 && "Not Bool?"); (yyval.ConstVal) = ConstantInt::getFalse(); @@ -4615,7 +4582,7 @@ break; case 183: -#line 1870 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1824 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Floating point constants if (!ConstantFP::isValueValidForType((yyvsp[(1) - (2)].PrimType), *(yyvsp[(2) - (2)].FPVal))) GEN_ERROR("Floating point constant invalid for type"); @@ -4630,7 +4597,7 @@ break; case 184: -#line 1883 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1837 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (6)].TypeVal))->getDescription()); @@ -4646,7 +4613,7 @@ break; case 185: -#line 1895 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1849 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!isa((yyvsp[(3) - (5)].ConstVal)->getType())) GEN_ERROR("GetElementPtr requires a pointer operand"); @@ -4672,7 +4639,7 @@ break; case 186: -#line 1917 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1871 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[(3) - (8)].ConstVal)->getType() != Type::Int1Ty) GEN_ERROR("Select condition must be of boolean type"); @@ -4684,7 +4651,7 @@ break; case 187: -#line 1925 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1879 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType()) GEN_ERROR("Binary operator types must match"); @@ -4694,7 +4661,7 @@ break; case 188: -#line 1931 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1885 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType()) GEN_ERROR("Logical operator types must match"); @@ -4709,7 +4676,7 @@ break; case 189: -#line 1942 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1896 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType()) GEN_ERROR("icmp operand types must match"); @@ -4718,7 +4685,7 @@ break; case 190: -#line 1947 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1901 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType()) GEN_ERROR("fcmp operand types must match"); @@ -4727,7 +4694,7 @@ break; case 191: -#line 1952 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1906 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!ExtractElementInst::isValidOperands((yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal))) GEN_ERROR("Invalid extractelement operands"); @@ -4737,7 +4704,7 @@ break; case 192: -#line 1958 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1912 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!InsertElementInst::isValidOperands((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal))) GEN_ERROR("Invalid insertelement operands"); @@ -4747,7 +4714,7 @@ break; case 193: -#line 1964 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1918 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!ShuffleVectorInst::isValidOperands((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal))) GEN_ERROR("Invalid shufflevector operands"); @@ -4757,7 +4724,7 @@ break; case 194: -#line 1973 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1927 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { ((yyval.ConstVector) = (yyvsp[(1) - (3)].ConstVector))->push_back((yyvsp[(3) - (3)].ConstVal)); CHECK_FOR_ERROR @@ -4765,7 +4732,7 @@ break; case 195: -#line 1977 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1931 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ConstVector) = new std::vector(); (yyval.ConstVector)->push_back((yyvsp[(1) - (1)].ConstVal)); @@ -4774,27 +4741,27 @@ break; case 196: -#line 1985 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1939 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = false; ;} break; case 197: -#line 1985 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1939 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = true; ;} break; case 198: -#line 1988 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1942 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = true; ;} break; case 199: -#line 1988 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1942 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = false; ;} break; case 200: -#line 1991 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1945 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { const Type* VTy = (yyvsp[(1) - (2)].TypeVal)->get(); Value *V = getVal(VTy, (yyvsp[(2) - (2)].ValIDVal)); @@ -4810,7 +4777,7 @@ break; case 201: -#line 2003 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1957 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { Constant *Val = (yyvsp[(3) - (6)].ConstVal); const Type *DestTy = (yyvsp[(5) - (6)].TypeVal)->get(); @@ -4826,7 +4793,7 @@ break; case 202: -#line 2024 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1978 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule; CurModule.ModuleDone(); @@ -4835,7 +4802,7 @@ break; case 203: -#line 2029 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1983 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule; CurModule.ModuleDone(); @@ -4844,12 +4811,12 @@ break; case 206: -#line 2042 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1996 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CurFun.isDeclare = false; ;} break; case 207: -#line 2042 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1996 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CurFun.FunctionDone(); CHECK_FOR_ERROR @@ -4857,26 +4824,26 @@ break; case 208: -#line 2046 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2000 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CurFun.isDeclare = true; ;} break; case 209: -#line 2046 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2000 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CHECK_FOR_ERROR ;} break; case 210: -#line 2049 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2003 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CHECK_FOR_ERROR ;} break; case 211: -#line 2052 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2006 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (3)].TypeVal))->getDescription()); @@ -4904,7 +4871,7 @@ break; case 212: -#line 2076 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2030 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { ResolveTypeTo((yyvsp[(1) - (3)].StrVal), (yyvsp[(3) - (3)].PrimType)); @@ -4919,7 +4886,7 @@ break; case 213: -#line 2087 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2041 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { /* "Externally Visible" Linkage */ if ((yyvsp[(5) - (5)].ConstVal) == 0) @@ -4931,14 +4898,14 @@ break; case 214: -#line 2094 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2048 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CurGV = 0; ;} break; case 215: -#line 2098 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2052 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[(6) - (6)].ConstVal) == 0) GEN_ERROR("Global value initializer is not a constant"); @@ -4948,14 +4915,14 @@ break; case 216: -#line 2103 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2057 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CurGV = 0; ;} break; case 217: -#line 2107 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2061 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(6) - (6)].TypeVal))->getDescription()); @@ -4966,7 +4933,7 @@ break; case 218: -#line 2113 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2067 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CurGV = 0; CHECK_FOR_ERROR @@ -4974,7 +4941,7 @@ break; case 219: -#line 2117 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2071 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { std::string Name; if ((yyvsp[(1) - (5)].StrVal)) { @@ -5018,21 +4985,21 @@ break; case 220: -#line 2157 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2111 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CHECK_FOR_ERROR ;} break; case 221: -#line 2160 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2114 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CHECK_FOR_ERROR ;} break; case 222: -#line 2166 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2120 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm(); if (AsmSoFar.empty()) @@ -5045,7 +5012,7 @@ break; case 223: -#line 2176 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2130 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CurModule.CurrentModule->setTargetTriple(*(yyvsp[(3) - (3)].StrVal)); delete (yyvsp[(3) - (3)].StrVal); @@ -5053,7 +5020,7 @@ break; case 224: -#line 2180 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2134 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CurModule.CurrentModule->setDataLayout(*(yyvsp[(3) - (3)].StrVal)); delete (yyvsp[(3) - (3)].StrVal); @@ -5061,7 +5028,7 @@ break; case 226: -#line 2187 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2141 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CurModule.CurrentModule->addLibrary(*(yyvsp[(3) - (3)].StrVal)); delete (yyvsp[(3) - (3)].StrVal); @@ -5070,7 +5037,7 @@ break; case 227: -#line 2192 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2146 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CurModule.CurrentModule->addLibrary(*(yyvsp[(1) - (1)].StrVal)); delete (yyvsp[(1) - (1)].StrVal); @@ -5079,14 +5046,14 @@ break; case 228: -#line 2197 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2151 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CHECK_FOR_ERROR ;} break; case 229: -#line 2206 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2160 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription()); @@ -5100,7 +5067,7 @@ break; case 230: -#line 2216 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2170 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription()); @@ -5114,7 +5081,7 @@ break; case 231: -#line 2227 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2181 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ArgList) = (yyvsp[(1) - (1)].ArgList); CHECK_FOR_ERROR @@ -5122,7 +5089,7 @@ break; case 232: -#line 2231 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2185 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ArgList) = (yyvsp[(1) - (3)].ArgList); struct ArgListEntry E; @@ -5135,7 +5102,7 @@ break; case 233: -#line 2240 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2194 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ArgList) = new ArgListType; struct ArgListEntry E; @@ -5148,7 +5115,7 @@ break; case 234: -#line 2249 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2203 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ArgList) = 0; CHECK_FOR_ERROR @@ -5156,7 +5123,7 @@ break; case 235: -#line 2255 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2209 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { std::string FunctionName(*(yyvsp[(3) - (9)].StrVal)); delete (yyvsp[(3) - (9)].StrVal); // Free strdup'd memory! @@ -5169,7 +5136,9 @@ std::vector ParamTypeList; ParamAttrsVector Attrs; if ((yyvsp[(7) - (9)].ParamAttrs) != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = (yyvsp[(7) - (9)].ParamAttrs); + ParamAttrsWithIndex PAWI; + PAWI.index = 0; + PAWI.attrs = (yyvsp[(7) - (9)].ParamAttrs); Attrs.push_back(PAWI); } if ((yyvsp[(5) - (9)].ArgList)) { // If there are arguments... @@ -5181,7 +5150,9 @@ ParamTypeList.push_back(Ty); if (Ty != Type::VoidTy) if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = index; PAWI.attrs = I->Attrs; + ParamAttrsWithIndex PAWI; + PAWI.index = index; + PAWI.attrs = I->Attrs; Attrs.push_back(PAWI); } } @@ -5194,7 +5165,7 @@ if (!Attrs.empty()) PAL = ParamAttrsList::get(Attrs); - FunctionType *FT = FunctionType::get(*(yyvsp[(2) - (9)].TypeVal), ParamTypeList, isVarArg, PAL); + FunctionType *FT = FunctionType::get(*(yyvsp[(2) - (9)].TypeVal), ParamTypeList, isVarArg); const PointerType *PFT = PointerType::get(FT); delete (yyvsp[(2) - (9)].TypeVal); @@ -5211,19 +5182,24 @@ // Move the function to the end of the list, from whereever it was // previously inserted. Fn = cast(FWRef); + assert(!Fn->getParamAttrs() && "Forward reference has parameter attributes!"); CurModule.CurrentModule->getFunctionList().remove(Fn); CurModule.CurrentModule->getFunctionList().push_back(Fn); } else if (!FunctionName.empty() && // Merge with an earlier prototype? (Fn = CurModule.CurrentModule->getFunction(FunctionName))) { - if (Fn->getFunctionType() != FT) { + if (Fn->getFunctionType() != FT ) { // The existing function doesn't have the same type. This is an overload // error. GEN_ERROR("Overload of function '" + FunctionName + "' not permitted."); + } else if (Fn->getParamAttrs() != PAL) { + // The existing function doesn't have the same parameter attributes. + // This is an overload error. + GEN_ERROR("Overload of function '" + FunctionName + "' not permitted."); } else if (!CurFun.isDeclare && !Fn->isDeclaration()) { // Neither the existing or the current function is a declaration and they // have the same name and same type. Clearly this is a redefinition. GEN_ERROR("Redefinition of function '" + FunctionName + "'"); - } if (Fn->isDeclaration()) { + } else if (Fn->isDeclaration()) { // Make sure to strip off any argument names so we can't get conflicts. for (Function::arg_iterator AI = Fn->arg_begin(), AE = Fn->arg_end(); AI != AE; ++AI) @@ -5232,7 +5208,6 @@ } else { // Not already defined? Fn = new Function(FT, GlobalValue::ExternalWeakLinkage, FunctionName, CurModule.CurrentModule); - InsertValue(Fn, CurModule.Values); } @@ -5246,6 +5221,7 @@ Fn->setVisibility(CurFun.Visibility); } Fn->setCallingConv((yyvsp[(1) - (9)].UIntVal)); + Fn->setParamAttrs(PAL); Fn->setAlignment((yyvsp[(9) - (9)].UIntVal)); if ((yyvsp[(8) - (9)].StrVal)) { Fn->setSection(*(yyvsp[(8) - (9)].StrVal)); @@ -5279,7 +5255,7 @@ break; case 238: -#line 2377 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2340 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FunctionVal) = CurFun.CurrentFunction; @@ -5291,7 +5267,7 @@ break; case 241: -#line 2388 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2351 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal); CHECK_FOR_ERROR @@ -5299,7 +5275,7 @@ break; case 242: -#line 2393 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2356 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CurFun.CurrentFunction->setLinkage((yyvsp[(1) - (3)].Linkage)); CurFun.CurrentFunction->setVisibility((yyvsp[(2) - (3)].Visibility)); @@ -5310,7 +5286,7 @@ break; case 243: -#line 2405 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2368 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = false; CHECK_FOR_ERROR @@ -5318,7 +5294,7 @@ break; case 244: -#line 2409 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2372 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = true; CHECK_FOR_ERROR @@ -5326,7 +5302,7 @@ break; case 245: -#line 2414 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2377 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // A reference to a direct constant (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].SInt64Val)); CHECK_FOR_ERROR @@ -5334,7 +5310,7 @@ break; case 246: -#line 2418 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2381 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].UInt64Val)); CHECK_FOR_ERROR @@ -5342,7 +5318,7 @@ break; case 247: -#line 2422 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2385 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Perhaps it's an FP constant? (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].FPVal)); CHECK_FOR_ERROR @@ -5350,7 +5326,7 @@ break; case 248: -#line 2426 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2389 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::create(ConstantInt::getTrue()); CHECK_FOR_ERROR @@ -5358,7 +5334,7 @@ break; case 249: -#line 2430 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2393 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::create(ConstantInt::getFalse()); CHECK_FOR_ERROR @@ -5366,7 +5342,7 @@ break; case 250: -#line 2434 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2397 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::createNull(); CHECK_FOR_ERROR @@ -5374,7 +5350,7 @@ break; case 251: -#line 2438 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2401 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::createUndef(); CHECK_FOR_ERROR @@ -5382,7 +5358,7 @@ break; case 252: -#line 2442 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2405 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // A vector zero constant. (yyval.ValIDVal) = ValID::createZeroInit(); CHECK_FOR_ERROR @@ -5390,7 +5366,7 @@ break; case 253: -#line 2446 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2409 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Nonempty unsized packed vector const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0]->getType(); int NumElements = (yyvsp[(2) - (3)].ConstVector)->size(); @@ -5419,7 +5395,7 @@ break; case 254: -#line 2471 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2434 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].ConstVal)); CHECK_FOR_ERROR @@ -5427,7 +5403,7 @@ break; case 255: -#line 2475 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2438 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::createInlineAsm(*(yyvsp[(3) - (5)].StrVal), *(yyvsp[(5) - (5)].StrVal), (yyvsp[(2) - (5)].BoolVal)); delete (yyvsp[(3) - (5)].StrVal); @@ -5437,7 +5413,7 @@ break; case 256: -#line 2485 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2448 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Is it an integer reference...? (yyval.ValIDVal) = ValID::createLocalID((yyvsp[(1) - (1)].UIntVal)); CHECK_FOR_ERROR @@ -5445,7 +5421,7 @@ break; case 257: -#line 2489 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2452 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::createGlobalID((yyvsp[(1) - (1)].UIntVal)); CHECK_FOR_ERROR @@ -5453,7 +5429,7 @@ break; case 258: -#line 2493 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2456 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Is it a named reference...? (yyval.ValIDVal) = ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal)); delete (yyvsp[(1) - (1)].StrVal); @@ -5462,7 +5438,7 @@ break; case 259: -#line 2498 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2461 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Is it a named reference...? (yyval.ValIDVal) = ValID::createGlobalName(*(yyvsp[(1) - (1)].StrVal)); delete (yyvsp[(1) - (1)].StrVal); @@ -5471,7 +5447,7 @@ break; case 262: -#line 2511 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2474 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription()); @@ -5482,7 +5458,7 @@ break; case 263: -#line 2520 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2483 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal); CHECK_FOR_ERROR @@ -5490,7 +5466,7 @@ break; case 264: -#line 2524 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2487 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Do not allow functions with 0 basic blocks (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal); CHECK_FOR_ERROR @@ -5498,7 +5474,7 @@ break; case 265: -#line 2533 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2496 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { setValueName((yyvsp[(3) - (3)].TermInstVal), (yyvsp[(2) - (3)].StrVal)); CHECK_FOR_ERROR @@ -5510,7 +5486,7 @@ break; case 266: -#line 2542 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2505 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (CastInst *CI1 = dyn_cast((yyvsp[(2) - (2)].InstVal))) if (CastInst *CI2 = dyn_cast(CI1->getOperand(0))) @@ -5523,7 +5499,7 @@ break; case 267: -#line 2551 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2514 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Empty space between instruction lists (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum)); CHECK_FOR_ERROR @@ -5531,7 +5507,7 @@ break; case 268: -#line 2555 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2518 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Labelled (named) basic block (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal))); delete (yyvsp[(1) - (1)].StrVal); @@ -5541,7 +5517,7 @@ break; case 269: -#line 2562 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2525 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Return with a result... (yyval.TermInstVal) = new ReturnInst((yyvsp[(2) - (2)].ValueVal)); CHECK_FOR_ERROR @@ -5549,7 +5525,7 @@ break; case 270: -#line 2566 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2529 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Return with no result... (yyval.TermInstVal) = new ReturnInst(); CHECK_FOR_ERROR @@ -5557,7 +5533,7 @@ break; case 271: -#line 2570 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2533 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Unconditional Branch... BasicBlock* tmpBB = getBBVal((yyvsp[(3) - (3)].ValIDVal)); CHECK_FOR_ERROR @@ -5566,7 +5542,7 @@ break; case 272: -#line 2575 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2538 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { assert(cast((yyvsp[(2) - (9)].PrimType))->getBitWidth() == 1 && "Not Bool?"); BasicBlock* tmpBBA = getBBVal((yyvsp[(6) - (9)].ValIDVal)); @@ -5580,7 +5556,7 @@ break; case 273: -#line 2585 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2548 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { Value* tmpVal = getVal((yyvsp[(2) - (9)].PrimType), (yyvsp[(3) - (9)].ValIDVal)); CHECK_FOR_ERROR @@ -5603,7 +5579,7 @@ break; case 274: -#line 2604 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2567 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { Value* tmpVal = getVal((yyvsp[(2) - (8)].PrimType), (yyvsp[(3) - (8)].ValIDVal)); CHECK_FOR_ERROR @@ -5616,7 +5592,7 @@ break; case 275: -#line 2614 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2577 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Handle the short syntax @@ -5626,28 +5602,14 @@ !(Ty = dyn_cast(PFTy->getElementType()))) { // Pull out the types of all of the arguments... std::vector ParamTypes; - ParamAttrsVector Attrs; - if ((yyvsp[(8) - (14)].ParamAttrs) != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = (yyvsp[(8) - (14)].ParamAttrs); - Attrs.push_back(PAWI); - } ParamList::iterator I = (yyvsp[(6) - (14)].ParamList)->begin(), E = (yyvsp[(6) - (14)].ParamList)->end(); - unsigned index = 1; - for (; I != E; ++I, ++index) { + for (; I != E; ++I) { const Type *Ty = I->Val->getType(); if (Ty == Type::VoidTy) GEN_ERROR("Short call syntax cannot be used with varargs"); ParamTypes.push_back(Ty); - if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = index; PAWI.attrs = I->Attrs; - Attrs.push_back(PAWI); - } } - - ParamAttrsList *PAL = 0; - if (!Attrs.empty()) - PAL = ParamAttrsList::get(Attrs); - Ty = FunctionType::get((yyvsp[(3) - (14)].TypeVal)->get(), ParamTypes, false, PAL); + Ty = FunctionType::get((yyvsp[(3) - (14)].TypeVal)->get(), ParamTypes, false); PFTy = PointerType::get(Ty); } @@ -5660,6 +5622,12 @@ BasicBlock *Except = getBBVal((yyvsp[(14) - (14)].ValIDVal)); CHECK_FOR_ERROR + ParamAttrsVector Attrs; + if ((yyvsp[(8) - (14)].ParamAttrs) != ParamAttr::None) { + ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = (yyvsp[(8) - (14)].ParamAttrs); + Attrs.push_back(PAWI); + } + // Check the arguments ValueList Args; if ((yyvsp[(6) - (14)].ParamList)->empty()) { // Has no arguments? @@ -5673,12 +5641,19 @@ FunctionType::param_iterator I = Ty->param_begin(); FunctionType::param_iterator E = Ty->param_end(); ParamList::iterator ArgI = (yyvsp[(6) - (14)].ParamList)->begin(), ArgE = (yyvsp[(6) - (14)].ParamList)->end(); + unsigned index = 1; - for (; ArgI != ArgE && I != E; ++ArgI, ++I) { + for (; ArgI != ArgE && I != E; ++ArgI, ++I, ++index) { if (ArgI->Val->getType() != *I) GEN_ERROR("Parameter " + ArgI->Val->getName()+ " is not of type '" + (*I)->getDescription() + "'"); Args.push_back(ArgI->Val); + if (ArgI->Attrs != ParamAttr::None) { + ParamAttrsWithIndex PAWI; + PAWI.index = index; + PAWI.attrs = ArgI->Attrs; + Attrs.push_back(PAWI); + } } if (Ty->isVarArg()) { @@ -5689,9 +5664,14 @@ GEN_ERROR("Invalid number of parameters detected"); } + ParamAttrsList *PAL = 0; + if (!Attrs.empty()) + PAL = ParamAttrsList::get(Attrs); + // Create the InvokeInst InvokeInst *II = new InvokeInst(V, Normal, Except, Args.begin(), Args.end()); II->setCallingConv((yyvsp[(2) - (14)].UIntVal)); + II->setParamAttrs(PAL); (yyval.TermInstVal) = II; delete (yyvsp[(6) - (14)].ParamList); CHECK_FOR_ERROR @@ -5699,7 +5679,7 @@ break; case 276: -#line 2693 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2660 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TermInstVal) = new UnwindInst(); CHECK_FOR_ERROR @@ -5707,7 +5687,7 @@ break; case 277: -#line 2697 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2664 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TermInstVal) = new UnreachableInst(); CHECK_FOR_ERROR @@ -5715,7 +5695,7 @@ break; case 278: -#line 2704 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2671 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.JumpTable) = (yyvsp[(1) - (6)].JumpTable); Constant *V = cast(getExistingVal((yyvsp[(2) - (6)].PrimType), (yyvsp[(3) - (6)].ValIDVal))); @@ -5730,7 +5710,7 @@ break; case 279: -#line 2715 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2682 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.JumpTable) = new std::vector >(); Constant *V = cast(getExistingVal((yyvsp[(1) - (5)].PrimType), (yyvsp[(2) - (5)].ValIDVal))); @@ -5746,7 +5726,7 @@ break; case 280: -#line 2728 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2695 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Is this definition named?? if so, assign the name... setValueName((yyvsp[(2) - (2)].InstVal), (yyvsp[(1) - (2)].StrVal)); @@ -5758,7 +5738,7 @@ break; case 281: -#line 2738 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2705 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Used for PHI nodes if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (6)].TypeVal))->getDescription()); @@ -5773,7 +5753,7 @@ break; case 282: -#line 2749 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2716 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.PHIList) = (yyvsp[(1) - (7)].PHIList); Value* tmpVal = getVal((yyvsp[(1) - (7)].PHIList)->front().first->getType(), (yyvsp[(4) - (7)].ValIDVal)); @@ -5785,63 +5765,69 @@ break; case 283: -#line 2759 "/llvm/lib/AsmParser/llvmAsmParser.y" - { +#line 2726 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" + { + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription()); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription()); // Used for call and invoke instructions (yyval.ParamList) = new ParamList(); - ParamListEntry E; E.Attrs = (yyvsp[(3) - (3)].ParamAttrs); E.Val = getVal((yyvsp[(1) - (3)].TypeVal)->get(), (yyvsp[(2) - (3)].ValIDVal)); + ParamListEntry E; E.Attrs = (yyvsp[(2) - (4)].ParamAttrs) | (yyvsp[(4) - (4)].ParamAttrs); E.Val = getVal((yyvsp[(1) - (4)].TypeVal)->get(), (yyvsp[(3) - (4)].ValIDVal)); (yyval.ParamList)->push_back(E); - delete (yyvsp[(1) - (3)].TypeVal); + delete (yyvsp[(1) - (4)].TypeVal); + CHECK_FOR_ERROR ;} break; case 284: -#line 2768 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2737 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 // Labels are only valid in ASMs (yyval.ParamList) = new ParamList(); - ParamListEntry E; E.Attrs = (yyvsp[(3) - (3)].ParamAttrs); E.Val = getBBVal((yyvsp[(2) - (3)].ValIDVal)); + ParamListEntry E; E.Attrs = (yyvsp[(2) - (4)].ParamAttrs) | (yyvsp[(4) - (4)].ParamAttrs); E.Val = getBBVal((yyvsp[(3) - (4)].ValIDVal)); (yyval.ParamList)->push_back(E); + CHECK_FOR_ERROR ;} break; case 285: -#line 2774 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2745 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription()); - (yyval.ParamList) = (yyvsp[(1) - (5)].ParamList); - ParamListEntry E; E.Attrs = (yyvsp[(5) - (5)].ParamAttrs); E.Val = getVal((yyvsp[(3) - (5)].TypeVal)->get(), (yyvsp[(4) - (5)].ValIDVal)); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription()); + (yyval.ParamList) = (yyvsp[(1) - (6)].ParamList); + ParamListEntry E; E.Attrs = (yyvsp[(4) - (6)].ParamAttrs) | (yyvsp[(6) - (6)].ParamAttrs); E.Val = getVal((yyvsp[(3) - (6)].TypeVal)->get(), (yyvsp[(5) - (6)].ValIDVal)); (yyval.ParamList)->push_back(E); - delete (yyvsp[(3) - (5)].TypeVal); + delete (yyvsp[(3) - (6)].TypeVal); CHECK_FOR_ERROR ;} break; case 286: -#line 2783 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2755 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.ParamList) = (yyvsp[(1) - (5)].ParamList); - ParamListEntry E; E.Attrs = (yyvsp[(5) - (5)].ParamAttrs); E.Val = getBBVal((yyvsp[(4) - (5)].ValIDVal)); + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 + (yyval.ParamList) = (yyvsp[(1) - (6)].ParamList); + ParamListEntry E; E.Attrs = (yyvsp[(4) - (6)].ParamAttrs) | (yyvsp[(6) - (6)].ParamAttrs); E.Val = getBBVal((yyvsp[(5) - (6)].ValIDVal)); (yyval.ParamList)->push_back(E); CHECK_FOR_ERROR ;} break; case 287: -#line 2789 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2762 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamList) = new ParamList(); ;} break; case 288: -#line 2792 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2765 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ValueList) = new std::vector(); ;} break; case 289: -#line 2793 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2766 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ValueList) = (yyvsp[(1) - (3)].ValueList); (yyval.ValueList)->push_back((yyvsp[(3) - (3)].ValueVal)); @@ -5850,7 +5836,7 @@ break; case 290: -#line 2800 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2773 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = true; CHECK_FOR_ERROR @@ -5858,7 +5844,7 @@ break; case 291: -#line 2804 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2777 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = false; CHECK_FOR_ERROR @@ -5866,7 +5852,7 @@ break; case 292: -#line 2809 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2782 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription()); @@ -5886,7 +5872,7 @@ break; case 293: -#line 2825 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2798 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription()); @@ -5907,7 +5893,7 @@ break; case 294: -#line 2842 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2815 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription()); @@ -5925,7 +5911,7 @@ break; case 295: -#line 2856 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2829 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription()); @@ -5943,7 +5929,7 @@ break; case 296: -#line 2870 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2843 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription()); @@ -5959,7 +5945,7 @@ break; case 297: -#line 2882 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2855 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[(2) - (6)].ValueVal)->getType() != Type::Int1Ty) GEN_ERROR("select condition must be boolean"); @@ -5971,7 +5957,7 @@ break; case 298: -#line 2890 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2863 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription()); @@ -5982,7 +5968,7 @@ break; case 299: -#line 2897 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2870 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!ExtractElementInst::isValidOperands((yyvsp[(2) - (4)].ValueVal), (yyvsp[(4) - (4)].ValueVal))) GEN_ERROR("Invalid extractelement operands"); @@ -5992,7 +5978,7 @@ break; case 300: -#line 2903 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2876 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!InsertElementInst::isValidOperands((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal))) GEN_ERROR("Invalid insertelement operands"); @@ -6002,7 +5988,7 @@ break; case 301: -#line 2909 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2882 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!ShuffleVectorInst::isValidOperands((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal))) GEN_ERROR("Invalid shufflevector operands"); @@ -6012,7 +5998,7 @@ break; case 302: -#line 2915 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2888 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { const Type *Ty = (yyvsp[(2) - (2)].PHIList)->front().first->getType(); if (!Ty->isFirstClassType()) @@ -6031,7 +6017,7 @@ break; case 303: -#line 2931 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2904 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Handle the short syntax @@ -6041,29 +6027,14 @@ !(Ty = dyn_cast(PFTy->getElementType()))) { // Pull out the types of all of the arguments... std::vector ParamTypes; - ParamAttrsVector Attrs; - if ((yyvsp[(8) - (8)].ParamAttrs) != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = (yyvsp[(8) - (8)].ParamAttrs); - Attrs.push_back(PAWI); - } - unsigned index = 1; ParamList::iterator I = (yyvsp[(6) - (8)].ParamList)->begin(), E = (yyvsp[(6) - (8)].ParamList)->end(); - for (; I != E; ++I, ++index) { + for (; I != E; ++I) { const Type *Ty = I->Val->getType(); if (Ty == Type::VoidTy) GEN_ERROR("Short call syntax cannot be used with varargs"); ParamTypes.push_back(Ty); - if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = index; PAWI.attrs = I->Attrs; - Attrs.push_back(PAWI); - } } - - ParamAttrsList *PAL = 0; - if (!Attrs.empty()) - PAL = ParamAttrsList::get(Attrs); - - Ty = FunctionType::get((yyvsp[(3) - (8)].TypeVal)->get(), ParamTypes, false, PAL); + Ty = FunctionType::get((yyvsp[(3) - (8)].TypeVal)->get(), ParamTypes, false); PFTy = PointerType::get(Ty); } @@ -6079,6 +6050,14 @@ theF->getName() + "'"); } + // Set up the ParamAttrs for the function + ParamAttrsVector Attrs; + if ((yyvsp[(8) - (8)].ParamAttrs) != ParamAttr::None) { + ParamAttrsWithIndex PAWI; + PAWI.index = 0; + PAWI.attrs = (yyvsp[(8) - (8)].ParamAttrs); + Attrs.push_back(PAWI); + } // Check the arguments ValueList Args; if ((yyvsp[(6) - (8)].ParamList)->empty()) { // Has no arguments? @@ -6088,17 +6067,23 @@ "expects arguments"); } else { // Has arguments? // Loop through FunctionType's arguments and ensure they are specified - // correctly! - // + // correctly. Also, gather any parameter attributes. FunctionType::param_iterator I = Ty->param_begin(); FunctionType::param_iterator E = Ty->param_end(); ParamList::iterator ArgI = (yyvsp[(6) - (8)].ParamList)->begin(), ArgE = (yyvsp[(6) - (8)].ParamList)->end(); + unsigned index = 1; - for (; ArgI != ArgE && I != E; ++ArgI, ++I) { + for (; ArgI != ArgE && I != E; ++ArgI, ++I, ++index) { if (ArgI->Val->getType() != *I) GEN_ERROR("Parameter " + ArgI->Val->getName()+ " is not of type '" + (*I)->getDescription() + "'"); Args.push_back(ArgI->Val); + if (ArgI->Attrs != ParamAttr::None) { + ParamAttrsWithIndex PAWI; + PAWI.index = index; + PAWI.attrs = ArgI->Attrs; + Attrs.push_back(PAWI); + } } if (Ty->isVarArg()) { if (I == E) @@ -6107,10 +6092,17 @@ } else if (I != E || ArgI != ArgE) GEN_ERROR("Invalid number of parameters detected"); } + + // Finish off the ParamAttrs and check them + ParamAttrsList *PAL = 0; + if (!Attrs.empty()) + PAL = ParamAttrsList::get(Attrs); + // Create the call node CallInst *CI = new CallInst(V, Args.begin(), Args.end()); CI->setTailCall((yyvsp[(1) - (8)].BoolVal)); CI->setCallingConv((yyvsp[(2) - (8)].UIntVal)); + CI->setParamAttrs(PAL); (yyval.InstVal) = CI; delete (yyvsp[(6) - (8)].ParamList); delete (yyvsp[(3) - (8)].TypeVal); @@ -6119,7 +6111,7 @@ break; case 304: -#line 3015 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2994 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.InstVal) = (yyvsp[(1) - (1)].InstVal); CHECK_FOR_ERROR @@ -6127,7 +6119,7 @@ break; case 305: -#line 3020 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2999 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = true; CHECK_FOR_ERROR @@ -6135,7 +6127,7 @@ break; case 306: -#line 3024 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3003 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = false; CHECK_FOR_ERROR @@ -6143,7 +6135,7 @@ break; case 307: -#line 3031 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3010 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription()); @@ -6154,7 +6146,7 @@ break; case 308: -#line 3038 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3017 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription()); @@ -6166,7 +6158,7 @@ break; case 309: -#line 3046 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3025 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription()); @@ -6177,7 +6169,7 @@ break; case 310: -#line 3053 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3032 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription()); @@ -6189,7 +6181,7 @@ break; case 311: -#line 3061 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3040 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!isa((yyvsp[(2) - (2)].ValueVal)->getType())) GEN_ERROR("Trying to free nonpointer type " + @@ -6200,7 +6192,7 @@ break; case 312: -#line 3069 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3048 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription()); @@ -6218,7 +6210,7 @@ break; case 313: -#line 3083 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3062 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (7)].TypeVal))->getDescription()); @@ -6239,7 +6231,7 @@ break; case 314: -#line 3100 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3079 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription()); @@ -6259,7 +6251,7 @@ /* Line 1267 of yacc.c. */ -#line 6263 "llvmAsmParser.tab.c" +#line 6255 "llvmAsmParser.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -6473,18 +6465,12 @@ } -#line 3117 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3096 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" // common code from the two 'RunVMAsmParser' functions static Module* RunParser(Module * M) { - - llvmAsmlineno = 1; // Reset the current line number... CurModule.CurrentModule = M; -#if YYDEBUG - yydebug = Debug; -#endif - // Check to make sure the parser succeeded if (yyparse()) { if (ParserResult) @@ -6536,21 +6522,21 @@ } void llvm::GenerateError(const std::string &message, int LineNo) { - if (LineNo == -1) LineNo = llvmAsmlineno; + if (LineNo == -1) LineNo = LLLgetLineNo(); // TODO: column number in exception if (TheParseError) - TheParseError->setError(CurFilename, message, LineNo); + TheParseError->setError(LLLgetFilename(), message, LineNo); TriggerError = 1; } int yyerror(const char *ErrorMsg) { - std::string where - = std::string((CurFilename == "-") ? std::string("") : CurFilename) - + ":" + utostr((unsigned) llvmAsmlineno) + ": "; + std::string where = LLLgetFilename() + ":" + utostr(LLLgetLineNo()) + ": "; std::string errMsg = where + "error: " + std::string(ErrorMsg); - if (yychar != YYEMPTY && yychar != 0) - errMsg += " while reading token: '" + std::string(llvmAsmtext, llvmAsmleng)+ - "'"; + if (yychar != YYEMPTY && yychar != 0) { + errMsg += " while reading token: '"; + errMsg += std::string(LLLgetTokenStart(), + LLLgetTokenStart()+LLLgetTokenLength()) + "'"; + } GenerateError(errMsg); return 0; } Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs (original) +++ llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs Tue Nov 27 07:23:08 2007 @@ -179,8 +179,8 @@ NOALIAS = 395, BYVAL = 396, NEST = 397, - CONST = 398, - PURE = 399, + READNONE = 398, + READONLY = 399, DEFAULT = 400, HIDDEN = 401, PROTECTED = 402 @@ -327,8 +327,8 @@ #define NOALIAS 395 #define BYVAL 396 #define NEST 397 -#define CONST 398 -#define PURE 399 +#define READNONE 398 +#define READONLY 399 #define DEFAULT 400 #define HIDDEN 401 #define PROTECTED 402 @@ -338,7 +338,7 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 968 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 945 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { llvm::Module *ModuleVal; llvm::Function *FunctionVal; @@ -385,7 +385,7 @@ llvm::ICmpInst::Predicate IPredicate; llvm::FCmpInst::Predicate FPredicate; } -/* Line 1529 of yacc.c. */ +/* Line 1489 of yacc.c. */ #line 390 "llvmAsmParser.tab.h" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.y URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.y?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/AsmParser/llvmAsmParser.y (original) +++ llvm/trunk/lib/AsmParser/llvmAsmParser.y Tue Nov 27 07:23:08 2007 @@ -1328,61 +1328,36 @@ CHECK_FOR_ERROR } | Types '(' ArgTypeListI ')' OptFuncAttrs { + // Allow but ignore attributes on function types; this permits auto-upgrade. + // FIXME: remove in LLVM 3.0. std::vector Params; - ParamAttrsVector Attrs; - if ($5 != ParamAttr::None) { - ParamAttrsWithIndex X; X.index = 0; X.attrs = $5; - Attrs.push_back(X); - } - unsigned index = 1; TypeWithAttrsList::iterator I = $3->begin(), E = $3->end(); - for (; I != E; ++I, ++index) { + for (; I != E; ++I ) { const Type *Ty = I->Ty->get(); Params.push_back(Ty); - if (Ty != Type::VoidTy) - if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex X; X.index = index; X.attrs = I->Attrs; - Attrs.push_back(X); - } } bool isVarArg = Params.size() && Params.back() == Type::VoidTy; if (isVarArg) Params.pop_back(); - ParamAttrsList *ActualAttrs = 0; - if (!Attrs.empty()) - ActualAttrs = ParamAttrsList::get(Attrs); - FunctionType *FT = FunctionType::get(*$1, Params, isVarArg, ActualAttrs); + FunctionType *FT = FunctionType::get(*$1, Params, isVarArg); delete $3; // Delete the argument list delete $1; // Delete the return type handle $$ = new PATypeHolder(HandleUpRefs(FT)); CHECK_FOR_ERROR } | VOID '(' ArgTypeListI ')' OptFuncAttrs { + // Allow but ignore attributes on function types; this permits auto-upgrade. + // FIXME: remove in LLVM 3.0. std::vector Params; - ParamAttrsVector Attrs; - if ($5 != ParamAttr::None) { - ParamAttrsWithIndex X; X.index = 0; X.attrs = $5; - Attrs.push_back(X); - } TypeWithAttrsList::iterator I = $3->begin(), E = $3->end(); - unsigned index = 1; - for ( ; I != E; ++I, ++index) { + for ( ; I != E; ++I ) { const Type* Ty = I->Ty->get(); Params.push_back(Ty); - if (Ty != Type::VoidTy) - if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex X; X.index = index; X.attrs = I->Attrs; - Attrs.push_back(X); - } } bool isVarArg = Params.size() && Params.back() == Type::VoidTy; if (isVarArg) Params.pop_back(); - ParamAttrsList *ActualAttrs = 0; - if (!Attrs.empty()) - ActualAttrs = ParamAttrsList::get(Attrs); - - FunctionType *FT = FunctionType::get($1, Params, isVarArg, ActualAttrs); + FunctionType *FT = FunctionType::get($1, Params, isVarArg); delete $3; // Delete the argument list $$ = new PATypeHolder(HandleUpRefs(FT)); CHECK_FOR_ERROR @@ -1434,9 +1409,11 @@ ; ArgType - : Types OptParamAttrs { + : Types OptParamAttrs { + // Allow but ignore attributes on function types; this permits auto-upgrade. + // FIXME: remove in LLVM 3.0. $$.Ty = $1; - $$.Attrs = $2; + $$.Attrs = ParamAttr::None; } ; @@ -2241,7 +2218,9 @@ std::vector ParamTypeList; ParamAttrsVector Attrs; if ($7 != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = $7; + ParamAttrsWithIndex PAWI; + PAWI.index = 0; + PAWI.attrs = $7; Attrs.push_back(PAWI); } if ($5) { // If there are arguments... @@ -2253,7 +2232,9 @@ ParamTypeList.push_back(Ty); if (Ty != Type::VoidTy) if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = index; PAWI.attrs = I->Attrs; + ParamAttrsWithIndex PAWI; + PAWI.index = index; + PAWI.attrs = I->Attrs; Attrs.push_back(PAWI); } } @@ -2266,7 +2247,7 @@ if (!Attrs.empty()) PAL = ParamAttrsList::get(Attrs); - FunctionType *FT = FunctionType::get(*$2, ParamTypeList, isVarArg, PAL); + FunctionType *FT = FunctionType::get(*$2, ParamTypeList, isVarArg); const PointerType *PFT = PointerType::get(FT); delete $2; @@ -2283,19 +2264,24 @@ // Move the function to the end of the list, from whereever it was // previously inserted. Fn = cast(FWRef); + assert(!Fn->getParamAttrs() && "Forward reference has parameter attributes!"); CurModule.CurrentModule->getFunctionList().remove(Fn); CurModule.CurrentModule->getFunctionList().push_back(Fn); } else if (!FunctionName.empty() && // Merge with an earlier prototype? (Fn = CurModule.CurrentModule->getFunction(FunctionName))) { - if (Fn->getFunctionType() != FT) { + if (Fn->getFunctionType() != FT ) { // The existing function doesn't have the same type. This is an overload // error. GEN_ERROR("Overload of function '" + FunctionName + "' not permitted."); + } else if (Fn->getParamAttrs() != PAL) { + // The existing function doesn't have the same parameter attributes. + // This is an overload error. + GEN_ERROR("Overload of function '" + FunctionName + "' not permitted."); } else if (!CurFun.isDeclare && !Fn->isDeclaration()) { // Neither the existing or the current function is a declaration and they // have the same name and same type. Clearly this is a redefinition. GEN_ERROR("Redefinition of function '" + FunctionName + "'"); - } if (Fn->isDeclaration()) { + } else if (Fn->isDeclaration()) { // Make sure to strip off any argument names so we can't get conflicts. for (Function::arg_iterator AI = Fn->arg_begin(), AE = Fn->arg_end(); AI != AE; ++AI) @@ -2304,7 +2290,6 @@ } else { // Not already defined? Fn = new Function(FT, GlobalValue::ExternalWeakLinkage, FunctionName, CurModule.CurrentModule); - InsertValue(Fn, CurModule.Values); } @@ -2318,6 +2303,7 @@ Fn->setVisibility(CurFun.Visibility); } Fn->setCallingConv($1); + Fn->setParamAttrs(PAL); Fn->setAlignment($9); if ($8) { Fn->setSection(*$8); @@ -2597,28 +2583,14 @@ !(Ty = dyn_cast(PFTy->getElementType()))) { // Pull out the types of all of the arguments... std::vector ParamTypes; - ParamAttrsVector Attrs; - if ($8 != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = $8; - Attrs.push_back(PAWI); - } ParamList::iterator I = $6->begin(), E = $6->end(); - unsigned index = 1; - for (; I != E; ++I, ++index) { + for (; I != E; ++I) { const Type *Ty = I->Val->getType(); if (Ty == Type::VoidTy) GEN_ERROR("Short call syntax cannot be used with varargs"); ParamTypes.push_back(Ty); - if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = index; PAWI.attrs = I->Attrs; - Attrs.push_back(PAWI); - } } - - ParamAttrsList *PAL = 0; - if (!Attrs.empty()) - PAL = ParamAttrsList::get(Attrs); - Ty = FunctionType::get($3->get(), ParamTypes, false, PAL); + Ty = FunctionType::get($3->get(), ParamTypes, false); PFTy = PointerType::get(Ty); } @@ -2631,6 +2603,12 @@ BasicBlock *Except = getBBVal($14); CHECK_FOR_ERROR + ParamAttrsVector Attrs; + if ($8 != ParamAttr::None) { + ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = $8; + Attrs.push_back(PAWI); + } + // Check the arguments ValueList Args; if ($6->empty()) { // Has no arguments? @@ -2644,12 +2622,19 @@ FunctionType::param_iterator I = Ty->param_begin(); FunctionType::param_iterator E = Ty->param_end(); ParamList::iterator ArgI = $6->begin(), ArgE = $6->end(); + unsigned index = 1; - for (; ArgI != ArgE && I != E; ++ArgI, ++I) { + for (; ArgI != ArgE && I != E; ++ArgI, ++I, ++index) { if (ArgI->Val->getType() != *I) GEN_ERROR("Parameter " + ArgI->Val->getName()+ " is not of type '" + (*I)->getDescription() + "'"); Args.push_back(ArgI->Val); + if (ArgI->Attrs != ParamAttr::None) { + ParamAttrsWithIndex PAWI; + PAWI.index = index; + PAWI.attrs = ArgI->Attrs; + Attrs.push_back(PAWI); + } } if (Ty->isVarArg()) { @@ -2660,9 +2645,14 @@ GEN_ERROR("Invalid number of parameters detected"); } + ParamAttrsList *PAL = 0; + if (!Attrs.empty()) + PAL = ParamAttrsList::get(Attrs); + // Create the InvokeInst InvokeInst *II = new InvokeInst(V, Normal, Except, Args.begin(), Args.end()); II->setCallingConv($2); + II->setParamAttrs(PAL); $$ = II; delete $6; CHECK_FOR_ERROR @@ -2733,33 +2723,39 @@ }; -ParamList : Types ValueRef OptParamAttrs { +ParamList : Types OptParamAttrs ValueRef OptParamAttrs { + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription()); // Used for call and invoke instructions $$ = new ParamList(); - ParamListEntry E; E.Attrs = $3; E.Val = getVal($1->get(), $2); + ParamListEntry E; E.Attrs = $2 | $4; E.Val = getVal($1->get(), $3); $$->push_back(E); delete $1; + CHECK_FOR_ERROR } - | LABEL ValueRef OptParamAttrs { + | LABEL OptParamAttrs ValueRef OptParamAttrs { + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 // Labels are only valid in ASMs $$ = new ParamList(); - ParamListEntry E; E.Attrs = $3; E.Val = getBBVal($2); + ParamListEntry E; E.Attrs = $2 | $4; E.Val = getBBVal($3); $$->push_back(E); + CHECK_FOR_ERROR } - | ParamList ',' Types ValueRef OptParamAttrs { + | ParamList ',' Types OptParamAttrs ValueRef OptParamAttrs { + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*$3)->getDescription()); $$ = $1; - ParamListEntry E; E.Attrs = $5; E.Val = getVal($3->get(), $4); + ParamListEntry E; E.Attrs = $4 | $6; E.Val = getVal($3->get(), $5); $$->push_back(E); delete $3; CHECK_FOR_ERROR } - | ParamList ',' LABEL ValueRef OptParamAttrs { + | ParamList ',' LABEL OptParamAttrs ValueRef OptParamAttrs { + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 $$ = $1; - ParamListEntry E; E.Attrs = $5; E.Val = getBBVal($4); + ParamListEntry E; E.Attrs = $4 | $6; E.Val = getBBVal($5); $$->push_back(E); CHECK_FOR_ERROR } @@ -2914,29 +2910,14 @@ !(Ty = dyn_cast(PFTy->getElementType()))) { // Pull out the types of all of the arguments... std::vector ParamTypes; - ParamAttrsVector Attrs; - if ($8 != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = $8; - Attrs.push_back(PAWI); - } - unsigned index = 1; ParamList::iterator I = $6->begin(), E = $6->end(); - for (; I != E; ++I, ++index) { + for (; I != E; ++I) { const Type *Ty = I->Val->getType(); if (Ty == Type::VoidTy) GEN_ERROR("Short call syntax cannot be used with varargs"); ParamTypes.push_back(Ty); - if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = index; PAWI.attrs = I->Attrs; - Attrs.push_back(PAWI); - } } - - ParamAttrsList *PAL = 0; - if (!Attrs.empty()) - PAL = ParamAttrsList::get(Attrs); - - Ty = FunctionType::get($3->get(), ParamTypes, false, PAL); + Ty = FunctionType::get($3->get(), ParamTypes, false); PFTy = PointerType::get(Ty); } @@ -2952,6 +2933,14 @@ theF->getName() + "'"); } + // Set up the ParamAttrs for the function + ParamAttrsVector Attrs; + if ($8 != ParamAttr::None) { + ParamAttrsWithIndex PAWI; + PAWI.index = 0; + PAWI.attrs = $8; + Attrs.push_back(PAWI); + } // Check the arguments ValueList Args; if ($6->empty()) { // Has no arguments? @@ -2961,17 +2950,23 @@ "expects arguments"); } else { // Has arguments? // Loop through FunctionType's arguments and ensure they are specified - // correctly! - // + // correctly. Also, gather any parameter attributes. FunctionType::param_iterator I = Ty->param_begin(); FunctionType::param_iterator E = Ty->param_end(); ParamList::iterator ArgI = $6->begin(), ArgE = $6->end(); + unsigned index = 1; - for (; ArgI != ArgE && I != E; ++ArgI, ++I) { + for (; ArgI != ArgE && I != E; ++ArgI, ++I, ++index) { if (ArgI->Val->getType() != *I) GEN_ERROR("Parameter " + ArgI->Val->getName()+ " is not of type '" + (*I)->getDescription() + "'"); Args.push_back(ArgI->Val); + if (ArgI->Attrs != ParamAttr::None) { + ParamAttrsWithIndex PAWI; + PAWI.index = index; + PAWI.attrs = ArgI->Attrs; + Attrs.push_back(PAWI); + } } if (Ty->isVarArg()) { if (I == E) @@ -2980,10 +2975,17 @@ } else if (I != E || ArgI != ArgE) GEN_ERROR("Invalid number of parameters detected"); } + + // Finish off the ParamAttrs and check them + ParamAttrsList *PAL = 0; + if (!Attrs.empty()) + PAL = ParamAttrsList::get(Attrs); + // Create the call node CallInst *CI = new CallInst(V, Args.begin(), Args.end()); CI->setTailCall($1); CI->setCallingConv($2); + CI->setParamAttrs(PAL); $$ = CI; delete $6; delete $3; Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs (original) +++ llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs Tue Nov 27 07:23:08 2007 @@ -29,9 +29,6 @@ #include #include #include -#ifndef NDEBUG -#define YYDEBUG 1 -#endif // The following is a gross hack. In order to rid the libAsmParser library of // exceptions, we have to have a way of getting the yyparse function to go into @@ -51,15 +48,6 @@ int yyerror(const char *ErrorMsg); // Forward declarations to prevent "implicit int yylex(); // declaration" of xxx warnings. int yyparse(); - -namespace llvm { - std::string CurFilename; -#if YYDEBUG -static cl::opt -Debug("debug-yacc", cl::desc("Print yacc debug state changes"), - cl::Hidden, cl::init(false)); -#endif -} using namespace llvm; static Module *ParserResult; @@ -513,7 +501,7 @@ // Remember where this forward reference came from. FIXME, shouldn't we try // to recycle these things?? CurModule.PlaceHolderInfo.insert(std::make_pair(V, std::make_pair(ID, - llvmAsmlineno))); + LLLgetLineNo()))); if (inFunctionScope()) InsertValue(V, CurFun.LateResolveValues); @@ -945,22 +933,11 @@ // static Module* RunParser(Module * M); -Module *llvm::RunVMAsmParser(const std::string &Filename, FILE *F) { - set_scan_file(F); - - CurFilename = Filename; - return RunParser(new Module(CurFilename)); -} - -Module *llvm::RunVMAsmParser(const char * AsmString, Module * M) { - set_scan_string(AsmString); - - CurFilename = "from_memory"; - if (M == NULL) { - return RunParser(new Module (CurFilename)); - } else { - return RunParser(M); - } +Module *llvm::RunVMAsmParser(llvm::MemoryBuffer *MB) { + InitLLLexer(MB); + Module *M = RunParser(new Module(LLLgetFilename())); + FreeLexer(); + return M; } %} @@ -1113,7 +1090,7 @@ // Function Attributes %token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS BYVAL NEST -%token CONST PURE +%token READNONE READONLY // Visibility Styles %token DEFAULT HIDDEN PROTECTED @@ -1257,8 +1234,8 @@ | NOUNWIND { $$ = ParamAttr::NoUnwind; } | ZEROEXT { $$ = ParamAttr::ZExt; } | SIGNEXT { $$ = ParamAttr::SExt; } - | PURE { $$ = ParamAttr::Pure; } - | CONST { $$ = ParamAttr::Const; } + | READNONE { $$ = ParamAttr::ReadNone; } + | READONLY { $$ = ParamAttr::ReadOnly; } ; OptFuncAttrs : /* empty */ { $$ = ParamAttr::None; } @@ -1351,61 +1328,36 @@ CHECK_FOR_ERROR } | Types '(' ArgTypeListI ')' OptFuncAttrs { + // Allow but ignore attributes on function types; this permits auto-upgrade. + // FIXME: remove in LLVM 3.0. std::vector Params; - ParamAttrsVector Attrs; - if ($5 != ParamAttr::None) { - ParamAttrsWithIndex X; X.index = 0; X.attrs = $5; - Attrs.push_back(X); - } - unsigned index = 1; TypeWithAttrsList::iterator I = $3->begin(), E = $3->end(); - for (; I != E; ++I, ++index) { + for (; I != E; ++I ) { const Type *Ty = I->Ty->get(); Params.push_back(Ty); - if (Ty != Type::VoidTy) - if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex X; X.index = index; X.attrs = I->Attrs; - Attrs.push_back(X); - } } bool isVarArg = Params.size() && Params.back() == Type::VoidTy; if (isVarArg) Params.pop_back(); - ParamAttrsList *ActualAttrs = 0; - if (!Attrs.empty()) - ActualAttrs = ParamAttrsList::get(Attrs); - FunctionType *FT = FunctionType::get(*$1, Params, isVarArg, ActualAttrs); + FunctionType *FT = FunctionType::get(*$1, Params, isVarArg); delete $3; // Delete the argument list delete $1; // Delete the return type handle $$ = new PATypeHolder(HandleUpRefs(FT)); CHECK_FOR_ERROR } | VOID '(' ArgTypeListI ')' OptFuncAttrs { + // Allow but ignore attributes on function types; this permits auto-upgrade. + // FIXME: remove in LLVM 3.0. std::vector Params; - ParamAttrsVector Attrs; - if ($5 != ParamAttr::None) { - ParamAttrsWithIndex X; X.index = 0; X.attrs = $5; - Attrs.push_back(X); - } TypeWithAttrsList::iterator I = $3->begin(), E = $3->end(); - unsigned index = 1; - for ( ; I != E; ++I, ++index) { + for ( ; I != E; ++I ) { const Type* Ty = I->Ty->get(); Params.push_back(Ty); - if (Ty != Type::VoidTy) - if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex X; X.index = index; X.attrs = I->Attrs; - Attrs.push_back(X); - } } bool isVarArg = Params.size() && Params.back() == Type::VoidTy; if (isVarArg) Params.pop_back(); - ParamAttrsList *ActualAttrs = 0; - if (!Attrs.empty()) - ActualAttrs = ParamAttrsList::get(Attrs); - - FunctionType *FT = FunctionType::get($1, Params, isVarArg, ActualAttrs); + FunctionType *FT = FunctionType::get($1, Params, isVarArg); delete $3; // Delete the argument list $$ = new PATypeHolder(HandleUpRefs(FT)); CHECK_FOR_ERROR @@ -1457,9 +1409,11 @@ ; ArgType - : Types OptParamAttrs { + : Types OptParamAttrs { + // Allow but ignore attributes on function types; this permits auto-upgrade. + // FIXME: remove in LLVM 3.0. $$.Ty = $1; - $$.Attrs = $2; + $$.Attrs = ParamAttr::None; } ; @@ -2264,7 +2218,9 @@ std::vector ParamTypeList; ParamAttrsVector Attrs; if ($7 != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = $7; + ParamAttrsWithIndex PAWI; + PAWI.index = 0; + PAWI.attrs = $7; Attrs.push_back(PAWI); } if ($5) { // If there are arguments... @@ -2276,7 +2232,9 @@ ParamTypeList.push_back(Ty); if (Ty != Type::VoidTy) if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = index; PAWI.attrs = I->Attrs; + ParamAttrsWithIndex PAWI; + PAWI.index = index; + PAWI.attrs = I->Attrs; Attrs.push_back(PAWI); } } @@ -2289,7 +2247,7 @@ if (!Attrs.empty()) PAL = ParamAttrsList::get(Attrs); - FunctionType *FT = FunctionType::get(*$2, ParamTypeList, isVarArg, PAL); + FunctionType *FT = FunctionType::get(*$2, ParamTypeList, isVarArg); const PointerType *PFT = PointerType::get(FT); delete $2; @@ -2306,19 +2264,24 @@ // Move the function to the end of the list, from whereever it was // previously inserted. Fn = cast(FWRef); + assert(!Fn->getParamAttrs() && "Forward reference has parameter attributes!"); CurModule.CurrentModule->getFunctionList().remove(Fn); CurModule.CurrentModule->getFunctionList().push_back(Fn); } else if (!FunctionName.empty() && // Merge with an earlier prototype? (Fn = CurModule.CurrentModule->getFunction(FunctionName))) { - if (Fn->getFunctionType() != FT) { + if (Fn->getFunctionType() != FT ) { // The existing function doesn't have the same type. This is an overload // error. GEN_ERROR("Overload of function '" + FunctionName + "' not permitted."); + } else if (Fn->getParamAttrs() != PAL) { + // The existing function doesn't have the same parameter attributes. + // This is an overload error. + GEN_ERROR("Overload of function '" + FunctionName + "' not permitted."); } else if (!CurFun.isDeclare && !Fn->isDeclaration()) { // Neither the existing or the current function is a declaration and they // have the same name and same type. Clearly this is a redefinition. GEN_ERROR("Redefinition of function '" + FunctionName + "'"); - } if (Fn->isDeclaration()) { + } else if (Fn->isDeclaration()) { // Make sure to strip off any argument names so we can't get conflicts. for (Function::arg_iterator AI = Fn->arg_begin(), AE = Fn->arg_end(); AI != AE; ++AI) @@ -2327,7 +2290,6 @@ } else { // Not already defined? Fn = new Function(FT, GlobalValue::ExternalWeakLinkage, FunctionName, CurModule.CurrentModule); - InsertValue(Fn, CurModule.Values); } @@ -2341,6 +2303,7 @@ Fn->setVisibility(CurFun.Visibility); } Fn->setCallingConv($1); + Fn->setParamAttrs(PAL); Fn->setAlignment($9); if ($8) { Fn->setSection(*$8); @@ -2620,28 +2583,14 @@ !(Ty = dyn_cast(PFTy->getElementType()))) { // Pull out the types of all of the arguments... std::vector ParamTypes; - ParamAttrsVector Attrs; - if ($8 != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = $8; - Attrs.push_back(PAWI); - } ParamList::iterator I = $6->begin(), E = $6->end(); - unsigned index = 1; - for (; I != E; ++I, ++index) { + for (; I != E; ++I) { const Type *Ty = I->Val->getType(); if (Ty == Type::VoidTy) GEN_ERROR("Short call syntax cannot be used with varargs"); ParamTypes.push_back(Ty); - if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = index; PAWI.attrs = I->Attrs; - Attrs.push_back(PAWI); - } } - - ParamAttrsList *PAL = 0; - if (!Attrs.empty()) - PAL = ParamAttrsList::get(Attrs); - Ty = FunctionType::get($3->get(), ParamTypes, false, PAL); + Ty = FunctionType::get($3->get(), ParamTypes, false); PFTy = PointerType::get(Ty); } @@ -2654,6 +2603,12 @@ BasicBlock *Except = getBBVal($14); CHECK_FOR_ERROR + ParamAttrsVector Attrs; + if ($8 != ParamAttr::None) { + ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = $8; + Attrs.push_back(PAWI); + } + // Check the arguments ValueList Args; if ($6->empty()) { // Has no arguments? @@ -2667,12 +2622,19 @@ FunctionType::param_iterator I = Ty->param_begin(); FunctionType::param_iterator E = Ty->param_end(); ParamList::iterator ArgI = $6->begin(), ArgE = $6->end(); + unsigned index = 1; - for (; ArgI != ArgE && I != E; ++ArgI, ++I) { + for (; ArgI != ArgE && I != E; ++ArgI, ++I, ++index) { if (ArgI->Val->getType() != *I) GEN_ERROR("Parameter " + ArgI->Val->getName()+ " is not of type '" + (*I)->getDescription() + "'"); Args.push_back(ArgI->Val); + if (ArgI->Attrs != ParamAttr::None) { + ParamAttrsWithIndex PAWI; + PAWI.index = index; + PAWI.attrs = ArgI->Attrs; + Attrs.push_back(PAWI); + } } if (Ty->isVarArg()) { @@ -2683,9 +2645,14 @@ GEN_ERROR("Invalid number of parameters detected"); } + ParamAttrsList *PAL = 0; + if (!Attrs.empty()) + PAL = ParamAttrsList::get(Attrs); + // Create the InvokeInst InvokeInst *II = new InvokeInst(V, Normal, Except, Args.begin(), Args.end()); II->setCallingConv($2); + II->setParamAttrs(PAL); $$ = II; delete $6; CHECK_FOR_ERROR @@ -2756,33 +2723,39 @@ }; -ParamList : Types ValueRef OptParamAttrs { +ParamList : Types OptParamAttrs ValueRef OptParamAttrs { + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription()); // Used for call and invoke instructions $$ = new ParamList(); - ParamListEntry E; E.Attrs = $3; E.Val = getVal($1->get(), $2); + ParamListEntry E; E.Attrs = $2 | $4; E.Val = getVal($1->get(), $3); $$->push_back(E); delete $1; + CHECK_FOR_ERROR } - | LABEL ValueRef OptParamAttrs { + | LABEL OptParamAttrs ValueRef OptParamAttrs { + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 // Labels are only valid in ASMs $$ = new ParamList(); - ParamListEntry E; E.Attrs = $3; E.Val = getBBVal($2); + ParamListEntry E; E.Attrs = $2 | $4; E.Val = getBBVal($3); $$->push_back(E); + CHECK_FOR_ERROR } - | ParamList ',' Types ValueRef OptParamAttrs { + | ParamList ',' Types OptParamAttrs ValueRef OptParamAttrs { + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*$3)->getDescription()); $$ = $1; - ParamListEntry E; E.Attrs = $5; E.Val = getVal($3->get(), $4); + ParamListEntry E; E.Attrs = $4 | $6; E.Val = getVal($3->get(), $5); $$->push_back(E); delete $3; CHECK_FOR_ERROR } - | ParamList ',' LABEL ValueRef OptParamAttrs { + | ParamList ',' LABEL OptParamAttrs ValueRef OptParamAttrs { + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 $$ = $1; - ParamListEntry E; E.Attrs = $5; E.Val = getBBVal($4); + ParamListEntry E; E.Attrs = $4 | $6; E.Val = getBBVal($5); $$->push_back(E); CHECK_FOR_ERROR } @@ -2937,29 +2910,14 @@ !(Ty = dyn_cast(PFTy->getElementType()))) { // Pull out the types of all of the arguments... std::vector ParamTypes; - ParamAttrsVector Attrs; - if ($8 != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = $8; - Attrs.push_back(PAWI); - } - unsigned index = 1; ParamList::iterator I = $6->begin(), E = $6->end(); - for (; I != E; ++I, ++index) { + for (; I != E; ++I) { const Type *Ty = I->Val->getType(); if (Ty == Type::VoidTy) GEN_ERROR("Short call syntax cannot be used with varargs"); ParamTypes.push_back(Ty); - if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = index; PAWI.attrs = I->Attrs; - Attrs.push_back(PAWI); - } } - - ParamAttrsList *PAL = 0; - if (!Attrs.empty()) - PAL = ParamAttrsList::get(Attrs); - - Ty = FunctionType::get($3->get(), ParamTypes, false, PAL); + Ty = FunctionType::get($3->get(), ParamTypes, false); PFTy = PointerType::get(Ty); } @@ -2975,6 +2933,14 @@ theF->getName() + "'"); } + // Set up the ParamAttrs for the function + ParamAttrsVector Attrs; + if ($8 != ParamAttr::None) { + ParamAttrsWithIndex PAWI; + PAWI.index = 0; + PAWI.attrs = $8; + Attrs.push_back(PAWI); + } // Check the arguments ValueList Args; if ($6->empty()) { // Has no arguments? @@ -2984,17 +2950,23 @@ "expects arguments"); } else { // Has arguments? // Loop through FunctionType's arguments and ensure they are specified - // correctly! - // + // correctly. Also, gather any parameter attributes. FunctionType::param_iterator I = Ty->param_begin(); FunctionType::param_iterator E = Ty->param_end(); ParamList::iterator ArgI = $6->begin(), ArgE = $6->end(); + unsigned index = 1; - for (; ArgI != ArgE && I != E; ++ArgI, ++I) { + for (; ArgI != ArgE && I != E; ++ArgI, ++I, ++index) { if (ArgI->Val->getType() != *I) GEN_ERROR("Parameter " + ArgI->Val->getName()+ " is not of type '" + (*I)->getDescription() + "'"); Args.push_back(ArgI->Val); + if (ArgI->Attrs != ParamAttr::None) { + ParamAttrsWithIndex PAWI; + PAWI.index = index; + PAWI.attrs = ArgI->Attrs; + Attrs.push_back(PAWI); + } } if (Ty->isVarArg()) { if (I == E) @@ -3003,10 +2975,17 @@ } else if (I != E || ArgI != ArgE) GEN_ERROR("Invalid number of parameters detected"); } + + // Finish off the ParamAttrs and check them + ParamAttrsList *PAL = 0; + if (!Attrs.empty()) + PAL = ParamAttrsList::get(Attrs); + // Create the call node CallInst *CI = new CallInst(V, Args.begin(), Args.end()); CI->setTailCall($1); CI->setCallingConv($2); + CI->setParamAttrs(PAL); $$ = CI; delete $6; delete $3; @@ -3118,13 +3097,7 @@ // common code from the two 'RunVMAsmParser' functions static Module* RunParser(Module * M) { - - llvmAsmlineno = 1; // Reset the current line number... CurModule.CurrentModule = M; -#if YYDEBUG - yydebug = Debug; -#endif - // Check to make sure the parser succeeded if (yyparse()) { if (ParserResult) @@ -3176,21 +3149,21 @@ } void llvm::GenerateError(const std::string &message, int LineNo) { - if (LineNo == -1) LineNo = llvmAsmlineno; + if (LineNo == -1) LineNo = LLLgetLineNo(); // TODO: column number in exception if (TheParseError) - TheParseError->setError(CurFilename, message, LineNo); + TheParseError->setError(LLLgetFilename(), message, LineNo); TriggerError = 1; } int yyerror(const char *ErrorMsg) { - std::string where - = std::string((CurFilename == "-") ? std::string("") : CurFilename) - + ":" + utostr((unsigned) llvmAsmlineno) + ": "; + std::string where = LLLgetFilename() + ":" + utostr(LLLgetLineNo()) + ": "; std::string errMsg = where + "error: " + std::string(ErrorMsg); - if (yychar != YYEMPTY && yychar != 0) - errMsg += " while reading token: '" + std::string(llvmAsmtext, llvmAsmleng)+ - "'"; + if (yychar != YYEMPTY && yychar != 0) { + errMsg += " while reading token: '"; + errMsg += std::string(LLLgetTokenStart(), + LLLgetTokenStart()+LLLgetTokenLength()) + "'"; + } GenerateError(errMsg); return 0; } Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp (original) +++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp Tue Nov 27 07:23:08 2007 @@ -329,15 +329,15 @@ ResultTy = PointerType::get(getTypeByID(Record[0], true)); break; case bitc::TYPE_CODE_FUNCTION: { - // FUNCTION: [vararg, attrid, retty, paramty x N] - if (Record.size() < 3) + // FUNCTION: [vararg, retty, paramty x N] + if (Record.size() < 2) return Error("Invalid FUNCTION type record"); std::vector ArgTys; - for (unsigned i = 3, e = Record.size(); i != e; ++i) + for (unsigned i = 2, e = Record.size(); i != e; ++i) ArgTys.push_back(getTypeByID(Record[i], true)); - ResultTy = FunctionType::get(getTypeByID(Record[2], true), ArgTys, - Record[0], getParamAttrs(Record[1])); + ResultTy = FunctionType::get(getTypeByID(Record[1], true), ArgTys, + Record[0]); break; } case bitc::TYPE_CODE_STRUCT: { // STRUCT: [ispacked, eltty x N] @@ -1033,9 +1033,8 @@ Func->setCallingConv(Record[1]); bool isProto = Record[2]; Func->setLinkage(GetDecodedLinkage(Record[3])); - - assert(Func->getFunctionType()->getParamAttrs() == - getParamAttrs(Record[4])); + const ParamAttrsList *PAL = getParamAttrs(Record[4]); + Func->setParamAttrs(PAL); Func->setAlignment((1 << Record[5]) >> 1); if (Record[6]) { @@ -1360,8 +1359,10 @@ break; } - case bitc::FUNC_CODE_INST_INVOKE: { // INVOKE: [cc,fnty, op0,op1,op2, ...] + case bitc::FUNC_CODE_INST_INVOKE: { + // INVOKE: [attrs, cc, normBB, unwindBB, fnty, op0,op1,op2, ...] if (Record.size() < 4) return Error("Invalid INVOKE record"); + const ParamAttrsList *PAL = getParamAttrs(Record[0]); unsigned CCInfo = Record[1]; BasicBlock *NormalBB = getBasicBlock(Record[2]); BasicBlock *UnwindBB = getBasicBlock(Record[3]); @@ -1380,8 +1381,6 @@ Record.size() < OpNum+FTy->getNumParams()) return Error("Invalid INVOKE record"); - assert(FTy->getParamAttrs() == getParamAttrs(Record[0])); - SmallVector Ops; for (unsigned i = 0, e = FTy->getNumParams(); i != e; ++i, ++OpNum) { Ops.push_back(getFnValueByID(Record[OpNum], FTy->getParamType(i))); @@ -1403,6 +1402,7 @@ I = new InvokeInst(Callee, NormalBB, UnwindBB, Ops.begin(), Ops.end()); cast(I)->setCallingConv(CCInfo); + cast(I)->setParamAttrs(PAL); break; } case bitc::FUNC_CODE_INST_UNWIND: // UNWIND @@ -1482,10 +1482,12 @@ I = new StoreInst(Val, Ptr, Record[OpNum+1], (1 << Record[OpNum]) >> 1); break; } - case bitc::FUNC_CODE_INST_CALL: { // CALL: [cc, fnty, fnid, arg0, arg1...] - if (Record.size() < 2) + case bitc::FUNC_CODE_INST_CALL: { + // CALL: [paramattrs, cc, fnty, fnid, arg0, arg1...] + if (Record.size() < 3) return Error("Invalid CALL record"); + const ParamAttrsList *PAL = getParamAttrs(Record[0]); unsigned CCInfo = Record[1]; unsigned OpNum = 2; @@ -1499,8 +1501,6 @@ if (!FTy || Record.size() < FTy->getNumParams()+OpNum) return Error("Invalid CALL record"); - assert(FTy->getParamAttrs() == getParamAttrs(Record[0])); - SmallVector Args; // Read the fixed params. for (unsigned i = 0, e = FTy->getNumParams(); i != e; ++i, ++OpNum) { @@ -1527,6 +1527,7 @@ I = new CallInst(Callee, Args.begin(), Args.end()); cast(I)->setCallingConv(CCInfo>>1); cast(I)->setTailCall(CCInfo & 1); + cast(I)->setParamAttrs(PAL); break; } case bitc::FUNC_CODE_INST_VAARG: { // VAARG: [valistty, valist, instty] Modified: llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp (original) +++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Tue Nov 27 07:23:08 2007 @@ -147,8 +147,6 @@ Abbv = new BitCodeAbbrev(); Abbv->Add(BitCodeAbbrevOp(bitc::TYPE_CODE_FUNCTION)); Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 1)); // isvararg - Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, - Log2_32_Ceil(VE.getParamAttrs().size()+1))); Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Array)); Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, Log2_32_Ceil(VE.getTypes().size()+1))); @@ -206,10 +204,9 @@ case Type::FunctionTyID: { const FunctionType *FT = cast(T); - // FUNCTION: [isvararg, attrid, retty, paramty x N] + // FUNCTION: [isvararg, retty, paramty x N] Code = bitc::TYPE_CODE_FUNCTION; TypeVals.push_back(FT->isVarArg()); - TypeVals.push_back(VE.getParamAttrID(FT->getParamAttrs())); TypeVals.push_back(VE.getTypeID(FT->getReturnType())); for (unsigned i = 0, e = FT->getNumParams(); i != e; ++i) TypeVals.push_back(VE.getTypeID(FT->getParamType(i))); @@ -383,18 +380,13 @@ // Emit the function proto information. for (Module::const_iterator F = M->begin(), E = M->end(); F != E; ++F) { - // FUNCTION: [type, callingconv, isproto, linkage, alignment, section, - // visibility] + // FUNCTION: [type, callingconv, isproto, paramattr, + // linkage, alignment, section, visibility] Vals.push_back(VE.getTypeID(F->getType())); Vals.push_back(F->getCallingConv()); Vals.push_back(F->isDeclaration()); Vals.push_back(getEncodedLinkage(F)); - - // Note: we emit the param attr ID number for the function type of this - // function. In the future, we intend for attrs to be properties of - // functions, instead of on the type. This is to support this future work. - Vals.push_back(VE.getParamAttrID(F->getFunctionType()->getParamAttrs())); - + Vals.push_back(VE.getParamAttrID(F->getParamAttrs())); Vals.push_back(Log2_32(F->getAlignment())+1); Vals.push_back(F->hasSection() ? SectionMap[F->getSection()] : 0); Vals.push_back(getEncodedVisibility(F)); @@ -760,12 +752,9 @@ const FunctionType *FTy = cast(PTy->getElementType()); Code = bitc::FUNC_CODE_INST_INVOKE; - // Note: we emit the param attr ID number for the function type of this - // function. In the future, we intend for attrs to be properties of - // functions, instead of on the type. This is to support this future work. - Vals.push_back(VE.getParamAttrID(FTy->getParamAttrs())); - - Vals.push_back(cast(I).getCallingConv()); + const InvokeInst *II = cast(&I); + Vals.push_back(VE.getParamAttrID(II->getParamAttrs())); + Vals.push_back(II->getCallingConv()); Vals.push_back(VE.getValueID(I.getOperand(1))); // normal dest Vals.push_back(VE.getValueID(I.getOperand(2))); // unwind dest PushValueAndType(I.getOperand(0), InstID, Vals, VE); // callee @@ -837,14 +826,10 @@ Code = bitc::FUNC_CODE_INST_CALL; - // Note: we emit the param attr ID number for the function type of this - // function. In the future, we intend for attrs to be properties of - // functions, instead of on the type. This is to support this future work. - Vals.push_back(VE.getParamAttrID(FTy->getParamAttrs())); - - Vals.push_back((cast(I).getCallingConv() << 1) | - unsigned(cast(I).isTailCall())); - PushValueAndType(I.getOperand(0), InstID, Vals, VE); // Callee + const CallInst *CI = cast(&I); + Vals.push_back(VE.getParamAttrID(CI->getParamAttrs())); + Vals.push_back((CI->getCallingConv() << 1) | unsigned(CI->isTailCall())); + PushValueAndType(CI->getOperand(0), InstID, Vals, VE); // Callee // Emit value #'s for the fixed parameters. for (unsigned i = 0, e = FTy->getNumParams(); i != e; ++i) Modified: llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.cpp (original) +++ llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.cpp Tue Nov 27 07:23:08 2007 @@ -17,6 +17,7 @@ #include "llvm/Module.h" #include "llvm/TypeSymbolTable.h" #include "llvm/ValueSymbolTable.h" +#include "llvm/Instructions.h" #include using namespace llvm; @@ -44,8 +45,10 @@ EnumerateValue(I); // Enumerate the functions. - for (Module::const_iterator I = M->begin(), E = M->end(); I != E; ++I) + for (Module::const_iterator I = M->begin(), E = M->end(); I != E; ++I) { EnumerateValue(I); + EnumerateParamAttrs(cast(I)->getParamAttrs()); + } // Enumerate the aliases. for (Module::const_alias_iterator I = M->alias_begin(), E = M->alias_end(); @@ -86,6 +89,10 @@ OI != E; ++OI) EnumerateOperandType(*OI); EnumerateType(I->getType()); + if (const CallInst *CI = dyn_cast(I)) + EnumerateParamAttrs(CI->getParamAttrs()); + else if (const InvokeInst *II = dyn_cast(I)) + EnumerateParamAttrs(II->getParamAttrs()); } } @@ -220,10 +227,6 @@ for (Type::subtype_iterator I = Ty->subtype_begin(), E = Ty->subtype_end(); I != E; ++I) EnumerateType(*I); - - // If this is a function type, enumerate the param attrs. - if (const FunctionType *FTy = dyn_cast(Ty)) - EnumerateParamAttrs(FTy->getParamAttrs()); } // Enumerate the types for the specified value. If the value is a constant, @@ -296,6 +299,10 @@ // Optimize the constant layout. OptimizeConstants(FirstFuncConstantID, Values.size()); + // Add the function's parameter attributes so they are available for use in + // the function's instruction. + EnumerateParamAttrs(F.getParamAttrs()); + FirstInstID = Values.size(); // Add all of the instructions. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Tue Nov 27 07:23:08 2007 @@ -499,11 +499,11 @@ unsigned Opc); bool isExportableFromCurrentBlock(Value *V, const BasicBlock *FromBB); void ExportFromCurrentBlock(Value *V); - void LowerCallTo(Instruction &I, - const Type *CalledValueTy, unsigned CallingConv, + void LowerCallTo(Instruction &I, const Type *CalledValueTy, + const ParamAttrsList *PAL, unsigned CallingConv, bool IsTailCall, SDOperand Callee, unsigned OpIdx, MachineBasicBlock *LandingPad = NULL); - + // Terminator instructions. void visitRet(ReturnInst &I); void visitBr(BranchInst &I); @@ -934,12 +934,11 @@ TmpVT = TLI.getTypeToTransformTo(MVT::i32); else TmpVT = MVT::i32; - const FunctionType *FTy = I.getParent()->getParent()->getFunctionType(); - const ParamAttrsList *Attrs = FTy->getParamAttrs(); + const ParamAttrsList *PAL = I.getParent()->getParent()->getParamAttrs(); ISD::NodeType ExtendKind = ISD::ANY_EXTEND; - if (Attrs && Attrs->paramHasAttr(0, ParamAttr::SExt)) + if (PAL && PAL->paramHasAttr(0, ParamAttr::SExt)) ExtendKind = ISD::SIGN_EXTEND; - if (Attrs && Attrs->paramHasAttr(0, ParamAttr::ZExt)) + if (PAL && PAL->paramHasAttr(0, ParamAttr::ZExt)) ExtendKind = ISD::ZERO_EXTEND; RetOp = DAG.getNode(ExtendKind, TmpVT, RetOp); NewValues.push_back(RetOp); @@ -1450,7 +1449,7 @@ MachineBasicBlock *Return = FuncInfo.MBBMap[I.getSuccessor(0)]; MachineBasicBlock *LandingPad = FuncInfo.MBBMap[I.getSuccessor(1)]; - LowerCallTo(I, I.getCalledValue()->getType(), + LowerCallTo(I, I.getCalledValue()->getType(), I.getParamAttrs(), I.getCallingConv(), false, getValue(I.getOperand(0)), @@ -2940,13 +2939,13 @@ void SelectionDAGLowering::LowerCallTo(Instruction &I, const Type *CalledValueTy, + const ParamAttrsList *Attrs, unsigned CallingConv, bool IsTailCall, SDOperand Callee, unsigned OpIdx, MachineBasicBlock *LandingPad) { const PointerType *PT = cast(CalledValueTy); const FunctionType *FTy = cast(PT->getElementType()); - const ParamAttrsList *Attrs = FTy->getParamAttrs(); MachineModuleInfo *MMI = DAG.getMachineModuleInfo(); unsigned BeginLabel = 0, EndLabel = 0; @@ -3073,7 +3072,7 @@ else Callee = DAG.getExternalSymbol(RenameFn, TLI.getPointerTy()); - LowerCallTo(I, I.getCalledValue()->getType(), + LowerCallTo(I, I.getCalledValue()->getType(), I.getParamAttrs(), I.getCallingConv(), I.isTailCall(), Callee, @@ -3893,8 +3892,7 @@ /// integrated into SDISel. std::vector TargetLowering::LowerArguments(Function &F, SelectionDAG &DAG) { - const FunctionType *FTy = F.getFunctionType(); - const ParamAttrsList *Attrs = FTy->getParamAttrs(); + const ParamAttrsList *Attrs = F.getParamAttrs(); // Add CC# and isVararg as operands to the FORMAL_ARGUMENTS node. std::vector Ops; Ops.push_back(DAG.getRoot()); Modified: llvm/trunk/lib/Linker/LinkModules.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Linker/LinkModules.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/Linker/LinkModules.cpp (original) +++ llvm/trunk/lib/Linker/LinkModules.cpp Tue Nov 27 07:23:08 2007 @@ -358,6 +358,7 @@ if (const Function *SrcF = dyn_cast(SrcGV)) { Function *DestF = cast(DestGV); DestF->setCallingConv(SrcF->getCallingConv()); + DestF->setParamAttrs(SrcF->getParamAttrs()); } } Modified: llvm/trunk/lib/Target/CBackend/CBackend.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CBackend/CBackend.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/Target/CBackend/CBackend.cpp (original) +++ llvm/trunk/lib/Target/CBackend/CBackend.cpp Tue Nov 27 07:23:08 2007 @@ -126,12 +126,14 @@ std::ostream &printType(std::ostream &Out, const Type *Ty, bool isSigned = false, const std::string &VariableName = "", - bool IgnoreName = false); + bool IgnoreName = false, + const ParamAttrsList *PAL = 0); std::ostream &printSimpleType(std::ostream &Out, const Type *Ty, bool isSigned, const std::string &NameSoFar = ""); void printStructReturnPointerFunctionType(std::ostream &Out, + const ParamAttrsList *PAL, const PointerType *Ty); void writeOperand(Value *Operand); @@ -353,6 +355,7 @@ /// return type, except, instead of printing the type as void (*)(Struct*, ...) /// print it as "Struct (*)(...)", for struct return functions. void CWriter::printStructReturnPointerFunctionType(std::ostream &Out, + const ParamAttrsList *PAL, const PointerType *TheTy) { const FunctionType *FTy = cast(TheTy->getElementType()); std::stringstream FunctionInnards; @@ -362,12 +365,11 @@ FunctionType::param_iterator I = FTy->param_begin(), E = FTy->param_end(); const Type *RetTy = cast(I->get())->getElementType(); unsigned Idx = 1; - const ParamAttrsList *Attrs = FTy->getParamAttrs(); for (++I; I != E; ++I) { if (PrintedType) FunctionInnards << ", "; printType(FunctionInnards, *I, - /*isSigned=*/Attrs && Attrs->paramHasAttr(Idx, ParamAttr::SExt), ""); + /*isSigned=*/PAL && PAL->paramHasAttr(Idx, ParamAttr::SExt), ""); PrintedType = true; } if (FTy->isVarArg()) { @@ -379,7 +381,7 @@ FunctionInnards << ')'; std::string tstr = FunctionInnards.str(); printType(Out, RetTy, - /*isSigned=*/Attrs && Attrs->paramHasAttr(0, ParamAttr::SExt), tstr); + /*isSigned=*/PAL && PAL->paramHasAttr(0, ParamAttr::SExt), tstr); } std::ostream & @@ -422,7 +424,7 @@ // std::ostream &CWriter::printType(std::ostream &Out, const Type *Ty, bool isSigned, const std::string &NameSoFar, - bool IgnoreName) { + bool IgnoreName, const ParamAttrsList* PAL) { if (Ty->isPrimitiveType() || Ty->isInteger()) { printSimpleType(Out, Ty, isSigned, NameSoFar); return Out; @@ -439,14 +441,13 @@ const FunctionType *FTy = cast(Ty); std::stringstream FunctionInnards; FunctionInnards << " (" << NameSoFar << ") ("; - const ParamAttrsList *Attrs = FTy->getParamAttrs(); unsigned Idx = 1; for (FunctionType::param_iterator I = FTy->param_begin(), E = FTy->param_end(); I != E; ++I) { if (I != FTy->param_begin()) FunctionInnards << ", "; - printType(FunctionInnards, *I, - /*isSigned=*/Attrs && Attrs->paramHasAttr(Idx, ParamAttr::SExt), ""); + printType(FunctionInnards, *I, + /*isSigned=*/PAL && PAL->paramHasAttr(Idx, ParamAttr::SExt), ""); ++Idx; } if (FTy->isVarArg()) { @@ -458,7 +459,7 @@ FunctionInnards << ')'; std::string tstr = FunctionInnards.str(); printType(Out, FTy->getReturnType(), - /*isSigned=*/Attrs && Attrs->paramHasAttr(0, ParamAttr::SExt), tstr); + /*isSigned=*/PAL && PAL->paramHasAttr(0, ParamAttr::SExt), tstr); return Out; } case Type::StructTyID: { @@ -1836,7 +1837,7 @@ void CWriter::printFunctionSignature(const Function *F, bool Prototype) { /// isStructReturn - Should this function actually return a struct by-value? - bool isStructReturn = F->getFunctionType()->isStructReturn(); + bool isStructReturn = F->isStructReturn(); if (F->hasInternalLinkage()) Out << "static "; if (F->hasDLLImportLinkage()) Out << "__declspec(dllimport) "; @@ -1852,7 +1853,7 @@ // Loop over the arguments, printing them... const FunctionType *FT = cast(F->getFunctionType()); - const ParamAttrsList *Attrs = FT->getParamAttrs(); + const ParamAttrsList *PAL = F->getParamAttrs(); std::stringstream FunctionInnards; @@ -1880,7 +1881,7 @@ else ArgName = ""; printType(FunctionInnards, I->getType(), - /*isSigned=*/Attrs && Attrs->paramHasAttr(Idx, ParamAttr::SExt), + /*isSigned=*/PAL && PAL->paramHasAttr(Idx, ParamAttr::SExt), ArgName); PrintedArg = true; ++Idx; @@ -1901,7 +1902,7 @@ for (; I != E; ++I) { if (PrintedArg) FunctionInnards << ", "; printType(FunctionInnards, *I, - /*isSigned=*/Attrs && Attrs->paramHasAttr(Idx, ParamAttr::SExt)); + /*isSigned=*/PAL && PAL->paramHasAttr(Idx, ParamAttr::SExt)); PrintedArg = true; ++Idx; } @@ -1929,7 +1930,7 @@ // Print out the return type and the signature built above. printType(Out, RetTy, - /*isSigned=*/ Attrs && Attrs->paramHasAttr(0, ParamAttr::SExt), + /*isSigned=*/ PAL && PAL->paramHasAttr(0, ParamAttr::SExt), FunctionInnards.str()); } @@ -1944,7 +1945,7 @@ void CWriter::printFunction(Function &F) { /// isStructReturn - Should this function actually return a struct by-value? - bool isStructReturn = F.getFunctionType()->isStructReturn(); + bool isStructReturn = F.isStructReturn(); printFunctionSignature(&F, false); Out << " {\n"; @@ -2068,8 +2069,7 @@ // void CWriter::visitReturnInst(ReturnInst &I) { // If this is a struct return function, return the temporary struct. - bool isStructReturn = I.getParent()->getParent()-> - getFunctionType()->isStructReturn(); + bool isStructReturn = I.getParent()->getParent()->isStructReturn(); if (isStructReturn) { Out << " return StructReturn;\n"; @@ -2594,7 +2594,8 @@ // If this is a call to a struct-return function, assign to the first // parameter instead of passing it to the call. - bool isStructRet = FTy->isStructReturn(); + const ParamAttrsList *PAL = I.getParamAttrs(); + bool isStructRet = I.isStructReturn(); if (isStructRet) { Out << "*("; writeOperand(I.getOperand(1)); @@ -2633,7 +2634,7 @@ if (!isStructRet) printType(Out, I.getCalledValue()->getType()); else - printStructReturnPointerFunctionType(Out, + printStructReturnPointerFunctionType(Out, PAL, cast(I.getCalledValue()->getType())); Out << ")(void*)"; } @@ -2652,7 +2653,6 @@ ++ArgNo; } - const ParamAttrsList *Attrs = FTy->getParamAttrs(); bool PrintedArg = false; unsigned Idx = 1; for (; AI != AE; ++AI, ++ArgNo, ++Idx) { @@ -2661,7 +2661,7 @@ (*AI)->getType() != FTy->getParamType(ArgNo)) { Out << '('; printType(Out, FTy->getParamType(ArgNo), - /*isSigned=*/Attrs && Attrs->paramHasAttr(Idx, ParamAttr::SExt)); + /*isSigned=*/PAL && PAL->paramHasAttr(Idx, ParamAttr::SExt)); Out << ')'; } writeOperand(*AI); Modified: llvm/trunk/lib/Target/MSIL/MSILWriter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/MSIL/MSILWriter.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/Target/MSIL/MSILWriter.cpp (original) +++ llvm/trunk/lib/Target/MSIL/MSILWriter.cpp Tue Nov 27 07:23:08 2007 @@ -1387,8 +1387,7 @@ void MSILWriter::printFunction(const Function& F) { - const FunctionType* FTy = F.getFunctionType(); - const ParamAttrsList *Attrs = FTy->getParamAttrs(); + const ParamAttrsList *Attrs = F.getParamAttrs(); bool isSigned = Attrs && Attrs->paramHasAttr(0, ParamAttr::SExt); Out << "\n.method static "; Out << (F.hasInternalLinkage() ? "private " : "public "); Modified: llvm/trunk/lib/Target/X86/X86AsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86AsmPrinter.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86AsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/X86/X86AsmPrinter.cpp Tue Nov 27 07:23:08 2007 @@ -93,13 +93,13 @@ case StdCall: // "Pure" variadic functions do not receive @0 suffix. if (!FT->isVarArg() || (FT->getNumParams() == 0) || - (FT->getNumParams() == 1 && FT->isStructReturn())) + (FT->getNumParams() == 1 && F->isStructReturn())) Name += '@' + utostr_32(Info->getBytesToPopOnReturn()); break; case FastCall: // "Pure" variadic functions do not receive @0 suffix. if (!FT->isVarArg() || (FT->getNumParams() == 0) || - (FT->getNumParams() == 1 && FT->isStructReturn())) + (FT->getNumParams() == 1 && F->isStructReturn())) Name += '@' + utostr_32(Info->getBytesToPopOnReturn()); if (Name[0] == '_') { Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original) +++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Tue Nov 27 07:23:08 2007 @@ -4927,7 +4927,7 @@ // Check that ECX wasn't needed by an 'inreg' parameter. const FunctionType *FTy = Func->getFunctionType(); - const ParamAttrsList *Attrs = FTy->getParamAttrs(); + const ParamAttrsList *Attrs = Func->getParamAttrs(); if (Attrs && !Func->isVarArg()) { unsigned InRegCount = 0; Modified: llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp (original) +++ llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp Tue Nov 27 07:23:08 2007 @@ -35,6 +35,7 @@ #include "llvm/Module.h" #include "llvm/CallGraphSCCPass.h" #include "llvm/Instructions.h" +#include "llvm/ParameterAttributes.h" #include "llvm/Analysis/AliasAnalysis.h" #include "llvm/Analysis/CallGraph.h" #include "llvm/Target/TargetData.h" @@ -139,10 +140,10 @@ // No promotable pointer arguments. if (PointerArgs.empty()) return false; - // Okay, promote all of the arguments are rewrite the callees! + // Okay, promote all of the arguments and rewrite the callees! Function *NewF = DoPromotion(F, PointerArgs); - // Update the call graph to know that the old function is gone. + // Update the call graph to know that the function has been transformed. getAnalysis().changeFunction(F, NewF); return true; } @@ -349,9 +350,23 @@ // what the new GEP/Load instructions we are inserting look like. std::map, LoadInst*> OriginalLoads; - for (Function::arg_iterator I = F->arg_begin(), E = F->arg_end(); I != E; ++I) + // ParamAttrs - Keep track of the parameter attributes for the arguments + // that we are *not* promoting. For the ones that we do promote, the parameter + // attributes are lost + ParamAttrsVector ParamAttrsVec; + const ParamAttrsList *PAL = F->getParamAttrs(); + + unsigned index = 1; + for (Function::arg_iterator I = F->arg_begin(), E = F->arg_end(); I != E; + ++I, ++index) if (!ArgsToPromote.count(I)) { Params.push_back(I->getType()); + if (PAL) { + unsigned attrs = PAL->getParamAttrs(index); + if (attrs) + ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Params.size(), + attrs)); + } } else if (I->use_empty()) { ++NumArgumentsDead; } else { @@ -387,6 +402,13 @@ const Type *RetTy = FTy->getReturnType(); + // Recompute the parameter attributes list based on the new arguments for + // the function. + if (ParamAttrsVec.empty()) + PAL = 0; + else + PAL = ParamAttrsList::get(ParamAttrsVec); + // Work around LLVM bug PR56: the CWriter cannot emit varargs functions which // have zero fixed arguments. bool ExtraArgHack = false; @@ -394,11 +416,14 @@ ExtraArgHack = true; Params.push_back(Type::Int32Ty); } + + // Construct the new function type using the new arguments. FunctionType *NFTy = FunctionType::get(RetTy, Params, FTy->isVarArg()); - // Create the new function body and insert it into the module... + // Create the new function body and insert it into the module... Function *NF = new Function(NFTy, F->getLinkage(), F->getName()); NF->setCallingConv(F->getCallingConv()); + NF->setParamAttrs(PAL); F->getParent()->getFunctionList().insert(F, NF); // Get the alias analysis information that we need to update to reflect our @@ -449,9 +474,11 @@ New = new InvokeInst(NF, II->getNormalDest(), II->getUnwindDest(), Args.begin(), Args.end(), "", Call); cast(New)->setCallingConv(CS.getCallingConv()); + cast(New)->setParamAttrs(PAL); } else { New = new CallInst(NF, Args.begin(), Args.end(), "", Call); cast(New)->setCallingConv(CS.getCallingConv()); + cast(New)->setParamAttrs(PAL); if (cast(Call)->isTailCall()) cast(New)->setTailCall(); } Modified: llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp (original) +++ llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp Tue Nov 27 07:23:08 2007 @@ -26,6 +26,7 @@ #include "llvm/IntrinsicInst.h" #include "llvm/Module.h" #include "llvm/Pass.h" +#include "llvm/ParameterAttributes.h" #include "llvm/Support/CallSite.h" #include "llvm/Support/Debug.h" #include "llvm/ADT/Statistic.h" @@ -157,6 +158,7 @@ // Create the new function body and insert it into the module... Function *NF = new Function(NFTy, Fn.getLinkage()); NF->setCallingConv(Fn.getCallingConv()); + NF->setParamAttrs(Fn.getParamAttrs()); Fn.getParent()->getFunctionList().insert(&Fn, NF); NF->takeName(&Fn); @@ -176,9 +178,11 @@ New = new InvokeInst(NF, II->getNormalDest(), II->getUnwindDest(), Args.begin(), Args.end(), "", Call); cast(New)->setCallingConv(CS.getCallingConv()); + cast(New)->setParamAttrs(NF->getParamAttrs()); } else { New = new CallInst(NF, Args.begin(), Args.end(), "", Call); cast(New)->setCallingConv(CS.getCallingConv()); + cast(New)->setParamAttrs(NF->getParamAttrs()); if (cast(Call)->isTailCall()) cast(New)->setTailCall(); } @@ -233,10 +237,10 @@ // (used in a computation), MaybeLive (only passed as an argument to a call), or // Dead (not used). DAE::Liveness DAE::getArgumentLiveness(const Argument &A) { - const FunctionType *FTy = A.getParent()->getFunctionType(); + const Function *F = A.getParent(); // If this is the return value of a struct function, it's not really dead. - if (FTy->isStructReturn() && &*A.getParent()->arg_begin() == &A) + if (F->isStructReturn() && &*(F->arg_begin()) == &A) return Live; if (A.use_empty()) // First check, directly dead? @@ -488,10 +492,32 @@ const FunctionType *FTy = F->getFunctionType(); std::vector Params; - for (Function::arg_iterator I = F->arg_begin(), E = F->arg_end(); I != E; ++I) - if (!DeadArguments.count(I)) + // Set up to build a new list of parameter attributes + ParamAttrsVector ParamAttrsVec; + const ParamAttrsList *PAL = F->getParamAttrs(); + + // Construct the new parameter list from non-dead arguments. Also construct + // a new set of parameter attributes to correspond. + unsigned index = 1; + for (Function::arg_iterator I = F->arg_begin(), E = F->arg_end(); I != E; + ++I, ++index) + if (!DeadArguments.count(I)) { Params.push_back(I->getType()); + if (PAL) { + uint16_t Attrs = PAL->getParamAttrs(index); + if (Attrs != ParamAttr::None) + ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Params.size(), + Attrs)); + } + } + + // Reconstruct the ParamAttrsList based on the vector we constructed. + if (ParamAttrsVec.empty()) + PAL = 0; + else + PAL = ParamAttrsList::get(ParamAttrsVec); + // Make the function return void if the return value is dead. const Type *RetTy = FTy->getReturnType(); if (DeadRetVal.count(F)) { RetTy = Type::VoidTy; @@ -507,11 +533,13 @@ Params.push_back(Type::Int32Ty); } + // Create the new function type based on the recomputed parameters. FunctionType *NFTy = FunctionType::get(RetTy, Params, FTy->isVarArg()); // Create the new function body and insert it into the module... Function *NF = new Function(NFTy, F->getLinkage()); NF->setCallingConv(F->getCallingConv()); + NF->setParamAttrs(PAL); F->getParent()->getFunctionList().insert(F, NF); NF->takeName(F); @@ -542,9 +570,11 @@ New = new InvokeInst(NF, II->getNormalDest(), II->getUnwindDest(), Args.begin(), Args.end(), "", Call); cast(New)->setCallingConv(CS.getCallingConv()); + cast(New)->setParamAttrs(PAL); } else { New = new CallInst(NF, Args.begin(), Args.end(), "", Call); cast(New)->setCallingConv(CS.getCallingConv()); + cast(New)->setParamAttrs(PAL); if (cast(Call)->isTailCall()) cast(New)->setTailCall(); } Modified: llvm/trunk/lib/Transforms/IPO/ExtractFunction.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/ExtractFunction.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/IPO/ExtractFunction.cpp (original) +++ llvm/trunk/lib/Transforms/IPO/ExtractFunction.cpp Tue Nov 27 07:23:08 2007 @@ -95,6 +95,7 @@ Function *New = new Function(I->getFunctionType(), GlobalValue::ExternalLinkage); New->setCallingConv(I->getCallingConv()); + New->setParamAttrs(I->getParamAttrs()); // If it's not the named function, delete the body of the function I->dropAllReferences(); Modified: llvm/trunk/lib/Transforms/IPO/LowerSetJmp.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/LowerSetJmp.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/IPO/LowerSetJmp.cpp (original) +++ llvm/trunk/lib/Transforms/IPO/LowerSetJmp.cpp Tue Nov 27 07:23:08 2007 @@ -476,6 +476,8 @@ InvokeInst* II = new InvokeInst(CI.getCalledValue(), NewBB, PrelimBBMap[Func], Params.begin(), Params.end(), CI.getName(), Term); + II->setCallingConv(CI.getCallingConv()); + II->setParamAttrs(CI.getParamAttrs()); // Replace the old call inst with the invoke inst and remove the call. CI.replaceAllUsesWith(II); Modified: llvm/trunk/lib/Transforms/IPO/PruneEH.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/PruneEH.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/IPO/PruneEH.cpp (original) +++ llvm/trunk/lib/Transforms/IPO/PruneEH.cpp Tue Nov 27 07:23:08 2007 @@ -156,6 +156,7 @@ Args.begin(), Args.end(), "", II); Call->takeName(II); Call->setCallingConv(II->getCallingConv()); + Call->setParamAttrs(II->getParamAttrs()); // Anything that used the value produced by the invoke instruction // now uses the value produced by the call instruction. Modified: llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp Tue Nov 27 07:23:08 2007 @@ -7994,13 +7994,15 @@ const FunctionType *FT = Callee->getFunctionType(); const Type *OldRetTy = Caller->getType(); - const FunctionType *ActualFT = - cast(cast(CE->getType())->getElementType()); - + const ParamAttrsList* CallerPAL = 0; + if (CallInst *CallerCI = dyn_cast(Caller)) + CallerPAL = CallerCI->getParamAttrs(); + else if (InvokeInst *CallerII = dyn_cast(Caller)) + CallerPAL = CallerII->getParamAttrs(); + // If the parameter attributes are not compatible, don't do the xform. We // don't want to lose an sret attribute or something. - if (!ParamAttrsList::areCompatible(FT->getParamAttrs(), - ActualFT->getParamAttrs())) + if (!ParamAttrsList::areCompatible(CallerPAL, Callee->getParamAttrs())) return false; // Check to see if we are changing the return type... @@ -8135,12 +8137,15 @@ NC = new InvokeInst(Callee, II->getNormalDest(), II->getUnwindDest(), Args.begin(), Args.end(), Caller->getName(), Caller); cast(NC)->setCallingConv(II->getCallingConv()); + cast(NC)->setParamAttrs(CallerPAL); } else { NC = new CallInst(Callee, Args.begin(), Args.end(), Caller->getName(), Caller); - if (cast(Caller)->isTailCall()) + CallInst *CI = cast(Caller); + if (CI->isTailCall()) cast(NC)->setTailCall(); - cast(NC)->setCallingConv(cast(Caller)->getCallingConv()); + cast(NC)->setCallingConv(CI->getCallingConv()); + cast(NC)->setParamAttrs(CallerPAL); } // Insert a cast of the return type as necessary. @@ -8191,7 +8196,7 @@ const PointerType *NestFPTy = cast(NestF->getType()); const FunctionType *NestFTy = cast(NestFPTy->getElementType()); - if (const ParamAttrsList *NestAttrs = NestFTy->getParamAttrs()) { + if (const ParamAttrsList *NestAttrs = NestF->getParamAttrs()) { unsigned NestIdx = 1; const Type *NestTy = 0; uint16_t NestAttr = 0; @@ -8239,7 +8244,7 @@ // Handle this by synthesizing a new function type, equal to FTy // with the chain parameter inserted. Likewise for attributes. - const ParamAttrsList *Attrs = FTy->getParamAttrs(); + const ParamAttrsList *Attrs = CS.getParamAttrs(); std::vector NewTypes; ParamAttrsVector NewAttrs; NewTypes.reserve(FTy->getNumParams()+1); @@ -8280,10 +8285,10 @@ // Replace the trampoline call with a direct call. Let the generic // code sort out any function type mismatches. FunctionType *NewFTy = - FunctionType::get(FTy->getReturnType(), NewTypes, FTy->isVarArg(), - ParamAttrsList::get(NewAttrs)); + FunctionType::get(FTy->getReturnType(), NewTypes, FTy->isVarArg()); Constant *NewCallee = NestF->getType() == PointerType::get(NewFTy) ? NestF : ConstantExpr::getBitCast(NestF, PointerType::get(NewFTy)); + const ParamAttrsList *NewPAL = ParamAttrsList::get(NewAttrs); Instruction *NewCaller; if (InvokeInst *II = dyn_cast(Caller)) { @@ -8292,6 +8297,7 @@ NewArgs.begin(), NewArgs.end(), Caller->getName(), Caller); cast(NewCaller)->setCallingConv(II->getCallingConv()); + cast(NewCaller)->setParamAttrs(NewPAL); } else { NewCaller = new CallInst(NewCallee, NewArgs.begin(), NewArgs.end(), Caller->getName(), Caller); @@ -8299,6 +8305,7 @@ cast(NewCaller)->setTailCall(); cast(NewCaller)-> setCallingConv(cast(Caller)->getCallingConv()); + cast(NewCaller)->setParamAttrs(NewPAL); } if (Caller->getType() != Type::VoidTy && !Caller->use_empty()) Caller->replaceAllUsesWith(NewCaller); Modified: llvm/trunk/lib/Transforms/Scalar/LowerGC.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LowerGC.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/LowerGC.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/LowerGC.cpp Tue Nov 27 07:23:08 2007 @@ -339,6 +339,8 @@ Value *II = new InvokeInst(CI->getCalledValue(), NewBB, Cleanup, Args.begin(), Args.end(), CI->getName(), CBB); + cast(II)->setCallingConv(CI->getCallingConv()); + cast(II)->setParamAttrs(CI->getParamAttrs()); CI->replaceAllUsesWith(II); delete CI; } Modified: llvm/trunk/lib/Transforms/Scalar/SimplifyCFG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/SimplifyCFG.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/SimplifyCFG.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/SimplifyCFG.cpp Tue Nov 27 07:23:08 2007 @@ -96,16 +96,11 @@ if (Attrs->paramHasAttr(0, ParamAttr::NoReturn)) return true; - if (const Function *Callee = CI->getCalledFunction()) { + if (const Function *Callee = CI->getCalledFunction()) if (const ParamAttrsList *Attrs = Callee->getParamAttrs()) if (Attrs->paramHasAttr(0, ParamAttr::NoReturn)) return true; - - const FunctionType *FT = Callee->getFunctionType(); - if (const ParamAttrsList *Attrs = FT->getParamAttrs()) - if (Attrs->paramHasAttr(0, ParamAttr::NoReturn)) - return true; - } + return false; } @@ -115,16 +110,11 @@ if (Attrs->paramHasAttr(0, ParamAttr::NoUnwind)) return true; - if (const Function *Callee = II->getCalledFunction()) { + if (const Function *Callee = II->getCalledFunction()) if (const ParamAttrsList *Attrs = Callee->getParamAttrs()) if (Attrs->paramHasAttr(0, ParamAttr::NoUnwind)) return true; - - const FunctionType *FT = Callee->getFunctionType(); - if (const ParamAttrsList *Attrs = FT->getParamAttrs()) - if (Attrs->paramHasAttr(0, ParamAttr::NoUnwind)) - return true; - } + return false; } Modified: llvm/trunk/lib/Transforms/Utils/CloneFunction.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/CloneFunction.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Utils/CloneFunction.cpp (original) +++ llvm/trunk/lib/Transforms/Utils/CloneFunction.cpp Tue Nov 27 07:23:08 2007 @@ -79,6 +79,9 @@ assert(ValueMap.count(I) && "No mapping from source argument specified!"); #endif + // Clone the parameter attributes + NewFunc->setParamAttrs(OldFunc->getParamAttrs()); + // Loop over all of the basic blocks in the function, cloning them as // appropriate. Note that we save BE this way in order to handle cloning of // recursive functions into themselves. @@ -304,7 +307,7 @@ /// effect of this is to copy significantly less code in cases where (for /// example) a function call with constant arguments is inlined, and those /// constant arguments cause a significant amount of code in the callee to be -/// dead. Since this doesn't produce an exactly copy of the input, it can't be +/// dead. Since this doesn't produce an exact copy of the input, it can't be /// used for things like CloneFunction or CloneModule. void llvm::CloneAndPruneFunctionInto(Function *NewFunc, const Function *OldFunc, DenseMap &ValueMap, Modified: llvm/trunk/lib/Transforms/Utils/CloneModule.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/CloneModule.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Utils/CloneModule.cpp (original) +++ llvm/trunk/lib/Transforms/Utils/CloneModule.cpp Tue Nov 27 07:23:08 2007 @@ -66,6 +66,7 @@ new Function(cast(I->getType()->getElementType()), GlobalValue::ExternalLinkage, I->getName(), New); NF->setCallingConv(I->getCallingConv()); + NF->setParamAttrs(I->getParamAttrs()); ValueMap[I]= NF; } @@ -120,5 +121,3 @@ return New; } - -// vim: sw=2 Modified: llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp (original) +++ llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp Tue Nov 27 07:23:08 2007 @@ -88,6 +88,7 @@ InvokeArgs.begin(), InvokeArgs.end(), CI->getName(), BB->getTerminator()); II->setCallingConv(CI->getCallingConv()); + II->setParamAttrs(CI->getParamAttrs()); // Make sure that anything using the call now uses the invoke! CI->replaceAllUsesWith(II); Modified: llvm/trunk/lib/Transforms/Utils/LowerInvoke.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/LowerInvoke.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Utils/LowerInvoke.cpp (original) +++ llvm/trunk/lib/Transforms/Utils/LowerInvoke.cpp Tue Nov 27 07:23:08 2007 @@ -212,9 +212,10 @@ std::vector CallArgs(II->op_begin()+3, II->op_end()); // Insert a normal call instruction... CallInst *NewCall = new CallInst(II->getCalledValue(), - CallArgs.begin(), CallArgs.end(), "", II); + CallArgs.begin(), CallArgs.end(), "",II); NewCall->takeName(II); NewCall->setCallingConv(II->getCallingConv()); + NewCall->setParamAttrs(II->getParamAttrs()); II->replaceAllUsesWith(NewCall); // Insert an unconditional branch to the normal destination. @@ -273,6 +274,7 @@ II); NewCall->takeName(II); NewCall->setCallingConv(II->getCallingConv()); + NewCall->setParamAttrs(II->getParamAttrs()); II->replaceAllUsesWith(NewCall); // Replace the invoke with an uncond branch. Modified: llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp (original) +++ llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp Tue Nov 27 07:23:08 2007 @@ -1376,6 +1376,7 @@ CallInst *CI = new CallInst(II->getCalledValue(), Args.begin(), Args.end(), II->getName(), BI); CI->setCallingConv(II->getCallingConv()); + CI->setParamAttrs(II->getParamAttrs()); // If the invoke produced a value, the Call now does instead II->replaceAllUsesWith(CI); delete II; @@ -1751,6 +1752,7 @@ Args.begin(), Args.end(), II->getName(), BI); CI->setCallingConv(II->getCallingConv()); + CI->setParamAttrs(II->getParamAttrs()); // If the invoke produced a value, the Call does now instead. II->replaceAllUsesWith(CI); delete II; Modified: llvm/trunk/lib/VMCore/AsmWriter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/AsmWriter.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/AsmWriter.cpp (original) +++ llvm/trunk/lib/VMCore/AsmWriter.cpp Tue Nov 27 07:23:08 2007 @@ -305,28 +305,17 @@ const FunctionType *FTy = cast(Ty); calcTypeName(FTy->getReturnType(), TypeStack, TypeNames, Result); Result += " ("; - unsigned Idx = 1; - const ParamAttrsList *Attrs = FTy->getParamAttrs(); for (FunctionType::param_iterator I = FTy->param_begin(), - E = FTy->param_end(); I != E; ++I) { + E = FTy->param_end(); I != E; ++I) { if (I != FTy->param_begin()) Result += ", "; calcTypeName(*I, TypeStack, TypeNames, Result); - if (Attrs && Attrs->getParamAttrs(Idx) != ParamAttr::None) { - Result += + " "; - Result += Attrs->getParamAttrsTextByIndex(Idx); - } - Idx++; } if (FTy->isVarArg()) { if (FTy->getNumParams()) Result += ", "; Result += "..."; } Result += ")"; - if (Attrs && Attrs->getParamAttrs(0) != ParamAttr::None) { - Result += " "; - Result += Attrs->getParamAttrsTextByIndex(0); - } break; } case Type::StructTyID: { @@ -749,6 +738,7 @@ inline void write(const Type *Ty) { printType(Ty); } void writeOperand(const Value *Op, bool PrintType); + void writeParamOperand(const Value *Operand, uint16_t Attrs); const Module* getModule() { return TheModule; } @@ -789,25 +779,17 @@ else if (const FunctionType *FTy = dyn_cast(Ty)) { printType(FTy->getReturnType()); Out << " ("; - unsigned Idx = 1; - const ParamAttrsList *Attrs = FTy->getParamAttrs(); for (FunctionType::param_iterator I = FTy->param_begin(), E = FTy->param_end(); I != E; ++I) { if (I != FTy->param_begin()) Out << ", "; printType(*I); - if (Attrs && Attrs->getParamAttrs(Idx) != ParamAttr::None) { - Out << " " << Attrs->getParamAttrsTextByIndex(Idx); - } - Idx++; } if (FTy->isVarArg()) { if (FTy->getNumParams()) Out << ", "; Out << "..."; } Out << ')'; - if (Attrs && Attrs->getParamAttrs(0) != ParamAttr::None) - Out << ' ' << Attrs->getParamAttrsTextByIndex(0); } else if (const StructType *STy = dyn_cast(Ty)) { if (STy->isPacked()) Out << '<'; @@ -850,6 +832,20 @@ } } +void AssemblyWriter::writeParamOperand(const Value *Operand, uint16_t Attrs) { + if (Operand == 0) { + Out << ""; + } else { + Out << ' '; + // Print the type + printType(Operand->getType()); + // Print parameter attributes list + if (Attrs != ParamAttr::None) + Out << ' ' << ParamAttrsList::getParamAttrsText(Attrs); + // Print the operand + WriteAsOperandInternal(Out, Operand, TypeNames, &Machine); + } +} void AssemblyWriter::printModule(const Module *M) { if (!M->getModuleIdentifier().empty() && @@ -1066,7 +1062,7 @@ } const FunctionType *FT = F->getFunctionType(); - const ParamAttrsList *Attrs = FT->getParamAttrs(); + const ParamAttrsList *Attrs = F->getParamAttrs(); printType(F->getReturnType()) << ' '; if (!F->getName().empty()) Out << getLLVMName(F->getName(), GlobalPrefix); @@ -1139,6 +1135,7 @@ // Output type... printType(Arg->getType()); + // Output parameter attributes list if (Attrs != ParamAttr::None) Out << ' ' << ParamAttrsList::getParamAttrsText(Attrs); @@ -1295,7 +1292,7 @@ const PointerType *PTy = cast(Operand->getType()); const FunctionType *FTy = cast(PTy->getElementType()); const Type *RetTy = FTy->getReturnType(); - const ParamAttrsList *PAL = FTy->getParamAttrs(); + const ParamAttrsList *PAL = CI->getParamAttrs(); // If possible, print out the short form of the call instruction. We can // only do this if the first argument is a pointer to a nonvararg function, @@ -1313,9 +1310,7 @@ for (unsigned op = 1, Eop = I.getNumOperands(); op < Eop; ++op) { if (op > 1) Out << ','; - writeOperand(I.getOperand(op), true); - if (PAL && PAL->getParamAttrs(op) != ParamAttr::None) - Out << " " << PAL->getParamAttrsTextByIndex(op); + writeParamOperand(I.getOperand(op), PAL ? PAL->getParamAttrs(op) : 0); } Out << " )"; if (PAL && PAL->getParamAttrs(0) != ParamAttr::None) @@ -1324,7 +1319,7 @@ const PointerType *PTy = cast(Operand->getType()); const FunctionType *FTy = cast(PTy->getElementType()); const Type *RetTy = FTy->getReturnType(); - const ParamAttrsList *PAL = FTy->getParamAttrs(); + const ParamAttrsList *PAL = II->getParamAttrs(); // Print the calling convention being used. switch (II->getCallingConv()) { @@ -1353,9 +1348,7 @@ for (unsigned op = 3, Eop = I.getNumOperands(); op < Eop; ++op) { if (op > 3) Out << ','; - writeOperand(I.getOperand(op), true); - if (PAL && PAL->getParamAttrs(op-2) != ParamAttr::None) - Out << " " << PAL->getParamAttrsTextByIndex(op-2); + writeParamOperand(I.getOperand(op), PAL ? PAL->getParamAttrs(op-2) : 0); } Out << " )"; Modified: llvm/trunk/lib/VMCore/AutoUpgrade.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/AutoUpgrade.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/AutoUpgrade.cpp (original) +++ llvm/trunk/lib/VMCore/AutoUpgrade.cpp Tue Nov 27 07:23:08 2007 @@ -127,9 +127,6 @@ Function *F = CI->getCalledFunction(); assert(F && "CallInst has no function associated with it."); - - const FunctionType *FTy = F->getFunctionType(); - const FunctionType *NewFnTy = NewFn->getFunctionType(); switch(NewFn->getIntrinsicID()) { default: assert(0 && "Unknown function for CallInst upgrade."); @@ -149,10 +146,10 @@ // Handle any uses of the old CallInst. if (!CI->use_empty()) { // Check for sign extend parameter attributes on the return values. - bool SrcSExt = NewFnTy->getParamAttrs() && - NewFnTy->getParamAttrs()->paramHasAttr(0,ParamAttr::SExt); - bool DestSExt = FTy->getParamAttrs() && - FTy->getParamAttrs()->paramHasAttr(0,ParamAttr::SExt); + bool SrcSExt = NewFn->getParamAttrs() && + NewFn->getParamAttrs()->paramHasAttr(0,ParamAttr::SExt); + bool DestSExt = F->getParamAttrs() && + F->getParamAttrs()->paramHasAttr(0,ParamAttr::SExt); // Construct an appropriate cast from the new return type to the old. CastInst *RetCast = CastInst::create( Modified: llvm/trunk/lib/VMCore/Function.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Function.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/Function.cpp (original) +++ llvm/trunk/lib/VMCore/Function.cpp Tue Nov 27 07:23:08 2007 @@ -161,7 +161,7 @@ void ParamAttrsList::Profile(FoldingSetNodeID &ID) const { for (unsigned i = 0; i < attrs.size(); ++i) { - unsigned val = attrs[i].attrs << 16 | attrs[i].index; + uint32_t val = uint32_t(attrs[i].attrs) << 16 | attrs[i].index; ID.AddInteger(val); } } @@ -170,7 +170,10 @@ ParamAttrsList * ParamAttrsList::get(const ParamAttrsVector &attrVec) { - assert(!attrVec.empty() && "Illegal to create empty ParamAttrsList"); + // If there are no attributes then return a null ParamAttrsList pointer. + if (attrVec.empty()) + return 0; + #ifndef NDEBUG for (unsigned i = 0, e = attrVec.size(); i < e; ++i) { assert(attrVec[i].attrs != ParamAttr::None @@ -179,15 +182,22 @@ && "Misordered ParamAttrsList!"); } #endif + + // Otherwise, build a key to look up the existing attributes. ParamAttrsList key(attrVec); FoldingSetNodeID ID; key.Profile(ID); void *InsertPos; ParamAttrsList* PAL = ParamAttrsLists->FindNodeOrInsertPos(ID, InsertPos); + + // If we didn't find any existing attributes of the same shape then + // create a new one and insert it. if (!PAL) { PAL = new ParamAttrsList(attrVec); ParamAttrsLists->InsertNode(PAL, InsertPos); } + + // Return the ParamAttrsList that we found or created. return PAL; } @@ -201,8 +211,8 @@ Function::Function(const FunctionType *Ty, LinkageTypes Linkage, const std::string &name, Module *ParentModule) - : GlobalValue(PointerType::get(Ty), Value::FunctionVal, 0, 0, Linkage, name) { - ParamAttrs = 0; + : GlobalValue(PointerType::get(Ty), Value::FunctionVal, 0, 0, Linkage, name), + ParamAttrs(0) { SymTab = new ValueSymbolTable(); assert((getReturnType()->isFirstClassType() ||getReturnType() == Type::VoidTy) @@ -259,16 +269,30 @@ LeakDetector::removeGarbageObject(this); } -void Function::setParamAttrs(ParamAttrsList *attrs) { +void Function::setParamAttrs(const ParamAttrsList *attrs) { + // Avoid deleting the ParamAttrsList if they are setting the + // attributes to the same list. + if (ParamAttrs == attrs) + return; + + // Drop reference on the old ParamAttrsList if (ParamAttrs) ParamAttrs->dropRef(); + // Add reference to the new ParamAttrsList if (attrs) attrs->addRef(); + // Set the new ParamAttrsList. ParamAttrs = attrs; } +bool Function::isStructReturn() const { + if (ParamAttrs) + return ParamAttrs->paramHasAttr(1, ParamAttr::StructRet); + return false; +} + const FunctionType *Function::getFunctionType() const { return cast(getType()->getElementType()); } Modified: llvm/trunk/lib/VMCore/Instructions.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Instructions.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/Instructions.cpp (original) +++ llvm/trunk/lib/VMCore/Instructions.cpp Tue Nov 27 07:23:08 2007 @@ -35,6 +35,18 @@ else cast(I)->setCallingConv(CC); } +const ParamAttrsList* CallSite::getParamAttrs() const { + if (CallInst *CI = dyn_cast(I)) + return CI->getParamAttrs(); + else + return cast(I)->getParamAttrs(); +} +void CallSite::setParamAttrs(const ParamAttrsList *PAL) { + if (CallInst *CI = dyn_cast(I)) + CI->setParamAttrs(PAL); + else + cast(I)->setParamAttrs(PAL); +} @@ -341,8 +353,9 @@ CallInst::CallInst(const CallInst &CI) : Instruction(CI.getType(), Instruction::Call, new Use[CI.getNumOperands()], - CI.getNumOperands()) { - ParamAttrs = 0; + CI.getNumOperands()), + ParamAttrs(0) { + setParamAttrs(CI.getParamAttrs()); SubclassData = CI.SubclassData; Use *OL = OperandList; Use *InOL = CI.OperandList; @@ -350,7 +363,10 @@ OL[i].init(InOL[i], this); } -void CallInst::setParamAttrs(ParamAttrsList *newAttrs) { +void CallInst::setParamAttrs(const ParamAttrsList *newAttrs) { + if (ParamAttrs == newAttrs) + return; + if (ParamAttrs) ParamAttrs->dropRef(); @@ -360,6 +376,12 @@ ParamAttrs = newAttrs; } +bool CallInst::isStructReturn() const { + if (ParamAttrs) + return ParamAttrs->paramHasAttr(1, ParamAttr::StructRet); + return false; +} + //===----------------------------------------------------------------------===// // InvokeInst Implementation //===----------------------------------------------------------------------===// @@ -397,8 +419,9 @@ InvokeInst::InvokeInst(const InvokeInst &II) : TerminatorInst(II.getType(), Instruction::Invoke, - new Use[II.getNumOperands()], II.getNumOperands()) { - ParamAttrs = 0; + new Use[II.getNumOperands()], II.getNumOperands()), + ParamAttrs(0) { + setParamAttrs(II.getParamAttrs()); SubclassData = II.SubclassData; Use *OL = OperandList, *InOL = II.OperandList; for (unsigned i = 0, e = II.getNumOperands(); i != e; ++i) @@ -415,7 +438,10 @@ return setSuccessor(idx, B); } -void InvokeInst::setParamAttrs(ParamAttrsList *newAttrs) { +void InvokeInst::setParamAttrs(const ParamAttrsList *newAttrs) { + if (ParamAttrs == newAttrs) + return; + if (ParamAttrs) ParamAttrs->dropRef(); @@ -425,6 +451,12 @@ ParamAttrs = newAttrs; } +bool InvokeInst::isStructReturn() const { + if (ParamAttrs) + return ParamAttrs->paramHasAttr(1, ParamAttr::StructRet); + return false; +} + //===----------------------------------------------------------------------===// // ReturnInst Implementation //===----------------------------------------------------------------------===// Modified: llvm/trunk/lib/VMCore/Type.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Type.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/Type.cpp (original) +++ llvm/trunk/lib/VMCore/Type.cpp Tue Nov 27 07:23:08 2007 @@ -12,7 +12,6 @@ //===----------------------------------------------------------------------===// #include "llvm/DerivedTypes.h" -#include "llvm/ParameterAttributes.h" #include "llvm/Constants.h" #include "llvm/ADT/DepthFirstIterator.h" #include "llvm/ADT/StringExtras.h" @@ -307,15 +306,10 @@ if (!Result.empty()) Result += " "; Result += getTypeDescription(FTy->getReturnType(), TypeStack) + " ("; - unsigned Idx = 1; - const ParamAttrsList *Attrs = FTy->getParamAttrs(); for (FunctionType::param_iterator I = FTy->param_begin(), - E = FTy->param_end(); I != E; ++I) { + E = FTy->param_end(); I != E; ++I) { if (I != FTy->param_begin()) Result += ", "; - if (Attrs && Attrs->getParamAttrs(Idx) != ParamAttr::None) - Result += Attrs->getParamAttrsTextByIndex(Idx); - Idx++; Result += getTypeDescription(*I, TypeStack); } if (FTy->isVarArg()) { @@ -323,9 +317,6 @@ Result += "..."; } Result += ")"; - if (Attrs && Attrs->getParamAttrs(0) != ParamAttr::None) { - Result += " " + Attrs->getParamAttrsTextByIndex(0); - } break; } case Type::StructTyID: { @@ -444,8 +435,8 @@ FunctionType::FunctionType(const Type *Result, const std::vector &Params, - bool IsVarArgs, const ParamAttrsList *Attrs) - : DerivedType(FunctionTyID), isVarArgs(IsVarArgs), ParamAttrs(Attrs) { + bool IsVarArgs) + : DerivedType(FunctionTyID), isVarArgs(IsVarArgs) { ContainedTys = reinterpret_cast(this+1); NumContainedTys = Params.size() + 1; // + 1 for result type assert((Result->isFirstClassType() || Result == Type::VoidTy || @@ -667,16 +658,7 @@ FTy->getNumParams() != FTy2->getNumParams() || !TypesEqual(FTy->getReturnType(), FTy2->getReturnType(), EqTypes)) return false; - const ParamAttrsList *Attrs1 = FTy->getParamAttrs(); - const ParamAttrsList *Attrs2 = FTy2->getParamAttrs(); - if ((!Attrs1 && Attrs2) || (!Attrs2 && Attrs1) || - (Attrs1 && Attrs2 && (Attrs1->size() != Attrs2->size() || - (Attrs1->getParamAttrs(0) != Attrs2->getParamAttrs(0))))) - return false; - for (unsigned i = 0, e = FTy2->getNumParams(); i != e; ++i) { - if (Attrs1 && Attrs1->getParamAttrs(i+1) != Attrs2->getParamAttrs(i+1)) - return false; if (!TypesEqual(FTy->getParamType(i), FTy2->getParamType(i), EqTypes)) return false; } @@ -1055,12 +1037,10 @@ class FunctionValType { const Type *RetTy; std::vector ArgTypes; - const ParamAttrsList *ParamAttrs; bool isVarArg; public: FunctionValType(const Type *ret, const std::vector &args, - bool IVA, const ParamAttrsList *attrs) - : RetTy(ret), ParamAttrs(attrs), isVarArg(IVA) { + bool isVA) : RetTy(ret), isVarArg(isVA) { for (unsigned i = 0; i < args.size(); ++i) ArgTypes.push_back(args[i]); } @@ -1068,9 +1048,7 @@ static FunctionValType get(const FunctionType *FT); static unsigned hashTypeStructure(const FunctionType *FT) { - unsigned Result = FT->getNumParams()*64 + FT->isVarArg(); - if (FT->getParamAttrs()) - Result += FT->getParamAttrs()->size()*2; + unsigned Result = FT->getNumParams()*2 + FT->isVarArg(); return Result; } @@ -1081,13 +1059,6 @@ if (isVarArg > MTV.isVarArg) return false; if (ArgTypes < MTV.ArgTypes) return true; if (ArgTypes > MTV.ArgTypes) return false; - if (ParamAttrs) - if (MTV.ParamAttrs) - return *ParamAttrs < *MTV.ParamAttrs; - else - return false; - else if (MTV.ParamAttrs) - return true; return false; } }; @@ -1102,18 +1073,15 @@ ParamTypes.reserve(FT->getNumParams()); for (unsigned i = 0, e = FT->getNumParams(); i != e; ++i) ParamTypes.push_back(FT->getParamType(i)); - return FunctionValType(FT->getReturnType(), ParamTypes, FT->isVarArg(), - FT->getParamAttrs()); + return FunctionValType(FT->getReturnType(), ParamTypes, FT->isVarArg()); } // FunctionType::get - The factory function for the FunctionType class... FunctionType *FunctionType::get(const Type *ReturnType, const std::vector &Params, - bool isVarArg, - const ParamAttrsList *Attrs) { - - FunctionValType VT(ReturnType, Params, isVarArg, Attrs); + bool isVarArg) { + FunctionValType VT(ReturnType, Params, isVarArg); FunctionType *FT = FunctionTypes->get(VT); if (FT) { return FT; @@ -1121,7 +1089,7 @@ FT = (FunctionType*) new char[sizeof(FunctionType) + sizeof(PATypeHandle)*(Params.size()+1)]; - new (FT) FunctionType(ReturnType, Params, isVarArg, Attrs); + new (FT) FunctionType(ReturnType, Params, isVarArg); FunctionTypes->add(VT, FT); #ifdef DEBUG_MERGE_TYPES @@ -1130,12 +1098,6 @@ return FT; } -bool FunctionType::isStructReturn() const { - if (ParamAttrs) - return ParamAttrs->paramHasAttr(1, ParamAttr::StructRet); - return false; -} - //===----------------------------------------------------------------------===// // Array Type Factory... // Modified: llvm/trunk/lib/VMCore/Verifier.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Verifier.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/Verifier.cpp (original) +++ llvm/trunk/lib/VMCore/Verifier.cpp Tue Nov 27 07:23:08 2007 @@ -390,12 +390,12 @@ F.getReturnType() == Type::VoidTy, "Functions cannot return aggregate values!", &F); - Assert1(!FT->isStructReturn() || FT->getReturnType() == Type::VoidTy, + Assert1(!F.isStructReturn() || FT->getReturnType() == Type::VoidTy, "Invalid struct-return function!", &F); bool SawSRet = false; - if (const ParamAttrsList *Attrs = FT->getParamAttrs()) { + if (const ParamAttrsList *Attrs = F.getParamAttrs()) { bool SawNest = false; for (unsigned Idx = 0; Idx <= FT->getNumParams(); ++Idx) { @@ -448,7 +448,7 @@ } } - Assert1(SawSRet == FT->isStructReturn(), + Assert1(SawSRet == F.isStructReturn(), "StructReturn function with no sret attribute!", &F); // Check that this function meets the restrictions on this calling convention. Modified: llvm/trunk/test/Assembler/2006-05-26-VarargsCallEncode.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2006-05-26-VarargsCallEncode.ll?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/test/Assembler/2006-05-26-VarargsCallEncode.ll (original) +++ llvm/trunk/test/Assembler/2006-05-26-VarargsCallEncode.ll Tue Nov 27 07:23:08 2007 @@ -1,5 +1,5 @@ ; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | \ -; RUN: grep {tail call void (\{ \}\\* sret} +; RUN: grep {tail call void.*sret null} declare csretcc void %foo({}*, ...) Modified: llvm/trunk/test/Assembler/2007-02-07-UpgradeCSRETCC.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2007-02-07-UpgradeCSRETCC.ll?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/test/Assembler/2007-02-07-UpgradeCSRETCC.ll (original) +++ llvm/trunk/test/Assembler/2007-02-07-UpgradeCSRETCC.ll Tue Nov 27 07:23:08 2007 @@ -1,7 +1,5 @@ -; For PR1187 ; RUN: llvm-upgrade < %s > /dev/null -; XFAIL: * -; Un-XFAIL this when PR1146 is fixed. +; PR1187 %mystruct = type { int, double } %glob = global %mystruct { int 3, double 42.0 } Added: llvm/trunk/test/Assembler/2007-11-26-AttributeOverload.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2007-11-26-AttributeOverload.ll?rev=44359&view=auto ============================================================================== --- llvm/trunk/test/Assembler/2007-11-26-AttributeOverload.ll (added) +++ llvm/trunk/test/Assembler/2007-11-26-AttributeOverload.ll Tue Nov 27 07:23:08 2007 @@ -0,0 +1,4 @@ +; RUN: not llvm-as < %s + +declare i32 @atoi(i8*) nounwind readonly +declare i32 @atoi(i8*) Added: llvm/trunk/test/Assembler/2007-11-27-AutoUpgradeAttributes.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2007-11-27-AutoUpgradeAttributes.ll?rev=44359&view=auto ============================================================================== --- llvm/trunk/test/Assembler/2007-11-27-AutoUpgradeAttributes.ll (added) +++ llvm/trunk/test/Assembler/2007-11-27-AutoUpgradeAttributes.ll Tue Nov 27 07:23:08 2007 @@ -0,0 +1,3 @@ +; RUN: llvm-as < %s + + at FP = weak global i8 (...) signext * null Modified: llvm/trunk/test/Feature/paramattrs.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Feature/paramattrs.ll?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/test/Feature/paramattrs.ll (original) +++ llvm/trunk/test/Feature/paramattrs.ll Tue Nov 27 07:23:08 2007 @@ -14,7 +14,7 @@ define i32 @main(i32 inreg %argc, i8 ** inreg %argv) nounwind { %val = trunc i32 %argc to i16 - %res1 = call i16 (i16 signext) signext *@test(i16 %val) + %res1 = call i16 (i16 signext) signext *@test(i16 signext %val) signext %two = add i16 %res1, %res1 %res2 = call i8 @test2(i16 %two zeroext) zeroext %retVal = sext i16 %two to i32 Modified: llvm/trunk/test/Integer/paramattrs_bt.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Integer/paramattrs_bt.ll?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/test/Integer/paramattrs_bt.ll (original) +++ llvm/trunk/test/Integer/paramattrs_bt.ll Tue Nov 27 07:23:08 2007 @@ -11,7 +11,7 @@ define i33 @main(i33 %argc, i8 **%argv) { %val = trunc i33 %argc to i16 - %res = call i16 (i16 signext) signext *@test(i16 %val) + %res = call i16 (i16 signext) signext *@test(i16 signext %val) signext %two = add i16 %res, %res %res2 = call i8 @test2(i16 %two zeroext) zeroext %retVal = sext i16 %two to i33 Modified: llvm/trunk/test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll (original) +++ llvm/trunk/test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll Tue Nov 27 07:23:08 2007 @@ -1,6 +1,4 @@ ; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output -; XFAIL: * -; Un-XFAIL this when PR1146 is finished. %struct..4._102 = type { %struct.QVectorData* } %struct..5._125 = type { %struct.QMapData* } Modified: llvm/trunk/tools/llvm-upgrade/UpgradeParser.cpp.cvs URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-upgrade/UpgradeParser.cpp.cvs?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/tools/llvm-upgrade/UpgradeParser.cpp.cvs (original) +++ llvm/trunk/tools/llvm-upgrade/UpgradeParser.cpp.cvs Tue Nov 27 07:23:08 2007 @@ -1,167 +1,386 @@ +/* A Bison parser, made by GNU Bison 2.3. */ -/* A Bison parser, made from /Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y - by GNU Bison version 1.28 */ +/* Skeleton implementation for Bison's Yacc-like parsers in C -#define YYBISON 1 /* Identify Bison output. */ + 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. */ + +/* C LALR(1) parser skeleton written by Richard Stallman, by + simplifying the original so-called "semantic" parser. */ + +/* All symbols defined below should begin with yy or YY, to avoid + infringing on user name space. This should be done even for local + variables, as they might otherwise be expanded by user macros. + There are some unavoidable exceptions within include files to + define necessary library symbols; they are noted "INFRINGES ON + USER NAME SPACE" below. */ + +/* Identify Bison output. */ +#define YYBISON 1 + +/* Bison version. */ +#define YYBISON_VERSION "2.3" + +/* Skeleton name. */ +#define YYSKELETON_NAME "yacc.c" + +/* Pure parsers. */ +#define YYPURE 0 + +/* Using locations. */ +#define YYLSP_NEEDED 0 + +/* Substitute the variable and function names. */ #define yyparse Upgradeparse -#define yylex Upgradelex +#define yylex Upgradelex #define yyerror Upgradeerror -#define yylval Upgradelval -#define yychar Upgradechar +#define yylval Upgradelval +#define yychar Upgradechar #define yydebug Upgradedebug #define yynerrs Upgradenerrs -#define ESINT64VAL 257 -#define EUINT64VAL 258 -#define SINTVAL 259 -#define UINTVAL 260 -#define FPVAL 261 -#define VOID 262 -#define BOOL 263 -#define SBYTE 264 -#define UBYTE 265 -#define SHORT 266 -#define USHORT 267 -#define INT 268 -#define UINT 269 -#define LONG 270 -#define ULONG 271 -#define FLOAT 272 -#define DOUBLE 273 -#define TYPE 274 -#define LABEL 275 -#define VAR_ID 276 -#define LABELSTR 277 -#define STRINGCONSTANT 278 -#define IMPLEMENTATION 279 -#define ZEROINITIALIZER 280 -#define TRUETOK 281 -#define FALSETOK 282 -#define BEGINTOK 283 -#define ENDTOK 284 -#define DECLARE 285 -#define GLOBAL 286 -#define CONSTANT 287 -#define SECTION 288 -#define VOLATILE 289 -#define TO 290 -#define DOTDOTDOT 291 -#define NULL_TOK 292 -#define UNDEF 293 -#define CONST 294 -#define INTERNAL 295 -#define LINKONCE 296 -#define WEAK 297 -#define APPENDING 298 -#define DLLIMPORT 299 -#define DLLEXPORT 300 -#define EXTERN_WEAK 301 -#define OPAQUE 302 -#define NOT 303 -#define EXTERNAL 304 -#define TARGET 305 -#define TRIPLE 306 -#define ENDIAN 307 -#define POINTERSIZE 308 -#define LITTLE 309 -#define BIG 310 -#define ALIGN 311 -#define DEPLIBS 312 -#define CALL 313 -#define TAIL 314 -#define ASM_TOK 315 -#define MODULE 316 -#define SIDEEFFECT 317 -#define CC_TOK 318 -#define CCC_TOK 319 -#define CSRETCC_TOK 320 -#define FASTCC_TOK 321 -#define COLDCC_TOK 322 -#define X86_STDCALLCC_TOK 323 -#define X86_FASTCALLCC_TOK 324 -#define DATALAYOUT 325 -#define RET 326 -#define BR 327 -#define SWITCH 328 -#define INVOKE 329 -#define UNREACHABLE 330 -#define UNWIND 331 -#define EXCEPT 332 -#define ADD 333 -#define SUB 334 -#define MUL 335 -#define DIV 336 -#define UDIV 337 -#define SDIV 338 -#define FDIV 339 -#define REM 340 -#define UREM 341 -#define SREM 342 -#define FREM 343 -#define AND 344 -#define OR 345 -#define XOR 346 -#define SHL 347 -#define SHR 348 -#define ASHR 349 -#define LSHR 350 -#define SETLE 351 -#define SETGE 352 -#define SETLT 353 -#define SETGT 354 -#define SETEQ 355 -#define SETNE 356 -#define ICMP 357 -#define FCMP 358 -#define MALLOC 359 -#define ALLOCA 360 -#define FREE 361 -#define LOAD 362 -#define STORE 363 -#define GETELEMENTPTR 364 -#define PHI_TOK 365 -#define SELECT 366 -#define VAARG 367 -#define EXTRACTELEMENT 368 -#define INSERTELEMENT 369 -#define SHUFFLEVECTOR 370 -#define VAARG_old 371 -#define VANEXT_old 372 -#define EQ 373 -#define NE 374 -#define SLT 375 -#define SGT 376 -#define SLE 377 -#define SGE 378 -#define ULT 379 -#define UGT 380 -#define ULE 381 -#define UGE 382 -#define OEQ 383 -#define ONE 384 -#define OLT 385 -#define OGT 386 -#define OLE 387 -#define OGE 388 -#define ORD 389 -#define UNO 390 -#define UEQ 391 -#define UNE 392 -#define CAST 393 -#define TRUNC 394 -#define ZEXT 395 -#define SEXT 396 -#define FPTRUNC 397 -#define FPEXT 398 -#define FPTOUI 399 -#define FPTOSI 400 -#define UITOFP 401 -#define SITOFP 402 -#define PTRTOINT 403 -#define INTTOPTR 404 -#define BITCAST 405 -#line 14 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" + +/* 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, + SINTVAL = 260, + UINTVAL = 261, + FPVAL = 262, + VOID = 263, + BOOL = 264, + SBYTE = 265, + UBYTE = 266, + SHORT = 267, + USHORT = 268, + INT = 269, + UINT = 270, + LONG = 271, + ULONG = 272, + FLOAT = 273, + DOUBLE = 274, + TYPE = 275, + LABEL = 276, + VAR_ID = 277, + LABELSTR = 278, + STRINGCONSTANT = 279, + IMPLEMENTATION = 280, + ZEROINITIALIZER = 281, + TRUETOK = 282, + FALSETOK = 283, + BEGINTOK = 284, + ENDTOK = 285, + DECLARE = 286, + GLOBAL = 287, + CONSTANT = 288, + SECTION = 289, + VOLATILE = 290, + TO = 291, + DOTDOTDOT = 292, + NULL_TOK = 293, + UNDEF = 294, + CONST = 295, + INTERNAL = 296, + LINKONCE = 297, + WEAK = 298, + APPENDING = 299, + DLLIMPORT = 300, + DLLEXPORT = 301, + EXTERN_WEAK = 302, + OPAQUE = 303, + NOT = 304, + EXTERNAL = 305, + TARGET = 306, + TRIPLE = 307, + ENDIAN = 308, + POINTERSIZE = 309, + LITTLE = 310, + BIG = 311, + ALIGN = 312, + DEPLIBS = 313, + CALL = 314, + TAIL = 315, + ASM_TOK = 316, + MODULE = 317, + SIDEEFFECT = 318, + CC_TOK = 319, + CCC_TOK = 320, + CSRETCC_TOK = 321, + FASTCC_TOK = 322, + COLDCC_TOK = 323, + X86_STDCALLCC_TOK = 324, + X86_FASTCALLCC_TOK = 325, + DATALAYOUT = 326, + RET = 327, + BR = 328, + SWITCH = 329, + INVOKE = 330, + UNREACHABLE = 331, + UNWIND = 332, + EXCEPT = 333, + ADD = 334, + SUB = 335, + MUL = 336, + DIV = 337, + UDIV = 338, + SDIV = 339, + FDIV = 340, + REM = 341, + UREM = 342, + SREM = 343, + FREM = 344, + AND = 345, + OR = 346, + XOR = 347, + SHL = 348, + SHR = 349, + ASHR = 350, + LSHR = 351, + SETLE = 352, + SETGE = 353, + SETLT = 354, + SETGT = 355, + SETEQ = 356, + SETNE = 357, + ICMP = 358, + FCMP = 359, + MALLOC = 360, + ALLOCA = 361, + FREE = 362, + LOAD = 363, + STORE = 364, + GETELEMENTPTR = 365, + PHI_TOK = 366, + SELECT = 367, + VAARG = 368, + EXTRACTELEMENT = 369, + INSERTELEMENT = 370, + SHUFFLEVECTOR = 371, + VAARG_old = 372, + VANEXT_old = 373, + EQ = 374, + NE = 375, + SLT = 376, + SGT = 377, + SLE = 378, + SGE = 379, + ULT = 380, + UGT = 381, + ULE = 382, + UGE = 383, + OEQ = 384, + ONE = 385, + OLT = 386, + OGT = 387, + OLE = 388, + OGE = 389, + ORD = 390, + UNO = 391, + UEQ = 392, + UNE = 393, + CAST = 394, + TRUNC = 395, + ZEXT = 396, + SEXT = 397, + FPTRUNC = 398, + FPEXT = 399, + FPTOUI = 400, + FPTOSI = 401, + UITOFP = 402, + SITOFP = 403, + PTRTOINT = 404, + INTTOPTR = 405, + BITCAST = 406 + }; +#endif +/* Tokens. */ +#define ESINT64VAL 258 +#define EUINT64VAL 259 +#define SINTVAL 260 +#define UINTVAL 261 +#define FPVAL 262 +#define VOID 263 +#define BOOL 264 +#define SBYTE 265 +#define UBYTE 266 +#define SHORT 267 +#define USHORT 268 +#define INT 269 +#define UINT 270 +#define LONG 271 +#define ULONG 272 +#define FLOAT 273 +#define DOUBLE 274 +#define TYPE 275 +#define LABEL 276 +#define VAR_ID 277 +#define LABELSTR 278 +#define STRINGCONSTANT 279 +#define IMPLEMENTATION 280 +#define ZEROINITIALIZER 281 +#define TRUETOK 282 +#define FALSETOK 283 +#define BEGINTOK 284 +#define ENDTOK 285 +#define DECLARE 286 +#define GLOBAL 287 +#define CONSTANT 288 +#define SECTION 289 +#define VOLATILE 290 +#define TO 291 +#define DOTDOTDOT 292 +#define NULL_TOK 293 +#define UNDEF 294 +#define CONST 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 NOT 304 +#define EXTERNAL 305 +#define TARGET 306 +#define TRIPLE 307 +#define ENDIAN 308 +#define POINTERSIZE 309 +#define LITTLE 310 +#define BIG 311 +#define ALIGN 312 +#define DEPLIBS 313 +#define CALL 314 +#define TAIL 315 +#define ASM_TOK 316 +#define MODULE 317 +#define SIDEEFFECT 318 +#define CC_TOK 319 +#define CCC_TOK 320 +#define CSRETCC_TOK 321 +#define FASTCC_TOK 322 +#define COLDCC_TOK 323 +#define X86_STDCALLCC_TOK 324 +#define X86_FASTCALLCC_TOK 325 +#define DATALAYOUT 326 +#define RET 327 +#define BR 328 +#define SWITCH 329 +#define INVOKE 330 +#define UNREACHABLE 331 +#define UNWIND 332 +#define EXCEPT 333 +#define ADD 334 +#define SUB 335 +#define MUL 336 +#define DIV 337 +#define UDIV 338 +#define SDIV 339 +#define FDIV 340 +#define REM 341 +#define UREM 342 +#define SREM 343 +#define FREM 344 +#define AND 345 +#define OR 346 +#define XOR 347 +#define SHL 348 +#define SHR 349 +#define ASHR 350 +#define LSHR 351 +#define SETLE 352 +#define SETGE 353 +#define SETLT 354 +#define SETGT 355 +#define SETEQ 356 +#define SETNE 357 +#define ICMP 358 +#define FCMP 359 +#define MALLOC 360 +#define ALLOCA 361 +#define FREE 362 +#define LOAD 363 +#define STORE 364 +#define GETELEMENTPTR 365 +#define PHI_TOK 366 +#define SELECT 367 +#define VAARG 368 +#define EXTRACTELEMENT 369 +#define INSERTELEMENT 370 +#define SHUFFLEVECTOR 371 +#define VAARG_old 372 +#define VANEXT_old 373 +#define EQ 374 +#define NE 375 +#define SLT 376 +#define SGT 377 +#define SLE 378 +#define SGE 379 +#define ULT 380 +#define UGT 381 +#define ULE 382 +#define UGE 383 +#define OEQ 384 +#define ONE 385 +#define OLT 386 +#define OGT 387 +#define OLE 388 +#define OGE 389 +#define ORD 390 +#define UNO 391 +#define UEQ 392 +#define UNE 393 +#define CAST 394 +#define TRUNC 395 +#define ZEXT 396 +#define SEXT 397 +#define FPTRUNC 398 +#define FPEXT 399 +#define FPTOUI 400 +#define FPTOSI 401 +#define UITOFP 402 +#define SITOFP 403 +#define PTRTOINT 404 +#define INTTOPTR 405 +#define BITCAST 406 + + + + +/* Copy the first part of user declarations. */ +#line 14 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" #include "UpgradeInternals.h" #include "llvm/CallingConv.h" @@ -524,78 +743,6 @@ return result; } -/// This function determines if two function types differ only in their use of -/// the sret parameter attribute in the first argument. If they are identical -/// in all other respects, it returns true. Otherwise, it returns false. -static bool FuncTysDifferOnlyBySRet(const FunctionType *F1, - const FunctionType *F2) { - if (F1->getReturnType() != F2->getReturnType() || - F1->getNumParams() != F2->getNumParams()) - return false; - const ParamAttrsList *PAL1 = F1->getParamAttrs(); - const ParamAttrsList *PAL2 = F2->getParamAttrs(); - if (PAL1 && !PAL2 || PAL2 && !PAL1) - return false; - if (PAL1 && PAL2 && ((PAL1->size() != PAL2->size()) || - (PAL1->getParamAttrs(0) != PAL2->getParamAttrs(0)))) - return false; - unsigned SRetMask = ~unsigned(ParamAttr::StructRet); - for (unsigned i = 0; i < F1->getNumParams(); ++i) { - if (F1->getParamType(i) != F2->getParamType(i) || (PAL1 && PAL2 && - (unsigned(PAL1->getParamAttrs(i+1)) & SRetMask != - unsigned(PAL2->getParamAttrs(i+1)) & SRetMask))) - return false; - } - return true; -} - -/// This function determines if the type of V and Ty differ only by the SRet -/// parameter attribute. This is a more generalized case of -/// FuncTysDIfferOnlyBySRet since it doesn't require FunctionType arguments. -static bool TypesDifferOnlyBySRet(Value *V, const Type* Ty) { - if (V->getType() == Ty) - return true; - const PointerType *PF1 = dyn_cast(Ty); - const PointerType *PF2 = dyn_cast(V->getType()); - if (PF1 && PF2) { - const FunctionType* FT1 = dyn_cast(PF1->getElementType()); - const FunctionType* FT2 = dyn_cast(PF2->getElementType()); - if (FT1 && FT2) - return FuncTysDifferOnlyBySRet(FT1, FT2); - } - return false; -} - -// The upgrade of csretcc to sret param attribute may have caused a function -// to not be found because the param attribute changed the type of the called -// function. This helper function, used in getExistingValue, detects that -// situation and bitcasts the function to the correct type. -static Value* handleSRetFuncTypeMerge(Value *V, const Type* Ty) { - // Handle degenerate cases - if (!V) - return 0; - if (V->getType() == Ty) - return V; - - const PointerType *PF1 = dyn_cast(Ty); - const PointerType *PF2 = dyn_cast(V->getType()); - if (PF1 && PF2) { - const FunctionType *FT1 = dyn_cast(PF1->getElementType()); - const FunctionType *FT2 = dyn_cast(PF2->getElementType()); - if (FT1 && FT2 && FuncTysDifferOnlyBySRet(FT1, FT2)) { - const ParamAttrsList *PAL2 = FT2->getParamAttrs(); - if (PAL2 && PAL2->paramHasAttr(1, ParamAttr::StructRet)) - return V; - else if (Constant *C = dyn_cast(V)) - return ConstantExpr::getBitCast(C, PF1); - else - return new BitCastInst(V, PF1, "upgrd.cast", CurBB); - } - - } - return 0; -} - // getExistingValue - Look up the value specified by the provided type and // the provided ValID. If the value exists and has already been defined, return // it. Otherwise return null. @@ -642,8 +789,7 @@ ValueSymbolTable &SymTab = CurFun.CurrentFunction->getValueSymbolTable(); V = SymTab.lookup(LookupName); if (V && V->getType() != Ty) - V = handleSRetFuncTypeMerge(V, Ty); - assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong type"); + V = 0; } if (!V) { RenameMapType::const_iterator I = CurModule.RenameMap.find(Key); @@ -654,8 +800,7 @@ LookupName = D.Name; V = CurModule.CurrentModule->getValueSymbolTable().lookup(LookupName); if (V && V->getType() != Ty) - V = handleSRetFuncTypeMerge(V, Ty); - assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong type"); + V = 0; } if (!V) return 0; @@ -1901,8 +2046,29 @@ using namespace llvm; -#line 1754 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -typedef union { + +/* Enabling traces. */ +#ifndef YYDEBUG +# define YYDEBUG 0 +#endif + +/* Enabling verbose error messages. */ +#ifdef YYERROR_VERBOSE +# undef YYERROR_VERBOSE +# define YYERROR_VERBOSE 1 +#else +# define YYERROR_VERBOSE 0 +#endif + +/* Enabling the token table. */ +#ifndef YYTOKEN_TABLE +# define YYTOKEN_TABLE 0 +#endif + +#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +typedef union YYSTYPE +#line 1680 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" +{ llvm::Module *ModuleVal; llvm::Function *FunctionVal; std::pair *ArgVal; @@ -1942,1124 +2108,1815 @@ llvm::ICmpInst::Predicate IPred; llvm::FCmpInst::Predicate FPred; llvm::Module::Endianness Endianness; -} YYSTYPE; -#include - -#ifndef __cplusplus -#ifndef __STDC__ -#define const -#endif +} +/* Line 187 of yacc.c. */ +#line 2114 "UpgradeParser.tab.c" + YYSTYPE; +# define yystype YYSTYPE /* obsolescent; will be withdrawn */ +# define YYSTYPE_IS_DECLARED 1 +# define YYSTYPE_IS_TRIVIAL 1 #endif -#define YYFINAL 606 -#define YYFLAG -32768 -#define YYNTBASE 166 - -#define YYTRANSLATE(x) ((unsigned)(x) <= 405 ? yytranslate[x] : 246) - -static const short yytranslate[] = { 0, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 155, - 156, 164, 2, 153, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 160, - 152, 161, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 157, 154, 159, 2, 2, 2, 2, 2, 165, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 158, - 2, 2, 162, 2, 163, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 1, 3, 4, 5, 6, - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, - 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, - 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, - 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, - 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, - 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, - 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, - 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, - 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, - 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, - 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, - 147, 148, 149, 150, 151 -}; +/* Copy the second part of user declarations. */ -#if YYDEBUG != 0 -static const short yyprhs[] = { 0, - 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, - 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, - 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, - 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, - 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, - 100, 102, 104, 106, 108, 110, 112, 114, 116, 118, - 120, 122, 124, 126, 128, 130, 132, 134, 136, 138, - 140, 142, 144, 146, 148, 150, 152, 154, 156, 158, - 161, 162, 164, 166, 168, 170, 172, 174, 176, 177, - 178, 180, 182, 184, 186, 188, 190, 193, 194, 197, - 198, 202, 205, 206, 208, 209, 213, 215, 218, 220, - 222, 224, 226, 228, 230, 232, 234, 236, 238, 240, - 242, 244, 246, 248, 250, 252, 254, 256, 258, 261, - 266, 272, 278, 282, 285, 291, 296, 299, 301, 305, - 307, 311, 313, 314, 319, 323, 327, 332, 337, 341, - 348, 354, 357, 360, 363, 366, 369, 372, 375, 378, - 381, 384, 391, 397, 406, 413, 420, 427, 435, 443, - 450, 457, 466, 475, 479, 481, 483, 485, 487, 490, - 493, 498, 501, 503, 508, 511, 516, 517, 525, 526, - 534, 535, 543, 544, 552, 556, 561, 562, 564, 566, - 568, 572, 576, 580, 584, 588, 592, 594, 595, 597, - 599, 601, 602, 605, 609, 611, 613, 617, 619, 620, - 629, 631, 633, 634, 639, 641, 643, 646, 647, 649, - 651, 652, 653, 659, 660, 662, 664, 666, 668, 670, - 672, 674, 676, 678, 682, 684, 690, 692, 694, 696, - 698, 701, 704, 707, 711, 714, 715, 717, 719, 721, - 724, 727, 731, 741, 751, 760, 774, 776, 778, 785, - 791, 794, 801, 809, 811, 815, 817, 818, 821, 823, - 829, 835, 841, 848, 855, 858, 863, 868, 875, 880, - 885, 890, 895, 902, 909, 912, 920, 922, 925, 926, - 928, 929, 933, 940, 944, 951, 954, 959, 966 -}; -static const short yyrhs[] = { 5, - 0, 6, 0, 3, 0, 4, 0, 79, 0, 80, - 0, 81, 0, 82, 0, 83, 0, 84, 0, 85, - 0, 86, 0, 87, 0, 88, 0, 89, 0, 90, - 0, 91, 0, 92, 0, 97, 0, 98, 0, 99, - 0, 100, 0, 101, 0, 102, 0, 119, 0, 120, - 0, 121, 0, 122, 0, 123, 0, 124, 0, 125, - 0, 126, 0, 127, 0, 128, 0, 129, 0, 130, - 0, 131, 0, 132, 0, 133, 0, 134, 0, 135, - 0, 136, 0, 137, 0, 138, 0, 125, 0, 126, - 0, 127, 0, 128, 0, 27, 0, 28, 0, 93, - 0, 94, 0, 95, 0, 96, 0, 140, 0, 141, - 0, 142, 0, 143, 0, 144, 0, 145, 0, 146, - 0, 147, 0, 148, 0, 149, 0, 150, 0, 151, - 0, 139, 0, 16, 0, 14, 0, 12, 0, 10, - 0, 17, 0, 15, 0, 13, 0, 11, 0, 175, - 0, 176, 0, 18, 0, 19, 0, 211, 152, 0, - 0, 41, 0, 42, 0, 43, 0, 44, 0, 45, - 0, 46, 0, 47, 0, 0, 0, 65, 0, 66, - 0, 67, 0, 68, 0, 69, 0, 70, 0, 64, - 4, 0, 0, 57, 4, 0, 0, 153, 57, 4, - 0, 34, 24, 0, 0, 184, 0, 0, 153, 187, - 186, 0, 184, 0, 57, 4, 0, 190, 0, 8, - 0, 192, 0, 8, 0, 192, 0, 9, 0, 10, - 0, 11, 0, 12, 0, 13, 0, 14, 0, 15, - 0, 16, 0, 17, 0, 18, 0, 19, 0, 21, - 0, 191, 0, 48, 0, 228, 0, 154, 4, 0, - 189, 155, 194, 156, 0, 157, 4, 158, 192, 159, - 0, 160, 4, 158, 192, 161, 0, 162, 193, 163, - 0, 162, 163, 0, 160, 162, 193, 163, 161, 0, - 160, 162, 163, 161, 0, 192, 164, 0, 192, 0, - 193, 153, 192, 0, 193, 0, 193, 153, 37, 0, - 37, 0, 0, 190, 157, 197, 159, 0, 190, 157, - 159, 0, 190, 165, 24, 0, 190, 160, 197, 161, - 0, 190, 162, 197, 163, 0, 190, 162, 163, 0, - 190, 160, 162, 197, 163, 161, 0, 190, 160, 162, - 163, 161, 0, 190, 38, 0, 190, 39, 0, 190, - 228, 0, 190, 196, 0, 190, 26, 0, 175, 167, - 0, 176, 4, 0, 9, 27, 0, 9, 28, 0, - 178, 7, 0, 174, 155, 195, 36, 190, 156, 0, - 110, 155, 195, 243, 156, 0, 112, 155, 195, 153, - 195, 153, 195, 156, 0, 168, 155, 195, 153, 195, - 156, 0, 169, 155, 195, 153, 195, 156, 0, 170, - 155, 195, 153, 195, 156, 0, 103, 171, 155, 195, - 153, 195, 156, 0, 104, 172, 155, 195, 153, 195, - 156, 0, 173, 155, 195, 153, 195, 156, 0, 114, - 155, 195, 153, 195, 156, 0, 115, 155, 195, 153, - 195, 153, 195, 156, 0, 116, 155, 195, 153, 195, - 153, 195, 156, 0, 197, 153, 195, 0, 195, 0, - 32, 0, 33, 0, 200, 0, 200, 221, 0, 200, - 223, 0, 200, 62, 61, 206, 0, 200, 25, 0, - 201, 0, 201, 179, 20, 188, 0, 201, 223, 0, - 201, 62, 61, 206, 0, 0, 201, 179, 180, 198, - 195, 202, 186, 0, 0, 201, 179, 50, 198, 190, - 203, 186, 0, 0, 201, 179, 45, 198, 190, 204, - 186, 0, 0, 201, 179, 47, 198, 190, 205, 186, - 0, 201, 51, 208, 0, 201, 58, 152, 209, 0, - 0, 24, 0, 56, 0, 55, 0, 53, 152, 207, - 0, 54, 152, 4, 0, 52, 152, 24, 0, 71, - 152, 24, 0, 157, 210, 159, 0, 210, 153, 24, - 0, 24, 0, 0, 22, 0, 24, 0, 211, 0, - 0, 190, 212, 0, 214, 153, 213, 0, 213, 0, - 214, 0, 214, 153, 37, 0, 37, 0, 0, 181, - 188, 211, 155, 215, 156, 185, 182, 0, 29, 0, - 162, 0, 0, 180, 219, 216, 217, 0, 30, 0, - 163, 0, 231, 220, 0, 0, 45, 0, 47, 0, - 0, 0, 31, 224, 222, 225, 216, 0, 0, 63, - 0, 3, 0, 4, 0, 7, 0, 27, 0, 28, - 0, 38, 0, 39, 0, 26, 0, 160, 197, 161, - 0, 196, 0, 61, 226, 24, 153, 24, 0, 166, - 0, 211, 0, 228, 0, 227, 0, 190, 229, 0, - 231, 232, 0, 218, 232, 0, 233, 179, 235, 0, - 233, 237, 0, 0, 23, 0, 77, 0, 78, 0, - 72, 230, 0, 72, 8, 0, 73, 21, 229, 0, - 73, 9, 229, 153, 21, 229, 153, 21, 229, 0, - 74, 177, 229, 153, 21, 229, 157, 236, 159, 0, - 74, 177, 229, 153, 21, 229, 157, 159, 0, 75, - 181, 188, 229, 155, 240, 156, 36, 21, 229, 234, - 21, 229, 0, 234, 0, 76, 0, 236, 177, 227, - 153, 21, 229, 0, 177, 227, 153, 21, 229, 0, - 179, 242, 0, 190, 157, 229, 153, 229, 159, 0, - 238, 153, 157, 229, 153, 229, 159, 0, 230, 0, - 239, 153, 230, 0, 239, 0, 0, 60, 59, 0, - 59, 0, 168, 190, 229, 153, 229, 0, 169, 190, - 229, 153, 229, 0, 170, 190, 229, 153, 229, 0, - 103, 171, 190, 229, 153, 229, 0, 104, 172, 190, - 229, 153, 229, 0, 49, 230, 0, 173, 230, 153, - 230, 0, 174, 230, 36, 190, 0, 112, 230, 153, - 230, 153, 230, 0, 113, 230, 153, 190, 0, 117, - 230, 153, 190, 0, 118, 230, 153, 190, 0, 114, - 230, 153, 230, 0, 115, 230, 153, 230, 153, 230, - 0, 116, 230, 153, 230, 153, 230, 0, 111, 238, - 0, 241, 181, 188, 229, 155, 240, 156, 0, 245, - 0, 153, 239, 0, 0, 35, 0, 0, 105, 190, - 183, 0, 105, 190, 153, 15, 229, 183, 0, 106, - 190, 183, 0, 106, 190, 153, 15, 229, 183, 0, - 107, 230, 0, 244, 108, 190, 229, 0, 244, 109, - 230, 153, 190, 229, 0, 110, 190, 229, 243, 0 -}; +/* Line 216 of yacc.c. */ +#line 2127 "UpgradeParser.tab.c" +#ifdef short +# undef short #endif -#if YYDEBUG != 0 -static const short yyrline[] = { 0, - 1894, 1895, 1903, 1904, 1914, 1914, 1914, 1914, 1914, 1914, - 1914, 1914, 1914, 1914, 1914, 1918, 1918, 1918, 1922, 1922, - 1922, 1922, 1922, 1922, 1926, 1926, 1927, 1927, 1928, 1928, - 1929, 1929, 1930, 1930, 1934, 1934, 1935, 1935, 1936, 1936, - 1937, 1937, 1938, 1938, 1939, 1939, 1940, 1940, 1941, 1942, - 1945, 1945, 1945, 1945, 1949, 1949, 1949, 1949, 1949, 1949, - 1949, 1950, 1950, 1950, 1950, 1950, 1950, 1956, 1956, 1956, - 1956, 1960, 1960, 1960, 1960, 1964, 1964, 1968, 1968, 1973, - 1976, 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1988, 1992, - 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2009, 2010, 2018, - 2019, 2027, 2036, 2037, 2044, 2045, 2049, 2053, 2069, 2070, - 2077, 2078, 2085, 2093, 2093, 2093, 2093, 2093, 2093, 2093, - 2094, 2094, 2094, 2094, 2094, 2099, 2103, 2107, 2112, 2121, - 2148, 2154, 2167, 2178, 2182, 2195, 2199, 2213, 2217, 2224, - 2225, 2231, 2238, 2250, 2280, 2293, 2316, 2344, 2366, 2377, - 2399, 2410, 2419, 2424, 2483, 2490, 2498, 2505, 2512, 2516, - 2520, 2534, 2549, 2561, 2570, 2598, 2611, 2620, 2626, 2632, - 2643, 2649, 2655, 2666, 2667, 2676, 2677, 2689, 2698, 2699, - 2700, 2701, 2702, 2718, 2738, 2740, 2742, 2746, 2749, 2754, - 2757, 2762, 2765, 2771, 2774, 2776, 2778, 2783, 2797, 2798, - 2802, 2805, 2813, 2817, 2824, 2828, 2832, 2836, 2844, 2844, - 2848, 2849, 2853, 2861, 2866, 2874, 2875, 2882, 2889, 2893, - 3083, 3083, 3087, 3087, 3097, 3097, 3101, 3106, 3107, 3108, - 3112, 3113, 3113, 3125, 3126, 3131, 3132, 3133, 3134, 3138, - 3142, 3143, 3144, 3145, 3166, 3170, 3184, 3185, 3190, 3190, - 3198, 3208, 3211, 3220, 3231, 3236, 3245, 3256, 3256, 3259, - 3263, 3267, 3272, 3282, 3300, 3309, 3383, 3387, 3394, 3406, - 3421, 3451, 3461, 3471, 3475, 3482, 3483, 3487, 3490, 3496, - 3515, 3533, 3549, 3563, 3577, 3588, 3606, 3615, 3624, 3631, - 3652, 3676, 3682, 3688, 3694, 3710, 3803, 3811, 3812, 3816, - 3817, 3821, 3827, 3834, 3840, 3847, 3854, 3867, 3893 -}; +#ifdef YYTYPE_UINT8 +typedef YYTYPE_UINT8 yytype_uint8; +#else +typedef unsigned char yytype_uint8; +#endif + +#ifdef YYTYPE_INT8 +typedef YYTYPE_INT8 yytype_int8; +#elif (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +typedef signed char yytype_int8; +#else +typedef short int yytype_int8; #endif +#ifdef YYTYPE_UINT16 +typedef YYTYPE_UINT16 yytype_uint16; +#else +typedef unsigned short int yytype_uint16; +#endif -#if YYDEBUG != 0 || defined (YYERROR_VERBOSE) +#ifdef YYTYPE_INT16 +typedef YYTYPE_INT16 yytype_int16; +#else +typedef short int yytype_int16; +#endif -static const char * const yytname[] = { "$","error","$undefined.","ESINT64VAL", -"EUINT64VAL","SINTVAL","UINTVAL","FPVAL","VOID","BOOL","SBYTE","UBYTE","SHORT", -"USHORT","INT","UINT","LONG","ULONG","FLOAT","DOUBLE","TYPE","LABEL","VAR_ID", -"LABELSTR","STRINGCONSTANT","IMPLEMENTATION","ZEROINITIALIZER","TRUETOK","FALSETOK", -"BEGINTOK","ENDTOK","DECLARE","GLOBAL","CONSTANT","SECTION","VOLATILE","TO", -"DOTDOTDOT","NULL_TOK","UNDEF","CONST","INTERNAL","LINKONCE","WEAK","APPENDING", -"DLLIMPORT","DLLEXPORT","EXTERN_WEAK","OPAQUE","NOT","EXTERNAL","TARGET","TRIPLE", -"ENDIAN","POINTERSIZE","LITTLE","BIG","ALIGN","DEPLIBS","CALL","TAIL","ASM_TOK", -"MODULE","SIDEEFFECT","CC_TOK","CCC_TOK","CSRETCC_TOK","FASTCC_TOK","COLDCC_TOK", -"X86_STDCALLCC_TOK","X86_FASTCALLCC_TOK","DATALAYOUT","RET","BR","SWITCH","INVOKE", -"UNREACHABLE","UNWIND","EXCEPT","ADD","SUB","MUL","DIV","UDIV","SDIV","FDIV", -"REM","UREM","SREM","FREM","AND","OR","XOR","SHL","SHR","ASHR","LSHR","SETLE", -"SETGE","SETLT","SETGT","SETEQ","SETNE","ICMP","FCMP","MALLOC","ALLOCA","FREE", -"LOAD","STORE","GETELEMENTPTR","PHI_TOK","SELECT","VAARG","EXTRACTELEMENT","INSERTELEMENT", -"SHUFFLEVECTOR","VAARG_old","VANEXT_old","EQ","NE","SLT","SGT","SLE","SGE","ULT", -"UGT","ULE","UGE","OEQ","ONE","OLT","OGT","OLE","OGE","ORD","UNO","UEQ","UNE", -"CAST","TRUNC","ZEXT","SEXT","FPTRUNC","FPEXT","FPTOUI","FPTOSI","UITOFP","SITOFP", -"PTRTOINT","INTTOPTR","BITCAST","'='","','","'\\\\'","'('","')'","'['","'x'", -"']'","'<'","'>'","'{'","'}'","'*'","'c'","INTVAL","EINT64VAL","ArithmeticOps", -"LogicalOps","SetCondOps","IPredicates","FPredicates","ShiftOps","CastOps","SIntType", -"UIntType","IntType","FPType","OptAssign","OptLinkage","OptCallingConv","OptAlign", -"OptCAlign","SectionString","OptSection","GlobalVarAttributes","GlobalVarAttribute", -"TypesV","UpRTypesV","Types","PrimType","UpRTypes","TypeListI","ArgTypeListI", -"ConstVal","ConstExpr","ConstVector","GlobalType","Module","FunctionList","ConstPool", -"@1","@2","@3","@4","AsmBlock","BigOrLittle","TargetDefinition","LibrariesDefinition", -"LibList","Name","OptName","ArgVal","ArgListH","ArgList","FunctionHeaderH","BEGIN", -"FunctionHeader","@5","END","Function","FnDeclareLinkage","FunctionProto","@6", -"@7","OptSideEffect","ConstValueRef","SymbolicValueRef","ValueRef","ResolvedVal", -"BasicBlockList","BasicBlock","InstructionList","Unwind","BBTerminatorInst", -"JumpTable","Inst","PHIList","ValueRefList","ValueRefListE","OptTailCall","InstVal", -"IndexList","OptVolatile","MemoryInst", NULL -}; +#ifndef YYSIZE_T +# ifdef __SIZE_TYPE__ +# define YYSIZE_T __SIZE_TYPE__ +# elif defined size_t +# define YYSIZE_T size_t +# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# else +# define YYSIZE_T unsigned int +# endif +#endif + +#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) + +#ifndef YY_ +# if YYENABLE_NLS +# if ENABLE_NLS +# include /* INFRINGES ON USER NAME SPACE */ +# define YY_(msgid) dgettext ("bison-runtime", msgid) +# endif +# endif +# ifndef YY_ +# define YY_(msgid) msgid +# endif +#endif + +/* Suppress unused-variable warnings by "using" E. */ +#if ! defined lint || defined __GNUC__ +# define YYUSE(e) ((void) (e)) +#else +# define YYUSE(e) /* empty */ #endif -static const short yyr1[] = { 0, - 166, 166, 167, 167, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 169, 169, 169, 170, 170, - 170, 170, 170, 170, 171, 171, 171, 171, 171, 171, - 171, 171, 171, 171, 172, 172, 172, 172, 172, 172, - 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, - 173, 173, 173, 173, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 175, 175, 175, - 175, 176, 176, 176, 176, 177, 177, 178, 178, 179, - 179, 180, 180, 180, 180, 180, 180, 180, 180, 181, - 181, 181, 181, 181, 181, 181, 181, 182, 182, 183, - 183, 184, 185, 185, 186, 186, 187, 187, 188, 188, - 189, 189, 190, 191, 191, 191, 191, 191, 191, 191, - 191, 191, 191, 191, 191, 192, 192, 192, 192, 192, - 192, 192, 192, 192, 192, 192, 192, 193, 193, 194, - 194, 194, 194, 195, 195, 195, 195, 195, 195, 195, - 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, - 195, 196, 196, 196, 196, 196, 196, 196, 196, 196, - 196, 196, 196, 197, 197, 198, 198, 199, 200, 200, - 200, 200, 200, 201, 201, 201, 202, 201, 203, 201, - 204, 201, 205, 201, 201, 201, 201, 206, 207, 207, - 208, 208, 208, 208, 209, 210, 210, 210, 211, 211, - 212, 212, 213, 214, 214, 215, 215, 215, 215, 216, - 217, 217, 219, 218, 220, 220, 221, 222, 222, 222, - 224, 225, 223, 226, 226, 227, 227, 227, 227, 227, - 227, 227, 227, 227, 227, 227, 228, 228, 229, 229, - 230, 231, 231, 232, 233, 233, 233, 234, 234, 235, - 235, 235, 235, 235, 235, 235, 235, 235, 236, 236, - 237, 238, 238, 239, 239, 240, 240, 241, 241, 242, - 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, - 242, 242, 242, 242, 242, 242, 242, 243, 243, 244, - 244, 245, 245, 245, 245, 245, 245, 245, 245 -}; +/* Identity function, used to suppress warnings about constant conditions. */ +#ifndef lint +# define YYID(n) (n) +#else +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static int +YYID (int i) +#else +static int +YYID (i) + int i; +#endif +{ + return i; +} +#endif + +#if ! defined yyoverflow || YYERROR_VERBOSE + +/* The parser invokes alloca or malloc; define the necessary symbols. */ + +# ifdef YYSTACK_USE_ALLOCA +# if YYSTACK_USE_ALLOCA +# ifdef __GNUC__ +# define YYSTACK_ALLOC __builtin_alloca +# elif defined __BUILTIN_VA_ARG_INCR +# include /* INFRINGES ON USER NAME SPACE */ +# elif defined _AIX +# define YYSTACK_ALLOC __alloca +# elif defined _MSC_VER +# include /* INFRINGES ON USER NAME SPACE */ +# define alloca _alloca +# else +# define YYSTACK_ALLOC alloca +# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +# include /* INFRINGES ON USER NAME SPACE */ +# ifndef _STDLIB_H +# define _STDLIB_H 1 +# endif +# endif +# endif +# endif +# endif + +# ifdef YYSTACK_ALLOC + /* Pacify GCC's `empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) +# ifndef YYSTACK_ALLOC_MAXIMUM + /* The OS might guarantee only one guard page at the bottom of the stack, + and a page size can be as small as 4096 bytes. So we cannot safely + invoke alloca (N) if N exceeds 4096. Use a slightly smaller number + to allow for a few compiler-allocated temporary stack slots. */ +# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ +# endif +# else +# define YYSTACK_ALLOC YYMALLOC +# define YYSTACK_FREE YYFREE +# ifndef YYSTACK_ALLOC_MAXIMUM +# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM +# endif +# if (defined __cplusplus && ! defined _STDLIB_H \ + && ! ((defined YYMALLOC || defined malloc) \ + && (defined YYFREE || defined free))) +# include /* INFRINGES ON USER NAME SPACE */ +# ifndef _STDLIB_H +# define _STDLIB_H 1 +# endif +# endif +# ifndef YYMALLOC +# define YYMALLOC malloc +# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# ifndef YYFREE +# define YYFREE free +# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +void free (void *); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# endif +#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ + + +#if (! defined yyoverflow \ + && (! defined __cplusplus \ + || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) -static const short yyr2[] = { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, - 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, - 1, 1, 1, 1, 1, 1, 2, 0, 2, 0, - 3, 2, 0, 1, 0, 3, 1, 2, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 4, - 5, 5, 3, 2, 5, 4, 2, 1, 3, 1, - 3, 1, 0, 4, 3, 3, 4, 4, 3, 6, - 5, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 6, 5, 8, 6, 6, 6, 7, 7, 6, - 6, 8, 8, 3, 1, 1, 1, 1, 2, 2, - 4, 2, 1, 4, 2, 4, 0, 7, 0, 7, - 0, 7, 0, 7, 3, 4, 0, 1, 1, 1, - 3, 3, 3, 3, 3, 3, 1, 0, 1, 1, - 1, 0, 2, 3, 1, 1, 3, 1, 0, 8, - 1, 1, 0, 4, 1, 1, 2, 0, 1, 1, - 0, 0, 5, 0, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 3, 1, 5, 1, 1, 1, 1, - 2, 2, 2, 3, 2, 0, 1, 1, 1, 2, - 2, 3, 9, 9, 8, 13, 1, 1, 6, 5, - 2, 6, 7, 1, 3, 1, 0, 2, 1, 5, - 5, 5, 6, 6, 2, 4, 4, 6, 4, 4, - 4, 4, 6, 6, 2, 7, 1, 2, 0, 1, - 0, 3, 6, 3, 6, 2, 4, 6, 4 -}; +/* A type that is properly aligned for any stack member. */ +union yyalloc +{ + yytype_int16 yyss; + YYSTYPE yyvs; + }; -static const short yydefact[] = { 197, - 89, 183, 182, 231, 82, 83, 84, 85, 86, 87, - 88, 0, 223, 256, 179, 180, 256, 209, 210, 0, - 0, 0, 89, 0, 185, 228, 0, 90, 257, 253, - 81, 225, 226, 227, 252, 0, 0, 0, 0, 195, - 0, 0, 0, 0, 0, 0, 0, 80, 229, 230, - 232, 198, 181, 0, 91, 92, 93, 94, 95, 96, - 0, 0, 301, 255, 0, 0, 0, 0, 208, 196, - 186, 1, 2, 110, 114, 115, 116, 117, 118, 119, - 120, 121, 122, 123, 124, 125, 127, 0, 0, 0, - 0, 247, 184, 0, 109, 126, 113, 248, 128, 176, - 177, 0, 0, 0, 0, 90, 97, 0, 221, 222, - 224, 300, 0, 279, 0, 0, 0, 0, 90, 268, - 258, 259, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 51, 52, 53, 54, - 19, 20, 21, 22, 23, 24, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 67, 55, 56, 57, 58, 59, 60, 61, 62, 63, - 64, 65, 66, 0, 0, 0, 0, 0, 267, 254, - 90, 271, 0, 297, 203, 200, 199, 201, 202, 204, - 207, 0, 129, 0, 0, 0, 112, 134, 138, 0, - 143, 137, 191, 193, 189, 114, 115, 116, 117, 118, - 119, 120, 121, 122, 123, 124, 0, 0, 0, 0, - 187, 233, 0, 0, 285, 278, 261, 260, 0, 0, - 71, 75, 70, 74, 69, 73, 68, 72, 76, 77, - 0, 0, 25, 26, 27, 28, 29, 30, 31, 32, - 33, 34, 0, 49, 50, 45, 46, 47, 48, 35, - 36, 37, 38, 39, 40, 41, 42, 43, 44, 0, - 100, 100, 306, 0, 0, 295, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 205, 0, 0, 0, 0, 0, 133, 142, - 140, 0, 105, 105, 105, 159, 160, 3, 4, 157, - 158, 161, 156, 152, 153, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 155, 154, 105, 219, 236, 237, 238, 243, 239, - 240, 241, 242, 234, 0, 245, 250, 249, 251, 0, - 262, 0, 0, 0, 0, 0, 302, 0, 304, 299, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 206, 111, 111, - 136, 0, 139, 0, 130, 0, 192, 194, 190, 0, - 0, 0, 0, 0, 0, 0, 145, 175, 0, 0, - 0, 149, 0, 146, 0, 0, 0, 0, 0, 188, - 218, 212, 215, 216, 0, 235, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 309, 0, 0, - 0, 289, 292, 0, 0, 290, 291, 0, 0, 0, - 286, 287, 0, 307, 0, 131, 132, 135, 141, 0, - 0, 107, 105, 0, 0, 299, 0, 0, 0, 0, - 0, 144, 134, 113, 0, 147, 148, 0, 0, 0, - 0, 0, 211, 213, 0, 103, 0, 244, 0, 0, - 277, 0, 0, 100, 101, 100, 274, 298, 0, 0, - 0, 0, 0, 280, 281, 282, 277, 0, 102, 108, - 106, 0, 0, 0, 0, 0, 0, 0, 174, 151, - 0, 0, 0, 0, 0, 0, 217, 214, 104, 98, - 0, 0, 0, 276, 0, 283, 284, 0, 303, 305, - 0, 0, 0, 288, 293, 294, 0, 308, 0, 0, - 163, 0, 0, 0, 0, 150, 0, 0, 0, 0, - 0, 0, 220, 246, 0, 0, 0, 275, 272, 0, - 296, 0, 0, 0, 171, 0, 0, 165, 166, 167, - 170, 162, 99, 0, 265, 0, 0, 0, 273, 168, - 169, 0, 0, 0, 263, 0, 264, 0, 0, 164, - 172, 173, 0, 0, 0, 0, 0, 0, 270, 0, - 0, 269, 266, 0, 0, 0 -}; +/* The size of the maximum gap between one aligned stack and the next. */ +# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) -static const short yydefgoto[] = { 92, - 310, 327, 328, 329, 253, 270, 330, 331, 217, 218, - 241, 219, 23, 13, 61, 553, 357, 452, 520, 387, - 453, 93, 94, 220, 96, 97, 200, 302, 398, 346, - 399, 102, 604, 1, 2, 334, 305, 303, 304, 53, - 188, 40, 70, 192, 98, 474, 413, 414, 415, 62, - 111, 14, 28, 34, 15, 51, 16, 26, 106, 417, - 347, 99, 349, 487, 17, 30, 31, 179, 180, 577, - 64, 276, 524, 525, 181, 182, 428, 183, 184 +/* The size of an array large to enough to hold all stacks, each with + N elements. */ +# define YYSTACK_BYTES(N) \ + ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + + YYSTACK_GAP_MAXIMUM) + +/* Copy COUNT objects from FROM to TO. The source and destination do + not overlap. */ +# ifndef YYCOPY +# if defined __GNUC__ && 1 < __GNUC__ +# define YYCOPY(To, From, Count) \ + __builtin_memcpy (To, From, (Count) * sizeof (*(From))) +# else +# define YYCOPY(To, From, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (To)[yyi] = (From)[yyi]; \ + } \ + while (YYID (0)) +# endif +# endif + +/* Relocate STACK from its old location to the new one. The + local variables YYSIZE and YYSTACKSIZE give the old and new number of + elements in the stack, and YYPTR gives the new location of the + stack. Advance YYPTR to a properly aligned location for the next + stack. */ +# define YYSTACK_RELOCATE(Stack) \ + do \ + { \ + YYSIZE_T yynewbytes; \ + YYCOPY (&yyptr->Stack, Stack, yysize); \ + Stack = &yyptr->Stack; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / sizeof (*yyptr); \ + } \ + while (YYID (0)) + +#endif + +/* YYFINAL -- State number of the termination state. */ +#define YYFINAL 4 +/* YYLAST -- Last index in YYTABLE. */ +#define YYLAST 1630 + +/* YYNTOKENS -- Number of terminals. */ +#define YYNTOKENS 166 +/* YYNNTS -- Number of nonterminals. */ +#define YYNNTS 81 +/* YYNRULES -- Number of rules. */ +#define YYNRULES 310 +/* YYNRULES -- Number of states. */ +#define YYNSTATES 606 + +/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ +#define YYUNDEFTOK 2 +#define YYMAXUTOK 406 + +#define YYTRANSLATE(YYX) \ + ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) + +/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ +static const yytype_uint8 yytranslate[] = +{ + 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 155, 156, 164, 2, 153, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 160, 152, 161, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 157, 154, 159, 2, 2, 2, 2, 2, 165, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 158, 2, 2, 162, 2, 163, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, + 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, + 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, + 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, + 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, + 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, + 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, + 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, + 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, + 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, + 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, + 145, 146, 147, 148, 149, 150, 151 }; -static const short yypact[] = {-32768, - 239, 567,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768, -46,-32768, 55,-32768,-32768, -14,-32768,-32768, 48, - -6, 104, 161, 19,-32768, -34, 155, 249,-32768,-32768, - 98,-32768,-32768,-32768,-32768, 33, 43, 49, 57,-32768, - 59, 155, 1265, 150, 150, 150, 150,-32768,-32768,-32768, --32768,-32768,-32768, 214,-32768,-32768,-32768,-32768,-32768,-32768, - 1265, -19, 1479,-32768, 196, 157, 224, 206, 212,-32768, --32768,-32768,-32768, 87,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768, 241, 247, 4, - 15,-32768,-32768, 108,-32768,-32768, 12,-32768,-32768,-32768, --32768, 1306, 1306, 1306, 1326, 249,-32768, 98,-32768,-32768, --32768,-32768, 1306,-32768, 194, 1367, 116, 177, 249,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768, 355, 429, 1306, 1306, - 1306, 1306, 1306, 1306, 1306, 1306, 1306, 1306, 1306, 1306, --32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768, 1306, 1306, 1306, 1306, 1306,-32768,-32768, - 249,-32768, 106,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768, -32,-32768, 103, 110, 75,-32768,-32768, 12, -81, - 1046,-32768,-32768,-32768,-32768, 197, 230, 265, 237, 267, - 240, 268, 246, 270, 269, 271, 254, 273, 272, 566, --32768,-32768, 120, 766,-32768,-32768, 87,-32768, 766, 766, --32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - 766, 1265,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768, 1306,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 1306, - 136, 137,-32768, 766, 134, 146, 147, 149, 152, 158, - 174, 176, 179, 766, 766, 766, 180, 262, 1265, 1306, - 1306, 279,-32768, 1306, 1306, 173, -27, 1306,-32768,-32768, - 184, 183, 187, 187, 187,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768, 355, 429, 186, 188, 189, - 190, 191, 1087, 1387, 529, 311, 192, 193, 198, 199, - 202,-32768,-32768, 187, 1107,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768, 286, 1326,-32768,-32768,-32768,-32768, 205, --32768, 207, 766, 766, 766, 7,-32768, 20,-32768, 208, - 766, 209, 1306, 1306, 1306, 1306, 1306, 1306, 1306, 210, - 216, 217, 1306, 1306, 766, 766, 218,-32768, -12, 9, --32768, 204, 12, 1148,-32768, 8,-32768,-32768,-32768, 220, - 221, 1326, 1326, 1326, 1326, 1326,-32768,-32768, -8, 741, - -82,-32768, -9,-32768, 1326, 1326, 1326, 1326, 1326,-32768, --32768, 98,-32768, 219, 203,-32768, 343, -13, 356, 357, - 228, 226, 233, 766, 383, 766, 1306,-32768, 235, 766, - 236,-32768,-32768, 243, 244,-32768,-32768, 766, 766, 766, --32768,-32768, 238,-32768, 1306,-32768,-32768,-32768,-32768, 366, - 394,-32768, 187, 1326, 1326, 208, 250, 251, 252, 258, - 1326,-32768, 256, -25, 11,-32768,-32768, 259, 266, 274, - 278, 363,-32768,-32768, 1205, 387, 280,-32768, 766, 766, - 1306, 766, 766, 281,-32768, 281,-32768, 282, 766, 283, - 1306, 1306, 1306,-32768,-32768,-32768, 1306, 766,-32768,-32768, --32768, 284, 290, 288, 1326, 1326, 1326, 1326,-32768,-32768, - 263, 1326, 1326, 1326, 1326, 1306,-32768,-32768,-32768, 368, - 376, 293, 294, 282, 291,-32768,-32768, 369,-32768,-32768, - 1306, 264, 766,-32768,-32768,-32768, 296,-32768, 1326, 1326, --32768, 300, 299, 305, 306,-32768, 308, 310, 313, 314, - 315, 457,-32768,-32768, 441, 41, 436,-32768,-32768, 325, --32768, 329, 331, 1326,-32768, 1326, 1326,-32768,-32768,-32768, --32768,-32768,-32768, 766,-32768, 893, 145, 468,-32768,-32768, --32768, 334, 335, 336,-32768, 340,-32768, 893, 766,-32768, --32768,-32768, 473, 342, 182, 766, 475, 479,-32768, 766, - 766,-32768,-32768, 502, 503,-32768 +#if YYDEBUG +/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in + YYRHS. */ +static const yytype_uint16 yyprhs[] = +{ + 0, 0, 3, 5, 7, 9, 11, 13, 15, 17, + 19, 21, 23, 25, 27, 29, 31, 33, 35, 37, + 39, 41, 43, 45, 47, 49, 51, 53, 55, 57, + 59, 61, 63, 65, 67, 69, 71, 73, 75, 77, + 79, 81, 83, 85, 87, 89, 91, 93, 95, 97, + 99, 101, 103, 105, 107, 109, 111, 113, 115, 117, + 119, 121, 123, 125, 127, 129, 131, 133, 135, 137, + 139, 141, 143, 145, 147, 149, 151, 153, 155, 157, + 159, 161, 164, 165, 167, 169, 171, 173, 175, 177, + 179, 180, 181, 183, 185, 187, 189, 191, 193, 196, + 197, 200, 201, 205, 208, 209, 211, 212, 216, 218, + 221, 223, 225, 227, 229, 231, 233, 235, 237, 239, + 241, 243, 245, 247, 249, 251, 253, 255, 257, 259, + 261, 264, 269, 275, 281, 285, 288, 294, 299, 302, + 304, 308, 310, 314, 316, 317, 322, 326, 330, 335, + 340, 344, 351, 357, 360, 363, 366, 369, 372, 375, + 378, 381, 384, 387, 394, 400, 409, 416, 423, 430, + 438, 446, 453, 460, 469, 478, 482, 484, 486, 488, + 490, 493, 496, 501, 504, 506, 511, 514, 519, 520, + 528, 529, 537, 538, 546, 547, 555, 559, 564, 565, + 567, 569, 571, 575, 579, 583, 587, 591, 595, 597, + 598, 600, 602, 604, 605, 608, 612, 614, 616, 620, + 622, 623, 632, 634, 636, 637, 642, 644, 646, 649, + 650, 652, 654, 655, 656, 662, 663, 665, 667, 669, + 671, 673, 675, 677, 679, 681, 685, 687, 693, 695, + 697, 699, 701, 704, 707, 710, 714, 717, 718, 720, + 722, 724, 727, 730, 734, 744, 754, 763, 777, 779, + 781, 788, 794, 797, 804, 812, 814, 818, 820, 821, + 824, 826, 832, 838, 844, 851, 858, 861, 866, 871, + 878, 883, 888, 893, 898, 905, 912, 915, 923, 925, + 928, 929, 931, 932, 936, 943, 947, 954, 957, 962, + 969 }; -static const short yypgoto[] = {-32768, --32768, 443, 444, 446, 195, 200, 447, 451, -117, -114, - -539,-32768, 484, 481, -105,-32768, -265, 40,-32768, -236, --32768, -58,-32768, -43,-32768, -72, -33,-32768, -99, 298, - -250, 58,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 480, --32768,-32768,-32768,-32768, 10,-32768, 46,-32768,-32768, 417, --32768,-32768,-32768,-32768,-32768,-32768, 522,-32768,-32768,-32768, - -526, 144, -88, -111,-32768, 508,-32768, -69,-32768,-32768, --32768,-32768, 100, 31,-32768,-32768, 73,-32768,-32768 +/* YYRHS -- A `-1'-separated list of the rules' RHS. */ +static const yytype_int16 yyrhs[] = +{ + 200, 0, -1, 5, -1, 6, -1, 3, -1, 4, + -1, 79, -1, 80, -1, 81, -1, 82, -1, 83, + -1, 84, -1, 85, -1, 86, -1, 87, -1, 88, + -1, 89, -1, 90, -1, 91, -1, 92, -1, 97, + -1, 98, -1, 99, -1, 100, -1, 101, -1, 102, + -1, 119, -1, 120, -1, 121, -1, 122, -1, 123, + -1, 124, -1, 125, -1, 126, -1, 127, -1, 128, + -1, 129, -1, 130, -1, 131, -1, 132, -1, 133, + -1, 134, -1, 135, -1, 136, -1, 137, -1, 138, + -1, 125, -1, 126, -1, 127, -1, 128, -1, 27, + -1, 28, -1, 93, -1, 94, -1, 95, -1, 96, + -1, 140, -1, 141, -1, 142, -1, 143, -1, 144, + -1, 145, -1, 146, -1, 147, -1, 148, -1, 149, + -1, 150, -1, 151, -1, 139, -1, 16, -1, 14, + -1, 12, -1, 10, -1, 17, -1, 15, -1, 13, + -1, 11, -1, 176, -1, 177, -1, 18, -1, 19, + -1, 212, 152, -1, -1, 41, -1, 42, -1, 43, + -1, 44, -1, 45, -1, 46, -1, 47, -1, -1, + -1, 65, -1, 66, -1, 67, -1, 68, -1, 69, + -1, 70, -1, 64, 4, -1, -1, 57, 4, -1, + -1, 153, 57, 4, -1, 34, 24, -1, -1, 185, + -1, -1, 153, 188, 187, -1, 185, -1, 57, 4, + -1, 191, -1, 8, -1, 193, -1, 8, -1, 193, + -1, 9, -1, 10, -1, 11, -1, 12, -1, 13, + -1, 14, -1, 15, -1, 16, -1, 17, -1, 18, + -1, 19, -1, 21, -1, 192, -1, 48, -1, 229, + -1, 154, 4, -1, 190, 155, 195, 156, -1, 157, + 4, 158, 193, 159, -1, 160, 4, 158, 193, 161, + -1, 162, 194, 163, -1, 162, 163, -1, 160, 162, + 194, 163, 161, -1, 160, 162, 163, 161, -1, 193, + 164, -1, 193, -1, 194, 153, 193, -1, 194, -1, + 194, 153, 37, -1, 37, -1, -1, 191, 157, 198, + 159, -1, 191, 157, 159, -1, 191, 165, 24, -1, + 191, 160, 198, 161, -1, 191, 162, 198, 163, -1, + 191, 162, 163, -1, 191, 160, 162, 198, 163, 161, + -1, 191, 160, 162, 163, 161, -1, 191, 38, -1, + 191, 39, -1, 191, 229, -1, 191, 197, -1, 191, + 26, -1, 176, 168, -1, 177, 4, -1, 9, 27, + -1, 9, 28, -1, 179, 7, -1, 175, 155, 196, + 36, 191, 156, -1, 110, 155, 196, 244, 156, -1, + 112, 155, 196, 153, 196, 153, 196, 156, -1, 169, + 155, 196, 153, 196, 156, -1, 170, 155, 196, 153, + 196, 156, -1, 171, 155, 196, 153, 196, 156, -1, + 103, 172, 155, 196, 153, 196, 156, -1, 104, 173, + 155, 196, 153, 196, 156, -1, 174, 155, 196, 153, + 196, 156, -1, 114, 155, 196, 153, 196, 156, -1, + 115, 155, 196, 153, 196, 153, 196, 156, -1, 116, + 155, 196, 153, 196, 153, 196, 156, -1, 198, 153, + 196, -1, 196, -1, 32, -1, 33, -1, 201, -1, + 201, 222, -1, 201, 224, -1, 201, 62, 61, 207, + -1, 201, 25, -1, 202, -1, 202, 180, 20, 189, + -1, 202, 224, -1, 202, 62, 61, 207, -1, -1, + 202, 180, 181, 199, 196, 203, 187, -1, -1, 202, + 180, 50, 199, 191, 204, 187, -1, -1, 202, 180, + 45, 199, 191, 205, 187, -1, -1, 202, 180, 47, + 199, 191, 206, 187, -1, 202, 51, 209, -1, 202, + 58, 152, 210, -1, -1, 24, -1, 56, -1, 55, + -1, 53, 152, 208, -1, 54, 152, 4, -1, 52, + 152, 24, -1, 71, 152, 24, -1, 157, 211, 159, + -1, 211, 153, 24, -1, 24, -1, -1, 22, -1, + 24, -1, 212, -1, -1, 191, 213, -1, 215, 153, + 214, -1, 214, -1, 215, -1, 215, 153, 37, -1, + 37, -1, -1, 182, 189, 212, 155, 216, 156, 186, + 183, -1, 29, -1, 162, -1, -1, 181, 220, 217, + 218, -1, 30, -1, 163, -1, 232, 221, -1, -1, + 45, -1, 47, -1, -1, -1, 31, 225, 223, 226, + 217, -1, -1, 63, -1, 3, -1, 4, -1, 7, + -1, 27, -1, 28, -1, 38, -1, 39, -1, 26, + -1, 160, 198, 161, -1, 197, -1, 61, 227, 24, + 153, 24, -1, 167, -1, 212, -1, 229, -1, 228, + -1, 191, 230, -1, 232, 233, -1, 219, 233, -1, + 234, 180, 236, -1, 234, 238, -1, -1, 23, -1, + 77, -1, 78, -1, 72, 231, -1, 72, 8, -1, + 73, 21, 230, -1, 73, 9, 230, 153, 21, 230, + 153, 21, 230, -1, 74, 178, 230, 153, 21, 230, + 157, 237, 159, -1, 74, 178, 230, 153, 21, 230, + 157, 159, -1, 75, 182, 189, 230, 155, 241, 156, + 36, 21, 230, 235, 21, 230, -1, 235, -1, 76, + -1, 237, 178, 228, 153, 21, 230, -1, 178, 228, + 153, 21, 230, -1, 180, 243, -1, 191, 157, 230, + 153, 230, 159, -1, 239, 153, 157, 230, 153, 230, + 159, -1, 231, -1, 240, 153, 231, -1, 240, -1, + -1, 60, 59, -1, 59, -1, 169, 191, 230, 153, + 230, -1, 170, 191, 230, 153, 230, -1, 171, 191, + 230, 153, 230, -1, 103, 172, 191, 230, 153, 230, + -1, 104, 173, 191, 230, 153, 230, -1, 49, 231, + -1, 174, 231, 153, 231, -1, 175, 231, 36, 191, + -1, 112, 231, 153, 231, 153, 231, -1, 113, 231, + 153, 191, -1, 117, 231, 153, 191, -1, 118, 231, + 153, 191, -1, 114, 231, 153, 231, -1, 115, 231, + 153, 231, 153, 231, -1, 116, 231, 153, 231, 153, + 231, -1, 111, 239, -1, 242, 182, 189, 230, 155, + 241, 156, -1, 246, -1, 153, 240, -1, -1, 35, + -1, -1, 105, 191, 184, -1, 105, 191, 153, 15, + 230, 184, -1, 106, 191, 184, -1, 106, 191, 153, + 15, 230, 184, -1, 107, 231, -1, 245, 108, 191, + 230, -1, 245, 109, 231, 153, 191, 230, -1, 110, + 191, 230, 244, -1 }; +/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ +static const yytype_uint16 yyrline[] = +{ + 0, 1820, 1820, 1821, 1829, 1830, 1840, 1840, 1840, 1840, + 1840, 1840, 1840, 1840, 1840, 1840, 1840, 1844, 1844, 1844, + 1848, 1848, 1848, 1848, 1848, 1848, 1852, 1852, 1853, 1853, + 1854, 1854, 1855, 1855, 1856, 1856, 1860, 1860, 1861, 1861, + 1862, 1862, 1863, 1863, 1864, 1864, 1865, 1865, 1866, 1866, + 1867, 1868, 1871, 1871, 1871, 1871, 1875, 1875, 1875, 1875, + 1875, 1875, 1875, 1876, 1876, 1876, 1876, 1876, 1876, 1882, + 1882, 1882, 1882, 1886, 1886, 1886, 1886, 1890, 1890, 1894, + 1894, 1899, 1902, 1907, 1908, 1909, 1910, 1911, 1912, 1913, + 1914, 1918, 1919, 1920, 1921, 1922, 1923, 1924, 1925, 1935, + 1936, 1944, 1945, 1953, 1962, 1963, 1970, 1971, 1975, 1979, + 1995, 1996, 2003, 2004, 2011, 2019, 2019, 2019, 2019, 2019, + 2019, 2019, 2020, 2020, 2020, 2020, 2020, 2025, 2029, 2033, + 2038, 2047, 2074, 2080, 2093, 2104, 2108, 2121, 2125, 2139, + 2143, 2150, 2151, 2157, 2164, 2176, 2206, 2219, 2242, 2270, + 2292, 2303, 2325, 2336, 2345, 2350, 2409, 2416, 2424, 2431, + 2438, 2442, 2446, 2460, 2475, 2487, 2496, 2524, 2537, 2546, + 2552, 2558, 2569, 2575, 2581, 2592, 2593, 2602, 2603, 2615, + 2624, 2625, 2626, 2627, 2628, 2644, 2664, 2666, 2668, 2668, + 2675, 2675, 2683, 2683, 2691, 2691, 2700, 2702, 2704, 2709, + 2723, 2724, 2728, 2731, 2739, 2743, 2750, 2754, 2758, 2762, + 2770, 2770, 2774, 2775, 2779, 2787, 2792, 2800, 2801, 2808, + 2815, 2819, 3007, 3007, 3011, 3011, 3021, 3021, 3025, 3030, + 3031, 3032, 3036, 3037, 3036, 3049, 3050, 3055, 3056, 3057, + 3058, 3062, 3066, 3067, 3068, 3069, 3090, 3094, 3108, 3109, + 3114, 3114, 3122, 3132, 3135, 3144, 3155, 3160, 3169, 3180, + 3180, 3183, 3187, 3191, 3196, 3206, 3224, 3233, 3306, 3310, + 3317, 3329, 3344, 3374, 3384, 3394, 3398, 3405, 3406, 3410, + 3413, 3419, 3438, 3456, 3472, 3486, 3500, 3511, 3529, 3538, + 3547, 3554, 3575, 3599, 3605, 3611, 3617, 3633, 3725, 3733, + 3734, 3738, 3739, 3743, 3749, 3756, 3762, 3769, 3776, 3789, + 3809 +}; +#endif -#define YYLAST 1630 +#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. + First, the terminals, then, starting at YYNTOKENS, nonterminals. */ +static const char *const yytname[] = +{ + "$end", "error", "$undefined", "ESINT64VAL", "EUINT64VAL", "SINTVAL", + "UINTVAL", "FPVAL", "VOID", "BOOL", "SBYTE", "UBYTE", "SHORT", "USHORT", + "INT", "UINT", "LONG", "ULONG", "FLOAT", "DOUBLE", "TYPE", "LABEL", + "VAR_ID", "LABELSTR", "STRINGCONSTANT", "IMPLEMENTATION", + "ZEROINITIALIZER", "TRUETOK", "FALSETOK", "BEGINTOK", "ENDTOK", + "DECLARE", "GLOBAL", "CONSTANT", "SECTION", "VOLATILE", "TO", + "DOTDOTDOT", "NULL_TOK", "UNDEF", "CONST", "INTERNAL", "LINKONCE", + "WEAK", "APPENDING", "DLLIMPORT", "DLLEXPORT", "EXTERN_WEAK", "OPAQUE", + "NOT", "EXTERNAL", "TARGET", "TRIPLE", "ENDIAN", "POINTERSIZE", "LITTLE", + "BIG", "ALIGN", "DEPLIBS", "CALL", "TAIL", "ASM_TOK", "MODULE", + "SIDEEFFECT", "CC_TOK", "CCC_TOK", "CSRETCC_TOK", "FASTCC_TOK", + "COLDCC_TOK", "X86_STDCALLCC_TOK", "X86_FASTCALLCC_TOK", "DATALAYOUT", + "RET", "BR", "SWITCH", "INVOKE", "UNREACHABLE", "UNWIND", "EXCEPT", + "ADD", "SUB", "MUL", "DIV", "UDIV", "SDIV", "FDIV", "REM", "UREM", + "SREM", "FREM", "AND", "OR", "XOR", "SHL", "SHR", "ASHR", "LSHR", + "SETLE", "SETGE", "SETLT", "SETGT", "SETEQ", "SETNE", "ICMP", "FCMP", + "MALLOC", "ALLOCA", "FREE", "LOAD", "STORE", "GETELEMENTPTR", "PHI_TOK", + "SELECT", "VAARG", "EXTRACTELEMENT", "INSERTELEMENT", "SHUFFLEVECTOR", + "VAARG_old", "VANEXT_old", "EQ", "NE", "SLT", "SGT", "SLE", "SGE", "ULT", + "UGT", "ULE", "UGE", "OEQ", "ONE", "OLT", "OGT", "OLE", "OGE", "ORD", + "UNO", "UEQ", "UNE", "CAST", "TRUNC", "ZEXT", "SEXT", "FPTRUNC", "FPEXT", + "FPTOUI", "FPTOSI", "UITOFP", "SITOFP", "PTRTOINT", "INTTOPTR", + "BITCAST", "'='", "','", "'\\\\'", "'('", "')'", "'['", "'x'", "']'", + "'<'", "'>'", "'{'", "'}'", "'*'", "'c'", "$accept", "INTVAL", + "EINT64VAL", "ArithmeticOps", "LogicalOps", "SetCondOps", "IPredicates", + "FPredicates", "ShiftOps", "CastOps", "SIntType", "UIntType", "IntType", + "FPType", "OptAssign", "OptLinkage", "OptCallingConv", "OptAlign", + "OptCAlign", "SectionString", "OptSection", "GlobalVarAttributes", + "GlobalVarAttribute", "TypesV", "UpRTypesV", "Types", "PrimType", + "UpRTypes", "TypeListI", "ArgTypeListI", "ConstVal", "ConstExpr", + "ConstVector", "GlobalType", "Module", "FunctionList", "ConstPool", "@1", + "@2", "@3", "@4", "AsmBlock", "BigOrLittle", "TargetDefinition", + "LibrariesDefinition", "LibList", "Name", "OptName", "ArgVal", + "ArgListH", "ArgList", "FunctionHeaderH", "BEGIN", "FunctionHeader", + "@5", "END", "Function", "FnDeclareLinkage", "FunctionProto", "@6", "@7", + "OptSideEffect", "ConstValueRef", "SymbolicValueRef", "ValueRef", + "ResolvedVal", "BasicBlockList", "BasicBlock", "InstructionList", + "Unwind", "BBTerminatorInst", "JumpTable", "Inst", "PHIList", + "ValueRefList", "ValueRefListE", "OptTailCall", "InstVal", "IndexList", + "OptVolatile", "MemoryInst", 0 +}; +#endif +# ifdef YYPRINT +/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to + token YYLEX-NUM. */ +static const yytype_uint16 yytoknum[] = +{ + 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, + 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, + 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, + 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, + 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, + 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, + 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, + 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, + 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, + 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, + 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, + 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, + 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, + 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, + 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, + 405, 406, 61, 44, 92, 40, 41, 91, 120, 93, + 60, 62, 123, 125, 42, 99 +}; +# endif -static const short yytable[] = { 95, - 239, 225, 108, 240, 228, 221, 359, 195, 29, 109, - 49, 24, 50, 242, 27, 32, 576, 95, 199, 72, - 73, 424, 197, 75, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 426, 86, 18, 588, 19, 273, - 24, 450, 277, 278, 279, 280, 281, 282, 283, 586, - 231, 232, 233, 234, 235, 236, 237, 238, 203, 204, - 205, 594, 87, 425, 451, 287, 288, 388, 389, 224, - 461, 298, 224, 401, 403, 289, 425, 29, 466, 72, - 73, 299, 197, 75, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 418, 86, 18, 410, 19, 36, - 37, 38, 103, 104, 105, 271, 272, 224, 274, 275, - 224, 224, 224, 224, 224, 224, 224, 223, 39, 18, - 292, 19, 87, 199, 229, 298, 293, -138, 199, -111, - 284, 285, 286, 224, 224, 382, 230, -138, 202, 461, - 350, 351, 110, 461, 461, 41, 446, 478, 33, 465, - 462, 202, 352, 467, 231, 232, 233, 234, 235, 236, - 237, 238, 297, 461, 42, 196, -111, 301, 88, 447, - 48, 89, 202, 511, 90, 202, 91, 198, 52, 377, - 43, 100, 101, 353, 65, 360, 231, 232, 233, 234, - 235, 236, 237, 238, 66, 370, 371, 372, 95, 575, - 67, 5, 6, 7, 8, 44, 10, 45, 68, 354, - 46, 186, 187, 290, 291, 69, 501, 107, 529, 185, - 530, 379, 380, 306, 307, 383, 355, 189, 88, 190, - 375, 89, -71, -71, 90, 191, 91, 296, -178, -70, - -70, -112, -69, -69, 193, 95, 376, 224, -68, -68, - 194, 431, 226, 433, 434, 435, 308, 309, 121, 122, - 294, 441, 201, 3, 421, 422, 423, 295, -75, 4, - -74, -73, 429, -72, 335, -78, 311, -79, 312, 5, - 6, 7, 8, 9, 10, 11, 443, 444, 356, 358, - 361, 412, 456, 457, 458, 459, 460, 374, 362, 363, - 12, 364, 378, 587, 365, 468, 469, 470, 471, 472, - 366, 383, 54, 55, 56, 57, 58, 59, 60, 224, - 432, 224, 224, 224, 436, 437, 367, 464, 368, 224, - 442, 369, 373, 381, 404, 484, 384, 486, 385, 386, - 392, 490, 393, 394, 395, 396, 405, 406, 416, 494, - 495, 496, 407, 408, 502, 503, 409, 419, 476, 420, - 427, 509, 438, 333, 448, 430, 477, 348, 439, 440, - 445, 475, 348, 348, 454, 455, 479, 480, 482, 534, - 535, 536, 481, 224, 348, 483, 485, 489, 491, 499, - 522, 523, 497, 526, 527, 492, 493, 500, 516, 554, - 532, 498, 505, 506, 507, 542, 543, 544, 545, 538, - 508, 512, 547, 548, 549, 550, 510, 348, 513, 558, - 450, 473, 559, 546, 552, 425, 514, 348, 348, 348, - 515, 412, 521, 528, 531, 533, 539, 224, 239, 562, - 563, 240, 540, 541, 560, 555, 557, 224, 224, 224, - 556, 561, 564, 224, 565, 254, 255, 566, 567, 239, - 573, 574, 240, 568, 582, 569, 583, 584, 570, 571, - 572, 578, 551, 243, 244, 245, 246, 247, 248, 249, - 250, 251, 252, 579, 580, 585, 581, 224, 589, 590, - 591, 592, 593, 596, 597, 600, 348, 348, 348, 601, - 595, 605, 606, 47, 348, 174, 175, 599, 176, 177, - 390, 602, 603, 178, 63, 519, 391, 332, 348, 348, - 518, 71, 222, 25, 35, 598, 488, 537, 504, 0, - 0, 0, 0, 72, 73, 0, 197, 206, 207, 208, - 209, 210, 211, 212, 213, 214, 215, 216, 0, 86, - 18, 0, 19, 256, 257, 258, 259, 260, 261, 262, - 263, 264, 265, 266, 267, 268, 269, 348, 0, 348, - 72, 73, 0, 348, 0, 0, 87, 0, 0, 0, - 0, 348, 348, 348, 0, 0, -81, 18, 18, 19, - 19, 313, 0, 0, 0, 0, 0, 4, -81, -81, - 0, 0, 0, 314, 315, 0, 0, -81, -81, -81, - -81, -81, -81, -81, 0, 0, -81, 20, 0, 0, - 0, 0, 348, 348, 21, 348, 348, 0, 22, 0, - 0, 0, 348, 0, 0, 0, 0, 0, 0, 0, - 0, 348, 0, 0, 123, 124, 125, 126, 127, 128, - 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, - 139, 140, 141, 142, 143, 144, 145, 146, 316, 317, - 0, 0, 0, 0, 0, 318, 348, 319, 0, 320, - 321, 322, 88, 0, 0, 89, 0, 0, 90, 0, - 91, 402, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 161, 162, 163, 164, 165, 166, - 167, 168, 169, 170, 171, 172, 173, 348, 0, 0, - 0, 0, 323, 0, 0, 324, 0, 325, 0, 0, - 326, 0, 348, 0, 0, 0, 0, 0, 0, 348, - 0, 0, 0, 348, 348, 72, 73, 0, 197, 206, - 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, - 0, 86, 18, 0, 19, 0, 0, 0, 336, 337, - 72, 73, 338, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 18, 87, 19, - 0, 339, 340, 341, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 342, 343, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 344, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 123, 124, 125, 126, 127, 128, - 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, - 139, 140, 141, 142, 143, 144, 145, 146, 316, 317, - 0, 0, 0, 0, 0, 318, 0, 319, 0, 320, - 321, 322, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 88, 336, 337, 89, 0, 338, - 90, 0, 91, 463, 161, 162, 163, 164, 165, 166, - 167, 168, 169, 170, 171, 172, 173, 0, 339, 340, - 341, 0, 0, 0, 0, 345, 0, 0, 0, 0, - 342, 343, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 344, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 123, 124, 125, 126, 127, 128, 129, 130, 131, - 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, - 142, 143, 144, 145, 146, 316, 317, 0, 0, 0, - 0, 0, 318, 0, 319, 0, 320, 321, 322, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 161, 162, 163, 164, 165, 166, 167, 168, 169, - 170, 171, 172, 173, 0, 0, 0, 0, 0, 0, - 72, 73, 345, 197, 75, 76, 77, 78, 79, 80, - 81, 82, 83, 84, 85, 0, 86, 18, 0, 19, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 300, 0, 0, 0, 0, 0, 0, 0, - 0, 72, 73, 87, 197, 206, 207, 208, 209, 210, - 211, 212, 213, 214, 215, 216, 0, 86, 18, 0, - 19, 72, 73, 0, 197, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 0, 86, 18, 0, - 19, 0, 0, 0, 87, 0, 0, 0, 0, 0, - 0, 0, 0, 411, 0, 0, 0, 0, 0, 0, - 0, 0, 72, 73, 87, 197, 75, 76, 77, 78, - 79, 80, 81, 82, 83, 84, 85, 0, 86, 18, - 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 449, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 87, 0, 0, 0, 88, - 0, 0, 89, 0, 0, 90, 0, 91, 0, 72, - 73, 0, 197, 75, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 0, 86, 18, 0, 19, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 88, 517, 0, 89, 0, 397, 90, 0, 91, 0, - 0, 0, 87, 0, 0, 0, 0, 0, 0, 0, - 88, 0, 0, 89, 0, 0, 90, 0, 91, 72, - 73, 0, 74, 75, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 0, 86, 18, 0, 19, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 88, 0, 0, 89, 0, 0, 90, 0, 91, - 72, 73, 87, 197, 75, 76, 77, 78, 79, 80, - 81, 82, 83, 84, 85, 0, 86, 18, 0, 19, - 72, 73, 0, 197, 206, 207, 208, 209, 210, 211, - 212, 213, 214, 215, 216, 0, 86, 18, 0, 19, - 0, 0, 0, 87, 0, 0, 0, 0, 88, 0, - 0, 89, 0, 0, 90, 0, 91, 0, 0, 0, - 0, 72, 73, 87, 227, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 0, 86, 18, 0, - 19, 72, 73, 0, 197, 206, 207, 208, 209, 210, - 211, 212, 213, 214, 215, 216, 0, 86, 18, 0, - 19, 0, 0, 0, 87, 0, 0, 0, 88, 0, - 0, 89, 0, 0, 90, 0, 91, 0, 0, 0, - 0, 0, 0, 0, 87, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 88, - 0, 0, 89, 0, 0, 90, 0, 91, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 88, - 0, 0, 89, 0, 0, 90, 0, 91, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, - 88, 0, 0, 89, 0, 0, 90, 113, 91, 0, - 0, 0, 0, 0, 0, 0, 0, 114, 115, 0, - 88, 0, 0, 89, 0, 0, 90, 0, 400, 0, - 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, - 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, - 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, - 146, 147, 148, 149, 150, 151, 0, 0, 152, 153, - 154, 155, 156, 157, 158, 159, 160, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 161, 162, 163, - 164, 165, 166, 167, 168, 169, 170, 171, 172, 173 +/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const yytype_uint8 yyr1[] = +{ + 0, 166, 167, 167, 168, 168, 169, 169, 169, 169, + 169, 169, 169, 169, 169, 169, 169, 170, 170, 170, + 171, 171, 171, 171, 171, 171, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 173, 173, 173, 173, + 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, + 173, 173, 174, 174, 174, 174, 175, 175, 175, 175, + 175, 175, 175, 175, 175, 175, 175, 175, 175, 176, + 176, 176, 176, 177, 177, 177, 177, 178, 178, 179, + 179, 180, 180, 181, 181, 181, 181, 181, 181, 181, + 181, 182, 182, 182, 182, 182, 182, 182, 182, 183, + 183, 184, 184, 185, 186, 186, 187, 187, 188, 188, + 189, 189, 190, 190, 191, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 193, 193, 193, + 193, 193, 193, 193, 193, 193, 193, 193, 193, 194, + 194, 195, 195, 195, 195, 196, 196, 196, 196, 196, + 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, + 196, 196, 196, 197, 197, 197, 197, 197, 197, 197, + 197, 197, 197, 197, 197, 198, 198, 199, 199, 200, + 201, 201, 201, 201, 201, 202, 202, 202, 203, 202, + 204, 202, 205, 202, 206, 202, 202, 202, 202, 207, + 208, 208, 209, 209, 209, 209, 210, 211, 211, 211, + 212, 212, 213, 213, 214, 215, 215, 216, 216, 216, + 216, 217, 218, 218, 220, 219, 221, 221, 222, 223, + 223, 223, 225, 226, 224, 227, 227, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 229, 229, + 230, 230, 231, 232, 232, 233, 234, 234, 234, 235, + 235, 236, 236, 236, 236, 236, 236, 236, 236, 236, + 237, 237, 238, 239, 239, 240, 240, 241, 241, 242, + 242, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 244, + 244, 245, 245, 246, 246, 246, 246, 246, 246, 246, + 246 }; -static const short yycheck[] = { 43, - 118, 113, 61, 118, 116, 105, 272, 4, 23, 29, - 45, 2, 47, 119, 61, 30, 556, 61, 91, 5, - 6, 15, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 15, 21, 22, 577, 24, 151, - 31, 34, 154, 155, 156, 157, 158, 159, 160, 576, - 10, 11, 12, 13, 14, 15, 16, 17, 102, 103, - 104, 588, 48, 57, 57, 177, 178, 304, 305, 113, - 153, 153, 116, 324, 325, 181, 57, 23, 161, 5, - 6, 163, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 345, 21, 22, 334, 24, 52, - 53, 54, 45, 46, 47, 149, 150, 151, 152, 153, - 154, 155, 156, 157, 158, 159, 160, 108, 71, 22, - 153, 24, 48, 196, 9, 153, 159, 153, 201, 155, - 174, 175, 176, 177, 178, 163, 21, 163, 164, 153, - 229, 230, 162, 153, 153, 152, 159, 161, 163, 400, - 159, 164, 241, 163, 10, 11, 12, 13, 14, 15, - 16, 17, 196, 153, 61, 162, 155, 201, 154, 161, - 152, 157, 164, 163, 160, 164, 162, 163, 24, 291, - 20, 32, 33, 242, 152, 274, 10, 11, 12, 13, - 14, 15, 16, 17, 152, 284, 285, 286, 242, 159, - 152, 41, 42, 43, 44, 45, 46, 47, 152, 253, - 50, 55, 56, 108, 109, 157, 453, 4, 484, 24, - 486, 294, 295, 27, 28, 298, 270, 4, 154, 24, - 289, 157, 3, 4, 160, 24, 162, 163, 0, 3, - 4, 155, 3, 4, 4, 289, 290, 291, 3, 4, - 4, 363, 59, 365, 366, 367, 3, 4, 77, 78, - 158, 373, 155, 25, 353, 354, 355, 158, 4, 31, - 4, 4, 361, 4, 155, 7, 4, 7, 7, 41, - 42, 43, 44, 45, 46, 47, 375, 376, 153, 153, - 157, 335, 392, 393, 394, 395, 396, 36, 153, 153, - 62, 153, 24, 159, 153, 405, 406, 407, 408, 409, - 153, 384, 64, 65, 66, 67, 68, 69, 70, 363, - 364, 365, 366, 367, 368, 369, 153, 400, 153, 373, - 374, 153, 153, 161, 24, 424, 153, 426, 156, 153, - 155, 430, 155, 155, 155, 155, 155, 155, 63, 438, - 439, 440, 155, 155, 454, 455, 155, 153, 156, 153, - 153, 461, 153, 220, 161, 157, 24, 224, 153, 153, - 153, 153, 229, 230, 155, 155, 21, 21, 153, 491, - 492, 493, 155, 427, 241, 153, 4, 153, 153, 24, - 479, 480, 155, 482, 483, 153, 153, 4, 36, 24, - 489, 445, 153, 153, 153, 505, 506, 507, 508, 498, - 153, 153, 512, 513, 514, 515, 161, 274, 153, 531, - 34, 412, 159, 161, 57, 57, 153, 284, 285, 286, - 153, 475, 153, 153, 153, 153, 153, 481, 556, 539, - 540, 556, 153, 156, 533, 153, 156, 491, 492, 493, - 157, 156, 153, 497, 156, 27, 28, 153, 153, 577, - 4, 21, 577, 156, 564, 156, 566, 567, 156, 156, - 156, 36, 516, 119, 120, 121, 122, 123, 124, 125, - 126, 127, 128, 159, 156, 574, 156, 531, 21, 156, - 156, 156, 153, 21, 153, 21, 353, 354, 355, 21, - 589, 0, 0, 23, 361, 63, 63, 596, 63, 63, - 316, 600, 601, 63, 31, 476, 317, 220, 375, 376, - 475, 42, 106, 2, 17, 595, 427, 497, 456, -1, - -1, -1, -1, 5, 6, -1, 8, 9, 10, 11, - 12, 13, 14, 15, 16, 17, 18, 19, -1, 21, - 22, -1, 24, 125, 126, 127, 128, 129, 130, 131, - 132, 133, 134, 135, 136, 137, 138, 424, -1, 426, - 5, 6, -1, 430, -1, -1, 48, -1, -1, -1, - -1, 438, 439, 440, -1, -1, 20, 22, 22, 24, - 24, 26, -1, -1, -1, -1, -1, 31, 32, 33, - -1, -1, -1, 38, 39, -1, -1, 41, 42, 43, - 44, 45, 46, 47, -1, -1, 50, 51, -1, -1, - -1, -1, 479, 480, 58, 482, 483, -1, 62, -1, - -1, -1, 489, -1, -1, -1, -1, -1, -1, -1, - -1, 498, -1, -1, 79, 80, 81, 82, 83, 84, - 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, - 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, - -1, -1, -1, -1, -1, 110, 533, 112, -1, 114, - 115, 116, 154, -1, -1, 157, -1, -1, 160, -1, - 162, 163, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 139, 140, 141, 142, 143, 144, - 145, 146, 147, 148, 149, 150, 151, 574, -1, -1, - -1, -1, 157, -1, -1, 160, -1, 162, -1, -1, - 165, -1, 589, -1, -1, -1, -1, -1, -1, 596, - -1, -1, -1, 600, 601, 5, 6, -1, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - -1, 21, 22, -1, 24, -1, -1, -1, 3, 4, - 5, 6, 7, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 22, 48, 24, - -1, 26, 27, 28, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 38, 39, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 61, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 79, 80, 81, 82, 83, 84, - 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, - 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, - -1, -1, -1, -1, -1, 110, -1, 112, -1, 114, - 115, 116, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 154, 3, 4, 157, -1, 7, - 160, -1, 162, 163, 139, 140, 141, 142, 143, 144, - 145, 146, 147, 148, 149, 150, 151, -1, 26, 27, - 28, -1, -1, -1, -1, 160, -1, -1, -1, -1, - 38, 39, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 61, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 79, 80, 81, 82, 83, 84, 85, 86, 87, - 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, - 98, 99, 100, 101, 102, 103, 104, -1, -1, -1, - -1, -1, 110, -1, 112, -1, 114, 115, 116, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 139, 140, 141, 142, 143, 144, 145, 146, 147, - 148, 149, 150, 151, -1, -1, -1, -1, -1, -1, - 5, 6, 160, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, -1, 21, 22, -1, 24, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 37, -1, -1, -1, -1, -1, -1, -1, - -1, 5, 6, 48, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, -1, 21, 22, -1, - 24, 5, 6, -1, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, -1, 21, 22, -1, - 24, -1, -1, -1, 48, -1, -1, -1, -1, -1, - -1, -1, -1, 37, -1, -1, -1, -1, -1, -1, - -1, -1, 5, 6, 48, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, -1, 21, 22, - -1, 24, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 37, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 48, -1, -1, -1, 154, - -1, -1, 157, -1, -1, 160, -1, 162, -1, 5, - 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, -1, 21, 22, -1, 24, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 154, 37, -1, 157, -1, 159, 160, -1, 162, -1, - -1, -1, 48, -1, -1, -1, -1, -1, -1, -1, - 154, -1, -1, 157, -1, -1, 160, -1, 162, 5, - 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, -1, 21, 22, -1, 24, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 154, -1, -1, 157, -1, -1, 160, -1, 162, - 5, 6, 48, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, -1, 21, 22, -1, 24, - 5, 6, -1, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, -1, 21, 22, -1, 24, - -1, -1, -1, 48, -1, -1, -1, -1, 154, -1, - -1, 157, -1, -1, 160, -1, 162, -1, -1, -1, - -1, 5, 6, 48, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, -1, 21, 22, -1, - 24, 5, 6, -1, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, -1, 21, 22, -1, - 24, -1, -1, -1, 48, -1, -1, -1, 154, -1, - -1, 157, -1, -1, 160, -1, 162, -1, -1, -1, - -1, -1, -1, -1, 48, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 154, - -1, -1, 157, -1, -1, 160, -1, 162, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 154, - -1, -1, 157, -1, -1, 160, -1, 162, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 35, -1, -1, -1, -1, -1, -1, - 154, -1, -1, 157, -1, -1, 160, 49, 162, -1, - -1, -1, -1, -1, -1, -1, -1, 59, 60, -1, - 154, -1, -1, 157, -1, -1, 160, -1, 162, -1, - 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, - 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, - 102, 103, 104, 105, 106, 107, -1, -1, 110, 111, - 112, 113, 114, 115, 116, 117, 118, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 139, 140, 141, - 142, 143, 144, 145, 146, 147, 148, 149, 150, 151 +/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ +static const yytype_uint8 yyr2[] = +{ + 0, 2, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, + 0, 0, 1, 1, 1, 1, 1, 1, 2, 0, + 2, 0, 3, 2, 0, 1, 0, 3, 1, 2, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 2, 4, 5, 5, 3, 2, 5, 4, 2, 1, + 3, 1, 3, 1, 0, 4, 3, 3, 4, 4, + 3, 6, 5, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 6, 5, 8, 6, 6, 6, 7, + 7, 6, 6, 8, 8, 3, 1, 1, 1, 1, + 2, 2, 4, 2, 1, 4, 2, 4, 0, 7, + 0, 7, 0, 7, 0, 7, 3, 4, 0, 1, + 1, 1, 3, 3, 3, 3, 3, 3, 1, 0, + 1, 1, 1, 0, 2, 3, 1, 1, 3, 1, + 0, 8, 1, 1, 0, 4, 1, 1, 2, 0, + 1, 1, 0, 0, 5, 0, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 3, 1, 5, 1, 1, + 1, 1, 2, 2, 2, 3, 2, 0, 1, 1, + 1, 2, 2, 3, 9, 9, 8, 13, 1, 1, + 6, 5, 2, 6, 7, 1, 3, 1, 0, 2, + 1, 5, 5, 5, 6, 6, 2, 4, 4, 6, + 4, 4, 4, 4, 6, 6, 2, 7, 1, 2, + 0, 1, 0, 3, 6, 3, 6, 2, 4, 6, + 4 }; -/* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "/usr/share/bison.simple" -/* This file comes from bison-1.28. */ -/* Skeleton output parser for bison, - Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc. +/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state + STATE-NUM when YYTABLE doesn't specify something else to do. Zero + means the default is an error. */ +static const yytype_uint16 yydefact[] = +{ + 198, 0, 90, 184, 1, 183, 232, 83, 84, 85, + 86, 87, 88, 89, 0, 224, 257, 180, 181, 257, + 210, 211, 0, 0, 0, 90, 0, 186, 229, 0, + 91, 258, 254, 82, 226, 227, 228, 253, 0, 0, + 0, 0, 196, 0, 0, 0, 0, 0, 0, 0, + 81, 230, 231, 233, 199, 182, 0, 92, 93, 94, + 95, 96, 97, 0, 0, 302, 256, 0, 0, 0, + 0, 209, 197, 187, 2, 3, 111, 115, 116, 117, + 118, 119, 120, 121, 122, 123, 124, 125, 126, 128, + 0, 0, 0, 0, 248, 185, 0, 110, 127, 114, + 249, 129, 177, 178, 0, 0, 0, 0, 91, 98, + 0, 222, 223, 225, 301, 0, 280, 0, 0, 0, + 0, 91, 269, 259, 260, 6, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 52, + 53, 54, 55, 20, 21, 22, 23, 24, 25, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 68, 56, 57, 58, 59, 60, 61, + 62, 63, 64, 65, 66, 67, 0, 0, 0, 0, + 0, 268, 255, 91, 272, 0, 298, 204, 201, 200, + 202, 203, 205, 208, 0, 130, 0, 0, 0, 113, + 135, 139, 0, 144, 138, 192, 194, 190, 115, 116, + 117, 118, 119, 120, 121, 122, 123, 124, 125, 0, + 0, 0, 0, 188, 234, 0, 0, 286, 279, 262, + 261, 0, 0, 72, 76, 71, 75, 70, 74, 69, + 73, 77, 78, 0, 0, 26, 27, 28, 29, 30, + 31, 32, 33, 34, 35, 0, 50, 51, 46, 47, + 48, 49, 36, 37, 38, 39, 40, 41, 42, 43, + 44, 45, 0, 101, 101, 307, 0, 0, 296, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 206, 0, 0, 0, 0, + 0, 134, 143, 141, 0, 106, 106, 106, 160, 161, + 4, 5, 158, 159, 162, 157, 153, 154, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 156, 155, 106, 220, 237, 238, + 239, 244, 240, 241, 242, 243, 235, 0, 246, 251, + 250, 252, 0, 263, 0, 0, 0, 0, 0, 303, + 0, 305, 300, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 207, 112, 112, 137, 0, 140, 0, 131, 0, 193, + 195, 191, 0, 0, 0, 0, 0, 0, 0, 146, + 176, 0, 0, 0, 150, 0, 147, 0, 0, 0, + 0, 0, 189, 219, 213, 216, 217, 0, 236, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 310, 0, 0, 0, 290, 293, 0, 0, 291, 292, + 0, 0, 0, 287, 288, 0, 308, 0, 132, 133, + 136, 142, 0, 0, 108, 106, 0, 0, 300, 0, + 0, 0, 0, 0, 145, 135, 114, 0, 148, 149, + 0, 0, 0, 0, 0, 212, 214, 0, 104, 0, + 245, 0, 0, 278, 0, 0, 101, 102, 101, 275, + 299, 0, 0, 0, 0, 0, 281, 282, 283, 278, + 0, 103, 109, 107, 0, 0, 0, 0, 0, 0, + 0, 175, 152, 0, 0, 0, 0, 0, 0, 218, + 215, 105, 99, 0, 0, 0, 277, 0, 284, 285, + 0, 304, 306, 0, 0, 0, 289, 294, 295, 0, + 309, 0, 0, 164, 0, 0, 0, 0, 151, 0, + 0, 0, 0, 0, 0, 221, 247, 0, 0, 0, + 276, 273, 0, 297, 0, 0, 0, 172, 0, 0, + 166, 167, 168, 171, 163, 100, 0, 266, 0, 0, + 0, 274, 169, 170, 0, 0, 0, 264, 0, 265, + 0, 0, 165, 173, 174, 0, 0, 0, 0, 0, + 0, 271, 0, 0, 270, 267 +}; - 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. +/* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int16 yydefgoto[] = +{ + -1, 94, 312, 329, 330, 331, 255, 272, 332, 333, + 219, 220, 243, 221, 25, 15, 63, 555, 359, 454, + 522, 389, 455, 95, 96, 222, 98, 99, 202, 304, + 400, 348, 401, 104, 1, 2, 3, 336, 307, 305, + 306, 55, 190, 42, 72, 194, 100, 476, 415, 416, + 417, 64, 113, 16, 30, 36, 17, 53, 18, 28, + 108, 419, 349, 101, 351, 489, 19, 32, 33, 181, + 182, 579, 66, 278, 526, 527, 183, 184, 430, 185, + 186 +}; - 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. +/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ +#define YYPACT_NINF -542 +static const yytype_int16 yypact[] = +{ + -542, 13, 162, 567, -542, -542, -542, -542, -542, -542, + -542, -542, -542, -542, 83, -542, 19, -542, -542, -14, + -542, -542, 50, -87, 87, 233, 27, -542, 123, 141, + 175, -542, -542, 98, -542, -542, -542, -542, 33, 40, + 66, 68, -542, 14, 141, 1265, 156, 156, 156, 156, + -542, -542, -542, -542, -542, -542, 221, -542, -542, -542, + -542, -542, -542, 1265, -19, 1479, -542, 204, 135, 226, + 227, 235, -542, -542, -542, -542, 81, -542, -542, -542, + -542, -542, -542, -542, -542, -542, -542, -542, -542, -542, + 256, 257, 4, 15, -542, -542, 108, -542, -542, 12, + -542, -542, -542, -542, 1306, 1306, 1306, 1326, 175, -542, + 98, -542, -542, -542, -542, 1306, -542, 205, 1367, 116, + 479, 175, -542, -542, -542, -542, -542, -542, -542, -542, + -542, -542, -542, -542, -542, -542, -542, -542, -542, -542, + -542, -542, -542, -542, -542, -542, -542, -542, -542, 355, + 429, 1306, 1306, 1306, 1306, 1306, 1306, 1306, 1306, 1306, + 1306, 1306, 1306, -542, -542, -542, -542, -542, -542, -542, + -542, -542, -542, -542, -542, -542, 1306, 1306, 1306, 1306, + 1306, -542, -542, 175, -542, 86, -542, -542, -542, -542, + -542, -542, -542, -542, -13, -542, 110, 111, 75, -542, + -542, 12, -81, 1046, -542, -542, -542, -542, 174, 208, + 266, 210, 267, 212, 268, 230, 277, 275, 278, 246, + 280, 279, 566, -542, -542, 136, 766, -542, -542, 81, + -542, 766, 766, -542, -542, -542, -542, -542, -542, -542, + -542, -542, -542, 766, 1265, -542, -542, -542, -542, -542, + -542, -542, -542, -542, -542, 1306, -542, -542, -542, -542, + -542, -542, -542, -542, -542, -542, -542, -542, -542, -542, + -542, -542, 1306, 137, 145, -542, 766, 132, 146, 147, + 148, 149, 151, 152, 158, 160, 766, 766, 766, 161, + 281, 1265, 1306, 1306, 291, -542, 1306, 1306, 155, -27, + 1306, -542, -542, 165, 163, 176, 176, 176, -542, -542, + -542, -542, -542, -542, -542, -542, -542, -542, 355, 429, + 172, 177, 178, 179, 182, 1087, 1387, 529, 311, 184, + 185, 186, 188, 189, -542, -542, 176, 1107, -542, -542, + -542, -542, -542, -542, -542, -542, 282, 1326, -542, -542, + -542, -542, 193, -542, 194, 766, 766, 766, 7, -542, + 20, -542, 195, 766, 192, 1306, 1306, 1306, 1306, 1306, + 1306, 1306, 200, 201, 206, 1306, 1306, 766, 766, 207, + -542, -59, -149, -542, 196, 12, 1148, -542, 44, -542, + -542, -542, 203, 211, 1326, 1326, 1326, 1326, 1326, -542, + -542, -8, 741, -82, -542, 10, -542, 1326, 1326, 1326, + 1326, 1326, -542, -542, 98, -542, 214, 209, -542, 337, + -34, 342, 348, 215, 218, 219, 766, 371, 766, 1306, + -542, 223, 766, 224, -542, -542, 225, 234, -542, -542, + 766, 766, 766, -542, -542, 228, -542, 1306, -542, -542, + -542, -542, 362, 375, -542, 176, 1326, 1326, 195, 236, + 237, 240, 243, 1326, -542, 238, -25, 11, -542, -542, + 244, 245, 247, 250, 352, -542, -542, 1205, 370, 252, + -542, 766, 766, 1306, 766, 766, 258, -542, 258, -542, + 259, 766, 264, 1306, 1306, 1306, -542, -542, -542, 1306, + 766, -542, -542, -542, 270, 271, 263, 1326, 1326, 1326, + 1326, -542, -542, 260, 1326, 1326, 1326, 1326, 1306, -542, + -542, -542, 368, 402, 274, 276, 259, 287, -542, -542, + 374, -542, -542, 1306, 285, 766, -542, -542, -542, 290, + -542, 1326, 1326, -542, 283, 295, 284, 294, -542, 296, + 297, 299, 302, 303, 430, -542, -542, 414, 41, 425, + -542, -542, 305, -542, 306, 310, 1326, -542, 1326, 1326, + -542, -542, -542, -542, -542, -542, 766, -542, 893, 144, + 448, -542, -542, -542, 314, 315, 316, -542, 331, -542, + 893, 766, -542, -542, -542, 464, 334, 180, 766, 481, + 482, -542, 766, 766, -542, -542 +}; - 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., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ +/* YYPGOTO[NTERM-NUM]. */ +static const yytype_int16 yypgoto[] = +{ + -542, -542, -542, 435, 439, 441, 191, 197, 442, 445, + -119, -116, -541, -542, 478, 489, -107, -542, -267, 37, + -542, -238, -542, -60, -542, -45, -542, -74, -51, -542, + -101, 300, -252, 134, -542, -542, -542, -542, -542, -542, + -542, 473, -542, -542, -542, -542, 8, -542, 46, -542, + -542, 410, -542, -542, -542, -542, -542, -542, 518, -542, + -542, -542, -528, 142, -90, -113, -542, 505, -542, -72, + -542, -542, -542, -542, 97, 28, -542, -542, 70, -542, + -542 +}; -/* As a special exception, when this file is copied by Bison into a - Bison output file, you may use that output file without restriction. - This special exception was added by the Free Software Foundation - in version 1.24 of Bison. */ - -/* This is the parser code that is written into each bison parser - when the %semantic_parser declaration is not specified in the grammar. - It was written by Richard Stallman by simplifying the hairy parser - used when %semantic_parser is specified. */ - -#ifndef YYSTACK_USE_ALLOCA -#ifdef alloca -#define YYSTACK_USE_ALLOCA -#else /* alloca not defined */ -#ifdef __GNUC__ -#define YYSTACK_USE_ALLOCA -#define alloca __builtin_alloca -#else /* not GNU C. */ -#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386)) -#define YYSTACK_USE_ALLOCA -#include -#else /* not sparc */ -/* We think this test detects Watcom and Microsoft C. */ -/* This used to test MSDOS, but that is a bad idea - since that symbol is in the user namespace. */ -#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__) -#if 0 /* No need for malloc.h, which pollutes the namespace; - instead, just don't use alloca. */ -#include -#endif -#else /* not MSDOS, or __TURBOC__ */ -#if defined(_AIX) -/* I don't know what this was needed for, but it pollutes the namespace. - So I turned it off. rms, 2 May 1997. */ -/* #include */ - #pragma alloca -#define YYSTACK_USE_ALLOCA -#else /* not MSDOS, or __TURBOC__, or _AIX */ -#if 0 -#ifdef __hpux /* haible at ilog.fr says this works for HPUX 9.05 and up, - and on HPUX 10. Eventually we can turn this on. */ -#define YYSTACK_USE_ALLOCA -#define alloca __builtin_alloca -#endif /* __hpux */ -#endif -#endif /* not _AIX */ -#endif /* not MSDOS, or __TURBOC__ */ -#endif /* not sparc */ -#endif /* not GNU C */ -#endif /* alloca not defined */ -#endif /* YYSTACK_USE_ALLOCA not defined */ +/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule which + number is the opposite. If zero, do what YYDEFACT says. + If YYTABLE_NINF, syntax error. */ +#define YYTABLE_NINF -180 +static const yytype_int16 yytable[] = +{ + 97, 241, 227, 110, 242, 230, 223, 361, 197, 31, + 111, 26, 449, 4, 244, 204, 34, 578, 97, 201, + 74, 75, 426, 199, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 87, 428, 88, 20, 590, 21, + 275, 26, 31, 279, 280, 281, 282, 283, 284, 285, + 588, 233, 234, 235, 236, 237, 238, 239, 240, 205, + 206, 207, 596, 89, 427, 43, 289, 290, 390, 391, + 226, 463, 300, 226, 403, 405, 291, 427, 452, 468, + 74, 75, 301, 199, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 87, 420, 88, 20, 412, 21, + 448, 453, 38, 39, 40, 204, 273, 274, 226, 276, + 277, 226, 226, 226, 226, 226, 226, 226, 225, 463, + 20, 41, 21, 89, 201, 231, 300, 480, -139, 201, + -112, 286, 287, 288, 226, 226, 384, 232, -139, 204, + 294, 352, 353, 112, 29, 463, 295, 299, 44, 35, + 467, 464, 303, 354, 233, 234, 235, 236, 237, 238, + 239, 240, -179, 463, 463, 54, 198, -112, 51, 90, + 52, 71, 91, 469, 513, 92, 204, 93, 200, 50, + 379, 105, 106, 107, 355, 67, 362, 5, 102, 103, + 188, 189, 68, 6, 292, 293, 372, 373, 374, 97, + 577, 308, 309, 7, 8, 9, 10, 11, 12, 13, + 356, -72, -72, -71, -71, -70, -70, 503, 69, 531, + 70, 532, 381, 382, 14, 109, 385, 357, 187, 90, + 191, 377, 91, -69, -69, 92, -113, 93, 298, 56, + 57, 58, 59, 60, 61, 62, 97, 378, 226, 310, + 311, 192, 433, 45, 435, 436, 437, 123, 124, 193, + 195, 196, 443, 203, 228, 423, 424, 425, 296, 297, + -76, -75, -74, 431, 7, 8, 9, 10, 46, 12, + 47, -73, -79, 48, 313, -80, 314, 445, 446, 363, + 358, 337, 414, 458, 459, 460, 461, 462, 360, 364, + 365, 366, 367, 589, 368, 369, 470, 471, 472, 473, + 474, 370, 385, 371, 375, 380, 383, 376, 386, 387, + 226, 434, 226, 226, 226, 438, 439, 394, 466, 388, + 226, 444, 395, 396, 397, 406, 486, 398, 488, 407, + 408, 409, 492, 410, 411, 418, 421, 422, 429, 432, + 496, 497, 498, 440, 441, 504, 505, 450, 456, 442, + 447, 479, 511, 481, 335, 478, 457, 477, 350, 482, + 483, 484, 485, 350, 350, 487, 491, 493, 494, 502, + 536, 537, 538, 499, 226, 350, 501, 495, 518, 507, + 508, 524, 525, 509, 528, 529, 510, 514, 515, 512, + 516, 534, 500, 517, 452, 523, 544, 545, 546, 547, + 540, 530, 533, 549, 550, 551, 552, 535, 350, 543, + 560, 548, 475, 541, 542, 554, 556, 557, 350, 350, + 350, 427, 414, 558, 575, 576, 566, 568, 226, 241, + 564, 565, 242, 559, 561, 562, 563, 569, 226, 226, + 226, 567, 570, 571, 226, 572, 256, 257, 573, 574, + 241, 580, 582, 242, 581, 584, 583, 585, 586, 591, + 592, 593, 594, 553, 245, 246, 247, 248, 249, 250, + 251, 252, 253, 254, 595, 598, 587, 599, 226, 233, + 234, 235, 236, 237, 238, 239, 240, 350, 350, 350, + 176, 597, 602, 603, 177, 350, 178, 179, 601, 392, + 180, 65, 604, 605, 49, 521, 393, 73, 224, 350, + 350, 27, 334, 520, 37, 600, 490, 539, 506, 0, + 0, 0, 0, 0, 74, 75, 0, 199, 208, 209, + 210, 211, 212, 213, 214, 215, 216, 217, 218, 0, + 88, 20, 0, 21, 258, 259, 260, 261, 262, 263, + 264, 265, 266, 267, 268, 269, 270, 271, 350, 0, + 350, 74, 75, 0, 350, 0, 0, 89, 0, 0, + 0, 0, 350, 350, 350, 0, 0, -82, 20, 20, + 21, 21, 315, 0, 0, 0, 0, 0, 6, -82, + -82, 0, 0, 0, 316, 317, 0, 0, -82, -82, + -82, -82, -82, -82, -82, 0, 0, -82, 22, 0, + 0, 0, 0, 350, 350, 23, 350, 350, 0, 24, + 0, 0, 0, 350, 0, 0, 0, 0, 0, 0, + 0, 0, 350, 0, 0, 125, 126, 127, 128, 129, + 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, + 140, 141, 142, 143, 144, 145, 146, 147, 148, 318, + 319, 0, 0, 0, 0, 0, 320, 350, 321, 0, + 322, 323, 324, 90, 0, 0, 91, 0, 0, 92, + 0, 93, 404, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 163, 164, 165, 166, 167, + 168, 169, 170, 171, 172, 173, 174, 175, 350, 0, + 0, 0, 0, 325, 0, 0, 326, 0, 327, 0, + 0, 328, 0, 350, 0, 0, 0, 0, 0, 0, + 350, 0, 0, 0, 350, 350, 74, 75, 0, 199, + 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, + 218, 0, 88, 20, 0, 21, 0, 0, 0, 338, + 339, 74, 75, 340, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 20, 89, + 21, 0, 341, 342, 343, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 344, 345, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 346, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 125, 126, 127, 128, 129, + 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, + 140, 141, 142, 143, 144, 145, 146, 147, 148, 318, + 319, 0, 0, 0, 0, 0, 320, 0, 321, 0, + 322, 323, 324, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 90, 338, 339, 91, 0, + 340, 92, 0, 93, 465, 163, 164, 165, 166, 167, + 168, 169, 170, 171, 172, 173, 174, 175, 0, 341, + 342, 343, 0, 0, 0, 0, 347, 0, 0, 0, + 0, 344, 345, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 346, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 125, 126, 127, 128, 129, 130, 131, 132, + 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, + 143, 144, 145, 146, 147, 148, 318, 319, 0, 0, + 0, 0, 0, 320, 0, 321, 0, 322, 323, 324, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 163, 164, 165, 166, 167, 168, 169, 170, + 171, 172, 173, 174, 175, 0, 0, 0, 0, 0, + 0, 74, 75, 347, 199, 77, 78, 79, 80, 81, + 82, 83, 84, 85, 86, 87, 0, 88, 20, 0, + 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 302, 0, 0, 0, 0, 0, 0, + 0, 0, 74, 75, 89, 199, 208, 209, 210, 211, + 212, 213, 214, 215, 216, 217, 218, 0, 88, 20, + 0, 21, 74, 75, 0, 199, 77, 78, 79, 80, + 81, 82, 83, 84, 85, 86, 87, 0, 88, 20, + 0, 21, 0, 0, 0, 89, 0, 0, 0, 0, + 0, 0, 0, 0, 413, 0, 0, 0, 0, 0, + 0, 0, 0, 74, 75, 89, 199, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 87, 0, 88, + 20, 0, 21, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 451, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 89, 0, 0, 0, + 90, 0, 0, 91, 0, 0, 92, 0, 93, 0, + 74, 75, 0, 199, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 87, 0, 88, 20, 0, 21, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 90, 519, 0, 91, 0, 399, 92, 0, 93, + 0, 0, 0, 89, 0, 0, 0, 0, 0, 0, + 0, 90, 0, 0, 91, 0, 0, 92, 0, 93, + 74, 75, 0, 76, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 87, 0, 88, 20, 0, 21, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 90, 0, 0, 91, 0, 0, 92, 0, + 93, 74, 75, 89, 199, 77, 78, 79, 80, 81, + 82, 83, 84, 85, 86, 87, 0, 88, 20, 0, + 21, 74, 75, 0, 199, 208, 209, 210, 211, 212, + 213, 214, 215, 216, 217, 218, 0, 88, 20, 0, + 21, 0, 0, 0, 89, 0, 0, 0, 0, 90, + 0, 0, 91, 0, 0, 92, 0, 93, 0, 0, + 0, 0, 74, 75, 89, 229, 77, 78, 79, 80, + 81, 82, 83, 84, 85, 86, 87, 0, 88, 20, + 0, 21, 74, 75, 0, 199, 208, 209, 210, 211, + 212, 213, 214, 215, 216, 217, 218, 0, 88, 20, + 0, 21, 0, 0, 0, 89, 0, 0, 0, 90, + 0, 0, 91, 0, 0, 92, 0, 93, 0, 0, + 0, 0, 0, 0, 0, 89, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 90, 0, 0, 91, 0, 0, 92, 0, 93, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 90, 0, 0, 91, 0, 0, 92, 0, 93, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 114, 0, 0, 0, 0, 0, + 0, 90, 0, 0, 91, 0, 0, 92, 115, 93, + 0, 0, 0, 0, 0, 0, 0, 0, 116, 117, + 0, 90, 0, 0, 91, 0, 0, 92, 0, 402, + 0, 118, 119, 120, 121, 122, 123, 124, 125, 126, + 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, + 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, + 147, 148, 149, 150, 151, 152, 153, 0, 0, 154, + 155, 156, 157, 158, 159, 160, 161, 162, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 163, 164, + 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, + 175 +}; -#ifdef YYSTACK_USE_ALLOCA -#define YYSTACK_ALLOC alloca -#else -#define YYSTACK_ALLOC malloc -#endif +static const yytype_int16 yycheck[] = +{ + 45, 120, 115, 63, 120, 118, 107, 274, 4, 23, + 29, 3, 161, 0, 121, 164, 30, 558, 63, 93, + 5, 6, 15, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 15, 21, 22, 579, 24, + 153, 33, 23, 156, 157, 158, 159, 160, 161, 162, + 578, 10, 11, 12, 13, 14, 15, 16, 17, 104, + 105, 106, 590, 48, 57, 152, 179, 180, 306, 307, + 115, 153, 153, 118, 326, 327, 183, 57, 34, 161, + 5, 6, 163, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 347, 21, 22, 336, 24, + 159, 57, 52, 53, 54, 164, 151, 152, 153, 154, + 155, 156, 157, 158, 159, 160, 161, 162, 110, 153, + 22, 71, 24, 48, 198, 9, 153, 161, 153, 203, + 155, 176, 177, 178, 179, 180, 163, 21, 163, 164, + 153, 231, 232, 162, 61, 153, 159, 198, 61, 163, + 402, 159, 203, 243, 10, 11, 12, 13, 14, 15, + 16, 17, 0, 153, 153, 24, 162, 155, 45, 154, + 47, 157, 157, 163, 163, 160, 164, 162, 163, 152, + 293, 47, 48, 49, 244, 152, 276, 25, 32, 33, + 55, 56, 152, 31, 108, 109, 286, 287, 288, 244, + 159, 27, 28, 41, 42, 43, 44, 45, 46, 47, + 255, 3, 4, 3, 4, 3, 4, 455, 152, 486, + 152, 488, 296, 297, 62, 4, 300, 272, 24, 154, + 4, 291, 157, 3, 4, 160, 155, 162, 163, 64, + 65, 66, 67, 68, 69, 70, 291, 292, 293, 3, + 4, 24, 365, 20, 367, 368, 369, 77, 78, 24, + 4, 4, 375, 155, 59, 355, 356, 357, 158, 158, + 4, 4, 4, 363, 41, 42, 43, 44, 45, 46, + 47, 4, 7, 50, 4, 7, 7, 377, 378, 157, + 153, 155, 337, 394, 395, 396, 397, 398, 153, 153, + 153, 153, 153, 159, 153, 153, 407, 408, 409, 410, + 411, 153, 386, 153, 153, 24, 161, 36, 153, 156, + 365, 366, 367, 368, 369, 370, 371, 155, 402, 153, + 375, 376, 155, 155, 155, 24, 426, 155, 428, 155, + 155, 155, 432, 155, 155, 63, 153, 153, 153, 157, + 440, 441, 442, 153, 153, 456, 457, 161, 155, 153, + 153, 24, 463, 21, 222, 156, 155, 153, 226, 21, + 155, 153, 153, 231, 232, 4, 153, 153, 153, 4, + 493, 494, 495, 155, 429, 243, 24, 153, 36, 153, + 153, 481, 482, 153, 484, 485, 153, 153, 153, 161, + 153, 491, 447, 153, 34, 153, 507, 508, 509, 510, + 500, 153, 153, 514, 515, 516, 517, 153, 276, 156, + 533, 161, 414, 153, 153, 57, 24, 153, 286, 287, + 288, 57, 477, 157, 4, 21, 153, 153, 483, 558, + 541, 542, 558, 156, 159, 535, 156, 153, 493, 494, + 495, 156, 156, 156, 499, 156, 27, 28, 156, 156, + 579, 36, 156, 579, 159, 566, 156, 568, 569, 21, + 156, 156, 156, 518, 119, 120, 121, 122, 123, 124, + 125, 126, 127, 128, 153, 21, 576, 153, 533, 10, + 11, 12, 13, 14, 15, 16, 17, 355, 356, 357, + 65, 591, 21, 21, 65, 363, 65, 65, 598, 318, + 65, 33, 602, 603, 25, 478, 319, 44, 108, 377, + 378, 3, 222, 477, 19, 597, 429, 499, 458, -1, + -1, -1, -1, -1, 5, 6, -1, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, -1, + 21, 22, -1, 24, 125, 126, 127, 128, 129, 130, + 131, 132, 133, 134, 135, 136, 137, 138, 426, -1, + 428, 5, 6, -1, 432, -1, -1, 48, -1, -1, + -1, -1, 440, 441, 442, -1, -1, 20, 22, 22, + 24, 24, 26, -1, -1, -1, -1, -1, 31, 32, + 33, -1, -1, -1, 38, 39, -1, -1, 41, 42, + 43, 44, 45, 46, 47, -1, -1, 50, 51, -1, + -1, -1, -1, 481, 482, 58, 484, 485, -1, 62, + -1, -1, -1, 491, -1, -1, -1, -1, -1, -1, + -1, -1, 500, -1, -1, 79, 80, 81, 82, 83, + 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, + 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, + 104, -1, -1, -1, -1, -1, 110, 535, 112, -1, + 114, 115, 116, 154, -1, -1, 157, -1, -1, 160, + -1, 162, 163, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 139, 140, 141, 142, 143, + 144, 145, 146, 147, 148, 149, 150, 151, 576, -1, + -1, -1, -1, 157, -1, -1, 160, -1, 162, -1, + -1, 165, -1, 591, -1, -1, -1, -1, -1, -1, + 598, -1, -1, -1, 602, 603, 5, 6, -1, 8, + 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + 19, -1, 21, 22, -1, 24, -1, -1, -1, 3, + 4, 5, 6, 7, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 22, 48, + 24, -1, 26, 27, 28, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 38, 39, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 61, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 79, 80, 81, 82, 83, + 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, + 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, + 104, -1, -1, -1, -1, -1, 110, -1, 112, -1, + 114, 115, 116, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 154, 3, 4, 157, -1, + 7, 160, -1, 162, 163, 139, 140, 141, 142, 143, + 144, 145, 146, 147, 148, 149, 150, 151, -1, 26, + 27, 28, -1, -1, -1, -1, 160, -1, -1, -1, + -1, 38, 39, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 61, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 79, 80, 81, 82, 83, 84, 85, 86, + 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, + 97, 98, 99, 100, 101, 102, 103, 104, -1, -1, + -1, -1, -1, 110, -1, 112, -1, 114, 115, 116, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 139, 140, 141, 142, 143, 144, 145, 146, + 147, 148, 149, 150, 151, -1, -1, -1, -1, -1, + -1, 5, 6, 160, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, -1, 21, 22, -1, + 24, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 37, -1, -1, -1, -1, -1, -1, + -1, -1, 5, 6, 48, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, -1, 21, 22, + -1, 24, 5, 6, -1, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, -1, 21, 22, + -1, 24, -1, -1, -1, 48, -1, -1, -1, -1, + -1, -1, -1, -1, 37, -1, -1, -1, -1, -1, + -1, -1, -1, 5, 6, 48, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, -1, 21, + 22, -1, 24, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 37, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 48, -1, -1, -1, + 154, -1, -1, 157, -1, -1, 160, -1, 162, -1, + 5, 6, -1, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, -1, 21, 22, -1, 24, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 154, 37, -1, 157, -1, 159, 160, -1, 162, + -1, -1, -1, 48, -1, -1, -1, -1, -1, -1, + -1, 154, -1, -1, 157, -1, -1, 160, -1, 162, + 5, 6, -1, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, -1, 21, 22, -1, 24, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 154, -1, -1, 157, -1, -1, 160, -1, + 162, 5, 6, 48, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, -1, 21, 22, -1, + 24, 5, 6, -1, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, -1, 21, 22, -1, + 24, -1, -1, -1, 48, -1, -1, -1, -1, 154, + -1, -1, 157, -1, -1, 160, -1, 162, -1, -1, + -1, -1, 5, 6, 48, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, -1, 21, 22, + -1, 24, 5, 6, -1, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, -1, 21, 22, + -1, 24, -1, -1, -1, 48, -1, -1, -1, 154, + -1, -1, 157, -1, -1, 160, -1, 162, -1, -1, + -1, -1, -1, -1, -1, 48, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 154, -1, -1, 157, -1, -1, 160, -1, 162, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 154, -1, -1, 157, -1, -1, 160, -1, 162, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 35, -1, -1, -1, -1, -1, + -1, 154, -1, -1, 157, -1, -1, 160, 49, 162, + -1, -1, -1, -1, -1, -1, -1, -1, 59, 60, + -1, 154, -1, -1, 157, -1, -1, 160, -1, 162, + -1, 72, 73, 74, 75, 76, 77, 78, 79, 80, + 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, + 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, + 101, 102, 103, 104, 105, 106, 107, -1, -1, 110, + 111, 112, 113, 114, 115, 116, 117, 118, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 139, 140, + 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, + 151 +}; -/* Note: there must be only one dollar sign in this file. - It is replaced by the list of actions, each action - as one case of the switch. */ +/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ +static const yytype_uint8 yystos[] = +{ + 0, 200, 201, 202, 0, 25, 31, 41, 42, 43, + 44, 45, 46, 47, 62, 181, 219, 222, 224, 232, + 22, 24, 51, 58, 62, 180, 212, 224, 225, 61, + 220, 23, 233, 234, 30, 163, 221, 233, 52, 53, + 54, 71, 209, 152, 61, 20, 45, 47, 50, 181, + 152, 45, 47, 223, 24, 207, 64, 65, 66, 67, + 68, 69, 70, 182, 217, 180, 238, 152, 152, 152, + 152, 157, 210, 207, 5, 6, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, 21, 48, + 154, 157, 160, 162, 167, 189, 190, 191, 192, 193, + 212, 229, 32, 33, 199, 199, 199, 199, 226, 4, + 189, 29, 162, 218, 35, 49, 59, 60, 72, 73, + 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, + 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, + 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, + 104, 105, 106, 107, 110, 111, 112, 113, 114, 115, + 116, 117, 118, 139, 140, 141, 142, 143, 144, 145, + 146, 147, 148, 149, 150, 151, 169, 170, 171, 174, + 175, 235, 236, 242, 243, 245, 246, 24, 55, 56, + 208, 4, 24, 24, 211, 4, 4, 4, 162, 8, + 163, 193, 194, 155, 164, 191, 191, 191, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 176, + 177, 179, 191, 196, 217, 212, 191, 231, 59, 8, + 231, 9, 21, 10, 11, 12, 13, 14, 15, 16, + 17, 176, 177, 178, 182, 119, 120, 121, 122, 123, + 124, 125, 126, 127, 128, 172, 27, 28, 125, 126, + 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, + 137, 138, 173, 191, 191, 231, 191, 191, 239, 231, + 231, 231, 231, 231, 231, 231, 191, 191, 191, 231, + 231, 182, 108, 109, 153, 159, 158, 158, 163, 194, + 153, 163, 37, 194, 195, 205, 206, 204, 27, 28, + 3, 4, 168, 4, 7, 26, 38, 39, 103, 104, + 110, 112, 114, 115, 116, 157, 160, 162, 165, 169, + 170, 171, 174, 175, 197, 229, 203, 155, 3, 4, + 7, 26, 27, 28, 38, 39, 61, 160, 197, 228, + 229, 230, 230, 230, 230, 189, 191, 191, 153, 184, + 153, 184, 230, 157, 153, 153, 153, 153, 153, 153, + 153, 153, 230, 230, 230, 153, 36, 189, 191, 231, + 24, 193, 193, 161, 163, 193, 153, 156, 153, 187, + 187, 187, 172, 173, 155, 155, 155, 155, 155, 159, + 196, 198, 162, 198, 163, 198, 24, 155, 155, 155, + 155, 155, 187, 37, 191, 214, 215, 216, 63, 227, + 198, 153, 153, 230, 230, 230, 15, 57, 15, 153, + 244, 230, 157, 231, 191, 231, 231, 231, 191, 191, + 153, 153, 153, 231, 191, 230, 230, 153, 159, 161, + 161, 37, 34, 57, 185, 188, 155, 155, 196, 196, + 196, 196, 196, 153, 159, 163, 193, 198, 161, 163, + 196, 196, 196, 196, 196, 212, 213, 153, 156, 24, + 161, 21, 21, 155, 153, 153, 230, 4, 230, 231, + 240, 153, 230, 153, 153, 153, 230, 230, 230, 155, + 191, 24, 4, 187, 196, 196, 244, 153, 153, 153, + 153, 196, 161, 163, 153, 153, 153, 153, 36, 37, + 214, 185, 186, 153, 230, 230, 240, 241, 230, 230, + 153, 184, 184, 153, 230, 153, 231, 231, 231, 241, + 230, 153, 153, 156, 196, 196, 196, 196, 161, 196, + 196, 196, 196, 191, 57, 183, 24, 153, 157, 156, + 231, 159, 230, 156, 196, 196, 153, 156, 153, 153, + 156, 156, 156, 156, 156, 4, 21, 159, 178, 237, + 36, 159, 156, 156, 196, 196, 196, 230, 228, 159, + 178, 21, 156, 156, 156, 153, 228, 230, 21, 153, + 235, 230, 21, 21, 230, 230 +}; #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = YYEMPTY) -#define YYEMPTY -2 +#define YYEMPTY (-2) #define YYEOF 0 + #define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrlab1 -/* Like YYERROR except do call yyerror. - This remains here temporarily to ease the - transition to the new meaning of YYERROR, for GCC. +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab + + +/* Like YYERROR except do call yyerror. This remains here temporarily + to ease the transition to the new meaning of YYERROR, for GCC. Once GCC version 2 has supplanted version 1, this can go. */ + #define YYFAIL goto yyerrlab + #define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(token, value) \ + +#define YYBACKUP(Token, Value) \ do \ if (yychar == YYEMPTY && yylen == 1) \ - { yychar = (token), yylval = (value); \ - yychar1 = YYTRANSLATE (yychar); \ - YYPOPSTACK; \ + { \ + yychar = (Token); \ + yylval = (Value); \ + yytoken = YYTRANSLATE (yychar); \ + YYPOPSTACK (1); \ goto yybackup; \ } \ else \ - { yyerror ("syntax error: cannot back up"); YYERROR; } \ -while (0) + { \ + yyerror (YY_("syntax error: cannot back up")); \ + YYERROR; \ + } \ +while (YYID (0)) + #define YYTERROR 1 #define YYERRCODE 256 -#ifndef YYPURE -#define YYLEX yylex() + +/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. + If N is 0, then set CURRENT to the empty location which ends + the previous symbol: RHS[0] (always defined). */ + +#define YYRHSLOC(Rhs, K) ((Rhs)[K]) +#ifndef YYLLOC_DEFAULT +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + do \ + if (YYID (N)) \ + { \ + (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ + (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ + (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ + (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ + } \ + else \ + { \ + (Current).first_line = (Current).last_line = \ + YYRHSLOC (Rhs, 0).last_line; \ + (Current).first_column = (Current).last_column = \ + YYRHSLOC (Rhs, 0).last_column; \ + } \ + while (YYID (0)) #endif -#ifdef YYPURE -#ifdef YYLSP_NEEDED -#ifdef YYLEX_PARAM -#define YYLEX yylex(&yylval, &yylloc, YYLEX_PARAM) -#else -#define YYLEX yylex(&yylval, &yylloc) + +/* YY_LOCATION_PRINT -- Print the location on the stream. + This macro was not mandated originally: define only if we know + we won't break user code: when these are the locations we know. */ + +#ifndef YY_LOCATION_PRINT +# if YYLTYPE_IS_TRIVIAL +# define YY_LOCATION_PRINT(File, Loc) \ + fprintf (File, "%d.%d-%d.%d", \ + (Loc).first_line, (Loc).first_column, \ + (Loc).last_line, (Loc).last_column) +# else +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +# endif #endif -#else /* not YYLSP_NEEDED */ + + +/* YYLEX -- calling `yylex' with the right arguments. */ + #ifdef YYLEX_PARAM -#define YYLEX yylex(&yylval, YYLEX_PARAM) +# define YYLEX yylex (YYLEX_PARAM) #else -#define YYLEX yylex(&yylval) +# define YYLEX yylex () #endif -#endif /* not YYLSP_NEEDED */ + +/* Enable debugging if requested. */ +#if YYDEBUG + +# ifndef YYFPRINTF +# include /* INFRINGES ON USER NAME SPACE */ +# define YYFPRINTF fprintf +# endif + +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (YYID (0)) + +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Type, Value); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (YYID (0)) + + +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +/*ARGSUSED*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +#else +static void +yy_symbol_value_print (yyoutput, yytype, yyvaluep) + FILE *yyoutput; + int yytype; + YYSTYPE const * const yyvaluep; #endif +{ + if (!yyvaluep) + return; +# ifdef YYPRINT + if (yytype < YYNTOKENS) + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# else + YYUSE (yyoutput); +# endif + switch (yytype) + { + default: + break; + } +} -/* If nonreentrant, generate the variables here */ -#ifndef YYPURE +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +#else +static void +yy_symbol_print (yyoutput, yytype, yyvaluep) + FILE *yyoutput; + int yytype; + YYSTYPE const * const yyvaluep; +#endif +{ + if (yytype < YYNTOKENS) + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); + else + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + + yy_symbol_value_print (yyoutput, yytype, yyvaluep); + YYFPRINTF (yyoutput, ")"); +} -int yychar; /* the lookahead symbol */ -YYSTYPE yylval; /* the semantic value of the */ - /* lookahead symbol */ +/*------------------------------------------------------------------. +| yy_stack_print -- Print the state stack from its BOTTOM up to its | +| TOP (included). | +`------------------------------------------------------------------*/ -#ifdef YYLSP_NEEDED -YYLTYPE yylloc; /* location data for the lookahead */ - /* symbol */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) +#else +static void +yy_stack_print (bottom, top) + yytype_int16 *bottom; + yytype_int16 *top; #endif +{ + YYFPRINTF (stderr, "Stack now"); + for (; bottom <= top; ++bottom) + YYFPRINTF (stderr, " %d", *bottom); + YYFPRINTF (stderr, "\n"); +} + +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (YYID (0)) + -int yynerrs; /* number of parse errors so far */ -#endif /* not YYPURE */ +/*------------------------------------------------. +| Report that the YYRULE is going to be reduced. | +`------------------------------------------------*/ -#if YYDEBUG != 0 -int yydebug; /* nonzero means print parse trace */ -/* Since this is uninitialized, it does not stop multiple parsers - from coexisting. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_reduce_print (YYSTYPE *yyvsp, int yyrule) +#else +static void +yy_reduce_print (yyvsp, yyrule) + YYSTYPE *yyvsp; + int yyrule; #endif +{ + int yynrhs = yyr2[yyrule]; + int yyi; + unsigned long int yylno = yyrline[yyrule]; + YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", + yyrule - 1, yylno); + /* The symbols being reduced. */ + for (yyi = 0; yyi < yynrhs; yyi++) + { + fprintf (stderr, " $%d = ", yyi + 1); + yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], + &(yyvsp[(yyi + 1) - (yynrhs)]) + ); + fprintf (stderr, "\n"); + } +} -/* YYINITDEPTH indicates the initial size of the parser's stacks */ +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (yyvsp, Rule); \ +} while (YYID (0)) + +/* Nonzero means print parse trace. It is left uninitialized so that + multiple parsers can coexist. */ +int yydebug; +#else /* !YYDEBUG */ +# define YYDPRINTF(Args) +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) +# define YY_STACK_PRINT(Bottom, Top) +# define YY_REDUCE_PRINT(Rule) +#endif /* !YYDEBUG */ + +/* YYINITDEPTH -- initial size of the parser's stacks. */ #ifndef YYINITDEPTH -#define YYINITDEPTH 200 +# define YYINITDEPTH 200 #endif -/* YYMAXDEPTH is the maximum size the stacks can grow to - (effective only if the built-in stack extension method is used). */ +/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only + if the built-in stack extension method is used). -#if YYMAXDEPTH == 0 -#undef YYMAXDEPTH -#endif + Do not make this value too large; the results are undefined if + YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) + evaluated with infinite-precision integer arithmetic. */ #ifndef YYMAXDEPTH -#define YYMAXDEPTH 10000 +# define YYMAXDEPTH 10000 #endif + -/* Define __yy_memcpy. Note that the size argument - should be passed with type unsigned int, because that is what the non-GCC - definitions require. With GCC, __builtin_memcpy takes an arg - of type size_t, but it can handle unsigned int. */ - -#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */ -#define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT) -#else /* not GNU C or C++ */ -#ifndef __cplusplus -/* This is the most reliable way to avoid incompatibilities - in available built-in functions on various systems. */ -static void -__yy_memcpy (to, from, count) - char *to; - char *from; - unsigned int count; +#if YYERROR_VERBOSE + +# ifndef yystrlen +# if defined __GLIBC__ && defined _STRING_H +# define yystrlen strlen +# else +/* Return the length of YYSTR. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static YYSIZE_T +yystrlen (const char *yystr) +#else +static YYSIZE_T +yystrlen (yystr) + const char *yystr; +#endif +{ + YYSIZE_T yylen; + for (yylen = 0; yystr[yylen]; yylen++) + continue; + return yylen; +} +# endif +# endif + +# ifndef yystpcpy +# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE +# define yystpcpy stpcpy +# else +/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in + YYDEST. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static char * +yystpcpy (char *yydest, const char *yysrc) +#else +static char * +yystpcpy (yydest, yysrc) + char *yydest; + const char *yysrc; +#endif +{ + char *yyd = yydest; + const char *yys = yysrc; + + while ((*yyd++ = *yys++) != '\0') + continue; + + return yyd - 1; +} +# endif +# endif + +# ifndef yytnamerr +/* Copy to YYRES the contents of YYSTR after stripping away unnecessary + quotes and backslashes, so that it's suitable for yyerror. The + heuristic is that double-quoting is unnecessary unless the string + contains an apostrophe, a comma, or backslash (other than + backslash-backslash). YYSTR is taken from yytname. If YYRES is + null, do not copy; instead, return the length of what the result + would have been. */ +static YYSIZE_T +yytnamerr (char *yyres, const char *yystr) { - register char *f = from; - register char *t = to; - register int i = count; + if (*yystr == '"') + { + YYSIZE_T yyn = 0; + char const *yyp = yystr; - while (i-- > 0) - *t++ = *f++; -} + for (;;) + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } + do_not_strip_quotes: ; + } + + if (! yyres) + return yystrlen (yystr); + + return yystpcpy (yyres, yystr) - yyres; +} +# endif + +/* Copy into YYRESULT an error message about the unexpected token + YYCHAR while in state YYSTATE. Return the number of bytes copied, + including the terminating null byte. If YYRESULT is null, do not + copy anything; just return the number of bytes that would be + copied. As a special case, return 0 if an ordinary "syntax error" + message will do. Return YYSIZE_MAXIMUM if overflow occurs during + size calculation. */ +static YYSIZE_T +yysyntax_error (char *yyresult, int yystate, int yychar) +{ + int yyn = yypact[yystate]; -#else /* __cplusplus */ + if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) + return 0; + else + { + int yytype = YYTRANSLATE (yychar); + YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); + YYSIZE_T yysize = yysize0; + YYSIZE_T yysize1; + int yysize_overflow = 0; + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; + int yyx; + +# if 0 + /* This is so xgettext sees the translatable formats that are + constructed on the fly. */ + YY_("syntax error, unexpected %s"); + YY_("syntax error, unexpected %s, expecting %s"); + YY_("syntax error, unexpected %s, expecting %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); +# endif + char *yyfmt; + char const *yyf; + static char const yyunexpected[] = "syntax error, unexpected %s"; + static char const yyexpecting[] = ", expecting %s"; + static char const yyor[] = " or %s"; + char yyformat[sizeof yyunexpected + + sizeof yyexpecting - 1 + + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) + * (sizeof yyor - 1))]; + char const *yyprefix = yyexpecting; + + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. */ + int yyxbegin = yyn < 0 ? -yyn : 0; + + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn + 1; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yycount = 1; + + yyarg[0] = yytname[yytype]; + yyfmt = yystpcpy (yyformat, yyunexpected); + + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) + { + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) + { + yycount = 1; + yysize = yysize0; + yyformat[sizeof yyunexpected - 1] = '\0'; + break; + } + yyarg[yycount++] = yytname[yyx]; + yysize1 = yysize + yytnamerr (0, yytname[yyx]); + yysize_overflow |= (yysize1 < yysize); + yysize = yysize1; + yyfmt = yystpcpy (yyfmt, yyprefix); + yyprefix = yyor; + } + + yyf = YY_(yyformat); + yysize1 = yysize + yystrlen (yyf); + yysize_overflow |= (yysize1 < yysize); + yysize = yysize1; -/* This is the most reliable way to avoid incompatibilities - in available built-in functions on various systems. */ -static void -__yy_memcpy (char *to, char *from, unsigned int count) -{ - register char *t = to; - register char *f = from; - register int i = count; + if (yysize_overflow) + return YYSIZE_MAXIMUM; - while (i-- > 0) - *t++ = *f++; + if (yyresult) + { + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + char *yyp = yyresult; + int yyi = 0; + while ((*yyp = *yyf) != '\0') + { + if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyf += 2; + } + else + { + yyp++; + yyf++; + } + } + } + return yysize; + } } +#endif /* YYERROR_VERBOSE */ + +/*-----------------------------------------------. +| Release the memory associated to this symbol. | +`-----------------------------------------------*/ + +/*ARGSUSED*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) +#else +static void +yydestruct (yymsg, yytype, yyvaluep) + const char *yymsg; + int yytype; + YYSTYPE *yyvaluep; #endif -#endif - -#line 217 "/usr/share/bison.simple" +{ + YYUSE (yyvaluep); -/* The user can define YYPARSE_PARAM as the name of an argument to be passed - into yyparse. The argument should have type void *. - It should actually point to an object. - Grammar actions can access the variable by casting it - to the proper pointer type. */ + if (!yymsg) + yymsg = "Deleting"; + YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); -#ifdef YYPARSE_PARAM -#ifdef __cplusplus -#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM -#define YYPARSE_PARAM_DECL -#else /* not __cplusplus */ -#define YYPARSE_PARAM_ARG YYPARSE_PARAM -#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM; -#endif /* not __cplusplus */ -#else /* not YYPARSE_PARAM */ -#define YYPARSE_PARAM_ARG -#define YYPARSE_PARAM_DECL -#endif /* not YYPARSE_PARAM */ + switch (yytype) + { + + default: + break; + } +} + + +/* Prevent warnings from -Wmissing-prototypes. */ -/* Prevent warning if -Wstrict-prototypes. */ -#ifdef __GNUC__ #ifdef YYPARSE_PARAM -int yyparse (void *); +#if defined __STDC__ || defined __cplusplus +int yyparse (void *YYPARSE_PARAM); #else -int yyparse (void); +int yyparse (); #endif +#else /* ! YYPARSE_PARAM */ +#if defined __STDC__ || defined __cplusplus +int yyparse (void); +#else +int yyparse (); #endif +#endif /* ! YYPARSE_PARAM */ -int -yyparse(YYPARSE_PARAM_ARG) - YYPARSE_PARAM_DECL -{ - register int yystate; - register int yyn; - register short *yyssp; - register YYSTYPE *yyvsp; - int yyerrstatus; /* number of tokens to shift before error messages enabled */ - int yychar1 = 0; /* lookahead token as an internal (translated) token number */ - - short yyssa[YYINITDEPTH]; /* the state stack */ - YYSTYPE yyvsa[YYINITDEPTH]; /* the semantic value stack */ - - short *yyss = yyssa; /* refer to the stacks thru separate pointers */ - YYSTYPE *yyvs = yyvsa; /* to allow yyoverflow to reallocate them elsewhere */ - -#ifdef YYLSP_NEEDED - YYLTYPE yylsa[YYINITDEPTH]; /* the location stack */ - YYLTYPE *yyls = yylsa; - YYLTYPE *yylsp; -#define YYPOPSTACK (yyvsp--, yyssp--, yylsp--) + +/* The look-ahead symbol. */ +int yychar; + +/* The semantic value of the look-ahead symbol. */ +YYSTYPE yylval; + +/* Number of syntax errors so far. */ +int yynerrs; + + + +/*----------. +| yyparse. | +`----------*/ + +#ifdef YYPARSE_PARAM +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +int +yyparse (void *YYPARSE_PARAM) #else -#define YYPOPSTACK (yyvsp--, yyssp--) +int +yyparse (YYPARSE_PARAM) + void *YYPARSE_PARAM; #endif +#else /* ! YYPARSE_PARAM */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +int +yyparse (void) +#else +int +yyparse () - int yystacksize = YYINITDEPTH; - int yyfree_stacks = 0; - -#ifdef YYPURE - int yychar; - YYSTYPE yylval; - int yynerrs; -#ifdef YYLSP_NEEDED - YYLTYPE yylloc; #endif #endif +{ + + int yystate; + int yyn; + int yyresult; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; + /* Look-ahead token as an internal (translated) token number. */ + int yytoken = 0; +#if YYERROR_VERBOSE + /* Buffer for error messages, and its allocated size. */ + char yymsgbuf[128]; + char *yymsg = yymsgbuf; + YYSIZE_T yymsg_alloc = sizeof yymsgbuf; +#endif - YYSTYPE yyval; /* the variable used to return */ - /* semantic values from the action */ - /* routines */ + /* Three stacks and their tools: + `yyss': related to states, + `yyvs': related to semantic values, + `yyls': related to locations. - int yylen; + Refer to the stacks thru separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Starting parse\n"); -#endif + /* The state stack. */ + yytype_int16 yyssa[YYINITDEPTH]; + yytype_int16 *yyss = yyssa; + yytype_int16 *yyssp; + + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs = yyvsa; + YYSTYPE *yyvsp; + + + +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) + + YYSIZE_T yystacksize = YYINITDEPTH; + + /* The variables used to return semantic value and location from the + action routines. */ + YYSTYPE yyval; + + + /* The number of symbols on the RHS of the reduced rule. + Keep to zero when no symbol should be popped. */ + int yylen = 0; + + YYDPRINTF ((stderr, "Starting parse\n")); yystate = 0; yyerrstatus = 0; @@ -3071,574 +3928,584 @@ so that they stay on the same level as the state stack. The wasted elements are never initialized. */ - yyssp = yyss - 1; + yyssp = yyss; yyvsp = yyvs; -#ifdef YYLSP_NEEDED - yylsp = yyls; -#endif -/* Push a new state, which is found in yystate . */ -/* In all cases, when you get here, the value and location stacks - have just been pushed. so pushing a state here evens the stacks. */ -yynewstate: + goto yysetstate; - *++yyssp = yystate; +/*------------------------------------------------------------. +| yynewstate -- Push a new state, which is found in yystate. | +`------------------------------------------------------------*/ + yynewstate: + /* In all cases, when you get here, the value and location stacks + have just been pushed. So pushing a state here evens the stacks. */ + yyssp++; - if (yyssp >= yyss + yystacksize - 1) - { - /* Give user a chance to reallocate the stack */ - /* Use copies of these so that the &'s don't force the real ones into memory. */ - YYSTYPE *yyvs1 = yyvs; - short *yyss1 = yyss; -#ifdef YYLSP_NEEDED - YYLTYPE *yyls1 = yyls; -#endif + yysetstate: + *yyssp = yystate; + if (yyss + yystacksize - 1 <= yyssp) + { /* Get the current used size of the three stacks, in elements. */ - int size = yyssp - yyss + 1; + YYSIZE_T yysize = yyssp - yyss + 1; #ifdef yyoverflow - /* Each stack pointer address is followed by the size of - the data in use in that stack, in bytes. */ -#ifdef YYLSP_NEEDED - /* This used to be a conditional around just the two extra args, - but that might be undefined if yyoverflow is a macro. */ - yyoverflow("parser stack overflow", - &yyss1, size * sizeof (*yyssp), - &yyvs1, size * sizeof (*yyvsp), - &yyls1, size * sizeof (*yylsp), - &yystacksize); -#else - yyoverflow("parser stack overflow", - &yyss1, size * sizeof (*yyssp), - &yyvs1, size * sizeof (*yyvsp), - &yystacksize); -#endif + { + /* Give user a chance to reallocate the stack. Use copies of + these so that the &'s don't force the real ones into + memory. */ + YYSTYPE *yyvs1 = yyvs; + yytype_int16 *yyss1 = yyss; + + + /* Each stack pointer address is followed by the size of the + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ + yyoverflow (YY_("memory exhausted"), + &yyss1, yysize * sizeof (*yyssp), + &yyvs1, yysize * sizeof (*yyvsp), - yyss = yyss1; yyvs = yyvs1; -#ifdef YYLSP_NEEDED - yyls = yyls1; -#endif + &yystacksize); + + yyss = yyss1; + yyvs = yyvs1; + } #else /* no yyoverflow */ +# ifndef YYSTACK_RELOCATE + goto yyexhaustedlab; +# else /* Extend the stack our own way. */ - if (yystacksize >= YYMAXDEPTH) - { - yyerror("parser stack overflow"); - if (yyfree_stacks) - { - free (yyss); - free (yyvs); -#ifdef YYLSP_NEEDED - free (yyls); -#endif - } - return 2; - } + if (YYMAXDEPTH <= yystacksize) + goto yyexhaustedlab; yystacksize *= 2; - if (yystacksize > YYMAXDEPTH) + if (YYMAXDEPTH < yystacksize) yystacksize = YYMAXDEPTH; -#ifndef YYSTACK_USE_ALLOCA - yyfree_stacks = 1; -#endif - yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp)); - __yy_memcpy ((char *)yyss, (char *)yyss1, - size * (unsigned int) sizeof (*yyssp)); - yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp)); - __yy_memcpy ((char *)yyvs, (char *)yyvs1, - size * (unsigned int) sizeof (*yyvsp)); -#ifdef YYLSP_NEEDED - yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp)); - __yy_memcpy ((char *)yyls, (char *)yyls1, - size * (unsigned int) sizeof (*yylsp)); -#endif + + { + yytype_int16 *yyss1 = yyss; + union yyalloc *yyptr = + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + if (! yyptr) + goto yyexhaustedlab; + YYSTACK_RELOCATE (yyss); + YYSTACK_RELOCATE (yyvs); + +# undef YYSTACK_RELOCATE + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); + } +# endif #endif /* no yyoverflow */ - yyssp = yyss + size - 1; - yyvsp = yyvs + size - 1; -#ifdef YYLSP_NEEDED - yylsp = yyls + size - 1; -#endif + yyssp = yyss + yysize - 1; + yyvsp = yyvs + yysize - 1; -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Stack size increased to %d\n", yystacksize); -#endif - if (yyssp >= yyss + yystacksize - 1) + YYDPRINTF ((stderr, "Stack size increased to %lu\n", + (unsigned long int) yystacksize)); + + if (yyss + yystacksize - 1 <= yyssp) YYABORT; } -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Entering state %d\n", yystate); -#endif + YYDPRINTF ((stderr, "Entering state %d\n", yystate)); goto yybackup; - yybackup: -/* Do appropriate processing given the current state. */ -/* Read a lookahead token if we need one and don't already have one. */ -/* yyresume: */ +/*-----------. +| yybackup. | +`-----------*/ +yybackup: - /* First try to decide what to do without reference to lookahead token. */ + /* Do appropriate processing given the current state. Read a + look-ahead token if we need one and don't already have one. */ + /* First try to decide what to do without reference to look-ahead token. */ yyn = yypact[yystate]; - if (yyn == YYFLAG) + if (yyn == YYPACT_NINF) goto yydefault; - /* Not known => get a lookahead token if don't already have one. */ - - /* yychar is either YYEMPTY or YYEOF - or a valid token in external form. */ + /* Not known => get a look-ahead token if don't already have one. */ + /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ if (yychar == YYEMPTY) { -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Reading a token: "); -#endif + YYDPRINTF ((stderr, "Reading a token: ")); yychar = YYLEX; } - /* Convert token to internal form (in yychar1) for indexing tables with */ - - if (yychar <= 0) /* This means end of input. */ + if (yychar <= YYEOF) { - yychar1 = 0; - yychar = YYEOF; /* Don't call YYLEX any more */ - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Now at end of input.\n"); -#endif + yychar = yytoken = YYEOF; + YYDPRINTF ((stderr, "Now at end of input.\n")); } else { - yychar1 = YYTRANSLATE(yychar); + yytoken = YYTRANSLATE (yychar); + YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); + } -#if YYDEBUG != 0 - if (yydebug) - { - fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]); - /* Give the individual parser a way to print the precise meaning - of a token, for further debugging info. */ -#ifdef YYPRINT - YYPRINT (stderr, yychar, yylval); -#endif - fprintf (stderr, ")\n"); - } -#endif - } - - yyn += yychar1; - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1) + /* If the proper action on seeing token YYTOKEN is to reduce or to + detect an error, take that action. */ + yyn += yytoken; + if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) goto yydefault; - yyn = yytable[yyn]; - - /* yyn is what to do for this token type in this state. - Negative => reduce, -yyn is rule number. - Positive => shift, yyn is new state. - New state is final state => don't bother to shift, - just return success. - 0, or most negative number => error. */ - - if (yyn < 0) + if (yyn <= 0) { - if (yyn == YYFLAG) + if (yyn == 0 || yyn == YYTABLE_NINF) goto yyerrlab; yyn = -yyn; goto yyreduce; } - else if (yyn == 0) - goto yyerrlab; if (yyn == YYFINAL) YYACCEPT; - /* Shift the lookahead token. */ + /* Count tokens shifted since error; after three, turn off error + status. */ + if (yyerrstatus) + yyerrstatus--; -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]); -#endif + /* Shift the look-ahead token. */ + YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - /* Discard the token being shifted unless it is eof. */ + /* Discard the shifted token unless it is eof. */ if (yychar != YYEOF) yychar = YYEMPTY; + yystate = yyn; *++yyvsp = yylval; -#ifdef YYLSP_NEEDED - *++yylsp = yylloc; -#endif - - /* count tokens shifted since error; after three, turn off error status. */ - if (yyerrstatus) yyerrstatus--; - yystate = yyn; goto yynewstate; -/* Do the default action for the current state. */ -yydefault: +/*-----------------------------------------------------------. +| yydefault -- do the default action for the current state. | +`-----------------------------------------------------------*/ +yydefault: yyn = yydefact[yystate]; if (yyn == 0) goto yyerrlab; + goto yyreduce; + -/* Do a reduction. yyn is the number of a rule to reduce with. */ +/*-----------------------------. +| yyreduce -- Do a reduction. | +`-----------------------------*/ yyreduce: + /* yyn is the number of a rule to reduce with. */ yylen = yyr2[yyn]; - if (yylen > 0) - yyval = yyvsp[1-yylen]; /* implement default value of the action */ -#if YYDEBUG != 0 - if (yydebug) + /* If YYLEN is nonzero, implement the default value of the action: + `$$ = $1'. + + Otherwise, the following line sets YYVAL to garbage. + This behavior is undocumented and Bison + users should not rely upon it. Assigning to YYVAL + unconditionally makes the parser a bit smaller, and it avoids a + GCC warning that YYVAL may be used uninitialized. */ + yyval = yyvsp[1-yylen]; + + + YY_REDUCE_PRINT (yyn); + switch (yyn) { - int i; + case 3: +#line 1821 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if ((yyvsp[(1) - (1)].UIntVal) > (uint32_t)INT32_MAX) // Outside of my range! + error("Value too large for type"); + (yyval.SIntVal) = (int32_t)(yyvsp[(1) - (1)].UIntVal); + ;} + break; - fprintf (stderr, "Reducing via rule %d (line %d), ", - yyn, yyrline[yyn]); + case 5: +#line 1830 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if ((yyvsp[(1) - (1)].UInt64Val) > (uint64_t)INT64_MAX) // Outside of my range! + error("Value too large for type"); + (yyval.SInt64Val) = (int64_t)(yyvsp[(1) - (1)].UInt64Val); + ;} + break; - /* Print the symbols being reduced, and their result. */ - for (i = yyprhs[yyn]; yyrhs[i] > 0; i++) - fprintf (stderr, "%s ", yytname[yyrhs[i]]); - fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]); - } -#endif + case 26: +#line 1852 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.IPred) = ICmpInst::ICMP_EQ; ;} + break; + case 27: +#line 1852 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.IPred) = ICmpInst::ICMP_NE; ;} + break; - switch (yyn) { + case 28: +#line 1853 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.IPred) = ICmpInst::ICMP_SLT; ;} + break; -case 2: -#line 1895 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (yyvsp[0].UIntVal > (uint32_t)INT32_MAX) // Outside of my range! - error("Value too large for type"); - yyval.SIntVal = (int32_t)yyvsp[0].UIntVal; - ; - break;} -case 4: -#line 1904 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (yyvsp[0].UInt64Val > (uint64_t)INT64_MAX) // Outside of my range! - error("Value too large for type"); - yyval.SInt64Val = (int64_t)yyvsp[0].UInt64Val; - ; - break;} -case 25: -#line 1926 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.IPred = ICmpInst::ICMP_EQ; ; - break;} -case 26: -#line 1926 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.IPred = ICmpInst::ICMP_NE; ; - break;} -case 27: -#line 1927 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.IPred = ICmpInst::ICMP_SLT; ; - break;} -case 28: -#line 1927 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.IPred = ICmpInst::ICMP_SGT; ; - break;} -case 29: -#line 1928 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.IPred = ICmpInst::ICMP_SLE; ; - break;} -case 30: -#line 1928 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.IPred = ICmpInst::ICMP_SGE; ; - break;} -case 31: -#line 1929 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.IPred = ICmpInst::ICMP_ULT; ; - break;} -case 32: -#line 1929 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.IPred = ICmpInst::ICMP_UGT; ; - break;} -case 33: -#line 1930 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.IPred = ICmpInst::ICMP_ULE; ; - break;} -case 34: -#line 1930 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.IPred = ICmpInst::ICMP_UGE; ; - break;} -case 35: -#line 1934 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_OEQ; ; - break;} -case 36: -#line 1934 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_ONE; ; - break;} -case 37: -#line 1935 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_OLT; ; - break;} -case 38: -#line 1935 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_OGT; ; - break;} -case 39: -#line 1936 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_OLE; ; - break;} -case 40: -#line 1936 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_OGE; ; - break;} -case 41: -#line 1937 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_ORD; ; - break;} -case 42: -#line 1937 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_UNO; ; - break;} -case 43: -#line 1938 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_UEQ; ; - break;} -case 44: -#line 1938 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_UNE; ; - break;} -case 45: -#line 1939 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_ULT; ; - break;} -case 46: -#line 1939 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_UGT; ; - break;} -case 47: -#line 1940 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_ULE; ; - break;} -case 48: -#line 1940 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_UGE; ; - break;} -case 49: -#line 1941 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_TRUE; ; - break;} -case 50: -#line 1942 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_FALSE; ; - break;} -case 80: -#line 1973 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.StrVal = yyvsp[-1].StrVal; - ; - break;} -case 81: -#line 1976 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.StrVal = 0; - ; - break;} -case 82: -#line 1981 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.Linkage = GlobalValue::InternalLinkage; ; - break;} -case 83: -#line 1982 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.Linkage = GlobalValue::LinkOnceLinkage; ; - break;} -case 84: -#line 1983 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.Linkage = GlobalValue::WeakLinkage; ; - break;} -case 85: -#line 1984 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.Linkage = GlobalValue::AppendingLinkage; ; - break;} -case 86: -#line 1985 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.Linkage = GlobalValue::DLLImportLinkage; ; - break;} -case 87: -#line 1986 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.Linkage = GlobalValue::DLLExportLinkage; ; - break;} -case 88: -#line 1987 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.Linkage = GlobalValue::ExternalWeakLinkage; ; - break;} -case 89: -#line 1988 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.Linkage = GlobalValue::ExternalLinkage; ; - break;} -case 90: -#line 1992 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.UIntVal = lastCallingConv = OldCallingConv::C; ; - break;} -case 91: -#line 1993 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.UIntVal = lastCallingConv = OldCallingConv::C; ; - break;} -case 92: -#line 1994 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.UIntVal = lastCallingConv = OldCallingConv::CSRet; ; - break;} -case 93: -#line 1995 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.UIntVal = lastCallingConv = OldCallingConv::Fast; ; - break;} -case 94: -#line 1996 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.UIntVal = lastCallingConv = OldCallingConv::Cold; ; - break;} -case 95: -#line 1997 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.UIntVal = lastCallingConv = OldCallingConv::X86_StdCall; ; - break;} -case 96: -#line 1998 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.UIntVal = lastCallingConv = OldCallingConv::X86_FastCall; ; - break;} -case 97: -#line 1999 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if ((unsigned)yyvsp[0].UInt64Val != yyvsp[0].UInt64Val) + case 29: +#line 1853 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.IPred) = ICmpInst::ICMP_SGT; ;} + break; + + case 30: +#line 1854 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.IPred) = ICmpInst::ICMP_SLE; ;} + break; + + case 31: +#line 1854 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.IPred) = ICmpInst::ICMP_SGE; ;} + break; + + case 32: +#line 1855 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.IPred) = ICmpInst::ICMP_ULT; ;} + break; + + case 33: +#line 1855 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.IPred) = ICmpInst::ICMP_UGT; ;} + break; + + case 34: +#line 1856 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.IPred) = ICmpInst::ICMP_ULE; ;} + break; + + case 35: +#line 1856 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.IPred) = ICmpInst::ICMP_UGE; ;} + break; + + case 36: +#line 1860 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_OEQ; ;} + break; + + case 37: +#line 1860 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_ONE; ;} + break; + + case 38: +#line 1861 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_OLT; ;} + break; + + case 39: +#line 1861 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_OGT; ;} + break; + + case 40: +#line 1862 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_OLE; ;} + break; + + case 41: +#line 1862 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_OGE; ;} + break; + + case 42: +#line 1863 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_ORD; ;} + break; + + case 43: +#line 1863 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_UNO; ;} + break; + + case 44: +#line 1864 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_UEQ; ;} + break; + + case 45: +#line 1864 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_UNE; ;} + break; + + case 46: +#line 1865 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_ULT; ;} + break; + + case 47: +#line 1865 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_UGT; ;} + break; + + case 48: +#line 1866 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_ULE; ;} + break; + + case 49: +#line 1866 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_UGE; ;} + break; + + case 50: +#line 1867 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_TRUE; ;} + break; + + case 51: +#line 1868 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_FALSE; ;} + break; + + case 81: +#line 1899 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal); + ;} + break; + + case 82: +#line 1902 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.StrVal) = 0; + ;} + break; + + case 83: +#line 1907 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Linkage) = GlobalValue::InternalLinkage; ;} + break; + + case 84: +#line 1908 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;} + break; + + case 85: +#line 1909 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Linkage) = GlobalValue::WeakLinkage; ;} + break; + + case 86: +#line 1910 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;} + break; + + case 87: +#line 1911 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;} + break; + + case 88: +#line 1912 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;} + break; + + case 89: +#line 1913 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;} + break; + + case 90: +#line 1914 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;} + break; + + case 91: +#line 1918 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.UIntVal) = lastCallingConv = OldCallingConv::C; ;} + break; + + case 92: +#line 1919 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.UIntVal) = lastCallingConv = OldCallingConv::C; ;} + break; + + case 93: +#line 1920 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.UIntVal) = lastCallingConv = OldCallingConv::CSRet; ;} + break; + + case 94: +#line 1921 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.UIntVal) = lastCallingConv = OldCallingConv::Fast; ;} + break; + + case 95: +#line 1922 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.UIntVal) = lastCallingConv = OldCallingConv::Cold; ;} + break; + + case 96: +#line 1923 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.UIntVal) = lastCallingConv = OldCallingConv::X86_StdCall; ;} + break; + + case 97: +#line 1924 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.UIntVal) = lastCallingConv = OldCallingConv::X86_FastCall; ;} + break; + + case 98: +#line 1925 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val)) error("Calling conv too large"); - yyval.UIntVal = lastCallingConv = yyvsp[0].UInt64Val; - ; - break;} -case 98: -#line 2009 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.UIntVal = 0; ; - break;} -case 99: -#line 2010 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.UIntVal = yyvsp[0].UInt64Val; - if (yyval.UIntVal != 0 && !isPowerOf2_32(yyval.UIntVal)) + (yyval.UIntVal) = lastCallingConv = (yyvsp[(2) - (2)].UInt64Val); + ;} + break; + + case 99: +#line 1935 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.UIntVal) = 0; ;} + break; + + case 100: +#line 1936 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.UIntVal) = (yyvsp[(2) - (2)].UInt64Val); + if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal))) error("Alignment must be a power of two"); - ; - break;} -case 100: -#line 2018 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.UIntVal = 0; ; - break;} -case 101: -#line 2019 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.UIntVal = yyvsp[0].UInt64Val; - if (yyval.UIntVal != 0 && !isPowerOf2_32(yyval.UIntVal)) + ;} + break; + + case 101: +#line 1944 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.UIntVal) = 0; ;} + break; + + case 102: +#line 1945 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.UIntVal) = (yyvsp[(3) - (3)].UInt64Val); + if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal))) error("Alignment must be a power of two"); - ; - break;} -case 102: -#line 2027 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - for (unsigned i = 0, e = strlen(yyvsp[0].StrVal); i != e; ++i) - if (yyvsp[0].StrVal[i] == '"' || yyvsp[0].StrVal[i] == '\\') + ;} + break; + + case 103: +#line 1953 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + for (unsigned i = 0, e = strlen((yyvsp[(2) - (2)].StrVal)); i != e; ++i) + if ((yyvsp[(2) - (2)].StrVal)[i] == '"' || (yyvsp[(2) - (2)].StrVal)[i] == '\\') error("Invalid character in section name"); - yyval.StrVal = yyvsp[0].StrVal; - ; - break;} -case 103: -#line 2036 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.StrVal = 0; ; - break;} -case 104: -#line 2037 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.StrVal = yyvsp[0].StrVal; ; - break;} -case 105: -#line 2044 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{; - break;} -case 106: -#line 2045 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{; - break;} -case 107: -#line 2049 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - CurGV->setSection(yyvsp[0].StrVal); - free(yyvsp[0].StrVal); - ; - break;} -case 108: -#line 2053 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (yyvsp[0].UInt64Val != 0 && !isPowerOf2_32(yyvsp[0].UInt64Val)) + (yyval.StrVal) = (yyvsp[(2) - (2)].StrVal); + ;} + break; + + case 104: +#line 1962 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.StrVal) = 0; ;} + break; + + case 105: +#line 1963 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.StrVal) = (yyvsp[(1) - (1)].StrVal); ;} + break; + + case 106: +#line 1970 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + {;} + break; + + case 107: +#line 1971 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + {;} + break; + + case 108: +#line 1975 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + CurGV->setSection((yyvsp[(1) - (1)].StrVal)); + free((yyvsp[(1) - (1)].StrVal)); + ;} + break; + + case 109: +#line 1979 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if ((yyvsp[(2) - (2)].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[(2) - (2)].UInt64Val))) error("Alignment must be a power of two"); - CurGV->setAlignment(yyvsp[0].UInt64Val); + CurGV->setAlignment((yyvsp[(2) - (2)].UInt64Val)); - ; - break;} -case 110: -#line 2070 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.TypeVal.PAT = new PATypeHolder(yyvsp[0].PrimType.T); - yyval.TypeVal.S.makeSignless(); - ; - break;} -case 112: -#line 2078 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.TypeVal.PAT = new PATypeHolder(yyvsp[0].PrimType.T); - yyval.TypeVal.S.makeSignless(); - ; - break;} -case 113: -#line 2085 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ + ;} + break; + + case 111: +#line 1996 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.TypeVal).PAT = new PATypeHolder((yyvsp[(1) - (1)].PrimType).T); + (yyval.TypeVal).S.makeSignless(); + ;} + break; + + case 113: +#line 2004 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.TypeVal).PAT = new PATypeHolder((yyvsp[(1) - (1)].PrimType).T); + (yyval.TypeVal).S.makeSignless(); + ;} + break; + + case 114: +#line 2011 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { if (!UpRefs.empty()) - error("Invalid upreference in type: " + (*yyvsp[0].TypeVal.PAT)->getDescription()); - yyval.TypeVal = yyvsp[0].TypeVal; - ; - break;} -case 126: -#line 2099 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.TypeVal.PAT = new PATypeHolder(yyvsp[0].PrimType.T); - yyval.TypeVal.S.copy(yyvsp[0].PrimType.S); - ; - break;} -case 127: -#line 2103 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.TypeVal.PAT = new PATypeHolder(OpaqueType::get()); - yyval.TypeVal.S.makeSignless(); - ; - break;} -case 128: -#line 2107 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Named types are also simple types... - yyval.TypeVal.S.copy(getTypeSign(yyvsp[0].ValIDVal)); - const Type* tmp = getType(yyvsp[0].ValIDVal); - yyval.TypeVal.PAT = new PATypeHolder(tmp); - ; - break;} -case 129: -#line 2112 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Type UpReference - if (yyvsp[0].UInt64Val > (uint64_t)~0U) + error("Invalid upreference in type: " + (*(yyvsp[(1) - (1)].TypeVal).PAT)->getDescription()); + (yyval.TypeVal) = (yyvsp[(1) - (1)].TypeVal); + ;} + break; + + case 127: +#line 2025 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.TypeVal).PAT = new PATypeHolder((yyvsp[(1) - (1)].PrimType).T); + (yyval.TypeVal).S.copy((yyvsp[(1) - (1)].PrimType).S); + ;} + break; + + case 128: +#line 2029 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.TypeVal).PAT = new PATypeHolder(OpaqueType::get()); + (yyval.TypeVal).S.makeSignless(); + ;} + break; + + case 129: +#line 2033 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Named types are also simple types... + (yyval.TypeVal).S.copy(getTypeSign((yyvsp[(1) - (1)].ValIDVal))); + const Type* tmp = getType((yyvsp[(1) - (1)].ValIDVal)); + (yyval.TypeVal).PAT = new PATypeHolder(tmp); + ;} + break; + + case 130: +#line 2038 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Type UpReference + if ((yyvsp[(2) - (2)].UInt64Val) > (uint64_t)~0U) error("Value out of range"); OpaqueType *OT = OpaqueType::get(); // Use temporary placeholder - UpRefs.push_back(UpRefRecord((unsigned)yyvsp[0].UInt64Val, OT)); // Add to vector... - yyval.TypeVal.PAT = new PATypeHolder(OT); - yyval.TypeVal.S.makeSignless(); + UpRefs.push_back(UpRefRecord((unsigned)(yyvsp[(2) - (2)].UInt64Val), OT)); // Add to vector... + (yyval.TypeVal).PAT = new PATypeHolder(OT); + (yyval.TypeVal).S.makeSignless(); UR_OUT("New Upreference!\n"); - ; - break;} -case 130: -#line 2121 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Function derived type? - yyval.TypeVal.S.makeComposite(yyvsp[-3].TypeVal.S); + ;} + break; + + case 131: +#line 2047 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Function derived type? + (yyval.TypeVal).S.makeComposite((yyvsp[(1) - (4)].TypeVal).S); std::vector Params; - for (std::list::iterator I = yyvsp[-1].TypeList->begin(), - E = yyvsp[-1].TypeList->end(); I != E; ++I) { + for (std::list::iterator I = (yyvsp[(3) - (4)].TypeList)->begin(), + E = (yyvsp[(3) - (4)].TypeList)->end(); I != E; ++I) { Params.push_back(I->PAT->get()); - yyval.TypeVal.S.add(I->S); + (yyval.TypeVal).S.add(I->S); } bool isVarArg = Params.size() && Params.back() == Type::VoidTy; if (isVarArg) Params.pop_back(); @@ -3653,151 +4520,164 @@ } const FunctionType *FTy = - FunctionType::get(yyvsp[-3].TypeVal.PAT->get(), Params, isVarArg, PAL); + FunctionType::get((yyvsp[(1) - (4)].TypeVal).PAT->get(), Params, isVarArg); - yyval.TypeVal.PAT = new PATypeHolder( HandleUpRefs(FTy, yyval.TypeVal.S) ); - delete yyvsp[-3].TypeVal.PAT; // Delete the return type handle - delete yyvsp[-1].TypeList; // Delete the argument list - ; - break;} -case 131: -#line 2148 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Sized array type? - yyval.TypeVal.S.makeComposite(yyvsp[-1].TypeVal.S); - yyval.TypeVal.PAT = new PATypeHolder(HandleUpRefs(ArrayType::get(yyvsp[-1].TypeVal.PAT->get(), - (unsigned)yyvsp[-3].UInt64Val), yyval.TypeVal.S)); - delete yyvsp[-1].TypeVal.PAT; - ; - break;} -case 132: -#line 2154 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Vector type? - const llvm::Type* ElemTy = yyvsp[-1].TypeVal.PAT->get(); - if ((unsigned)yyvsp[-3].UInt64Val != yyvsp[-3].UInt64Val) + (yyval.TypeVal).PAT = new PATypeHolder( HandleUpRefs(FTy, (yyval.TypeVal).S) ); + delete (yyvsp[(1) - (4)].TypeVal).PAT; // Delete the return type handle + delete (yyvsp[(3) - (4)].TypeList); // Delete the argument list + ;} + break; + + case 132: +#line 2074 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Sized array type? + (yyval.TypeVal).S.makeComposite((yyvsp[(4) - (5)].TypeVal).S); + (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(ArrayType::get((yyvsp[(4) - (5)].TypeVal).PAT->get(), + (unsigned)(yyvsp[(2) - (5)].UInt64Val)), (yyval.TypeVal).S)); + delete (yyvsp[(4) - (5)].TypeVal).PAT; + ;} + break; + + case 133: +#line 2080 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Vector type? + const llvm::Type* ElemTy = (yyvsp[(4) - (5)].TypeVal).PAT->get(); + if ((unsigned)(yyvsp[(2) - (5)].UInt64Val) != (yyvsp[(2) - (5)].UInt64Val)) error("Unsigned result not equal to signed result"); if (!(ElemTy->isInteger() || ElemTy->isFloatingPoint())) error("Elements of a VectorType must be integer or floating point"); - if (!isPowerOf2_32(yyvsp[-3].UInt64Val)) + if (!isPowerOf2_32((yyvsp[(2) - (5)].UInt64Val))) error("VectorType length should be a power of 2"); - yyval.TypeVal.S.makeComposite(yyvsp[-1].TypeVal.S); - yyval.TypeVal.PAT = new PATypeHolder(HandleUpRefs(VectorType::get(ElemTy, - (unsigned)yyvsp[-3].UInt64Val), yyval.TypeVal.S)); - delete yyvsp[-1].TypeVal.PAT; - ; - break;} -case 133: -#line 2167 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Structure type? + (yyval.TypeVal).S.makeComposite((yyvsp[(4) - (5)].TypeVal).S); + (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(VectorType::get(ElemTy, + (unsigned)(yyvsp[(2) - (5)].UInt64Val)), (yyval.TypeVal).S)); + delete (yyvsp[(4) - (5)].TypeVal).PAT; + ;} + break; + + case 134: +#line 2093 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Structure type? std::vector Elements; - yyval.TypeVal.S.makeComposite(); - for (std::list::iterator I = yyvsp[-1].TypeList->begin(), - E = yyvsp[-1].TypeList->end(); I != E; ++I) { + (yyval.TypeVal).S.makeComposite(); + for (std::list::iterator I = (yyvsp[(2) - (3)].TypeList)->begin(), + E = (yyvsp[(2) - (3)].TypeList)->end(); I != E; ++I) { Elements.push_back(I->PAT->get()); - yyval.TypeVal.S.add(I->S); + (yyval.TypeVal).S.add(I->S); } - yyval.TypeVal.PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements), yyval.TypeVal.S)); - delete yyvsp[-1].TypeList; - ; - break;} -case 134: -#line 2178 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Empty structure type? - yyval.TypeVal.PAT = new PATypeHolder(StructType::get(std::vector())); - yyval.TypeVal.S.makeComposite(); - ; - break;} -case 135: -#line 2182 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Packed Structure type? - yyval.TypeVal.S.makeComposite(); + (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements), (yyval.TypeVal).S)); + delete (yyvsp[(2) - (3)].TypeList); + ;} + break; + + case 135: +#line 2104 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Empty structure type? + (yyval.TypeVal).PAT = new PATypeHolder(StructType::get(std::vector())); + (yyval.TypeVal).S.makeComposite(); + ;} + break; + + case 136: +#line 2108 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Packed Structure type? + (yyval.TypeVal).S.makeComposite(); std::vector Elements; - for (std::list::iterator I = yyvsp[-2].TypeList->begin(), - E = yyvsp[-2].TypeList->end(); I != E; ++I) { + for (std::list::iterator I = (yyvsp[(3) - (5)].TypeList)->begin(), + E = (yyvsp[(3) - (5)].TypeList)->end(); I != E; ++I) { Elements.push_back(I->PAT->get()); - yyval.TypeVal.S.add(I->S); + (yyval.TypeVal).S.add(I->S); delete I->PAT; } - yyval.TypeVal.PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements, true), - yyval.TypeVal.S)); - delete yyvsp[-2].TypeList; - ; - break;} -case 136: -#line 2195 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Empty packed structure type? - yyval.TypeVal.PAT = new PATypeHolder(StructType::get(std::vector(),true)); - yyval.TypeVal.S.makeComposite(); - ; - break;} -case 137: -#line 2199 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Pointer type? - if (yyvsp[-1].TypeVal.PAT->get() == Type::LabelTy) + (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements, true), + (yyval.TypeVal).S)); + delete (yyvsp[(3) - (5)].TypeList); + ;} + break; + + case 137: +#line 2121 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Empty packed structure type? + (yyval.TypeVal).PAT = new PATypeHolder(StructType::get(std::vector(),true)); + (yyval.TypeVal).S.makeComposite(); + ;} + break; + + case 138: +#line 2125 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Pointer type? + if ((yyvsp[(1) - (2)].TypeVal).PAT->get() == Type::LabelTy) error("Cannot form a pointer to a basic block"); - yyval.TypeVal.S.makeComposite(yyvsp[-1].TypeVal.S); - yyval.TypeVal.PAT = new PATypeHolder(HandleUpRefs(PointerType::get(yyvsp[-1].TypeVal.PAT->get()), - yyval.TypeVal.S)); - delete yyvsp[-1].TypeVal.PAT; - ; - break;} -case 138: -#line 2213 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.TypeList = new std::list(); - yyval.TypeList->push_back(yyvsp[0].TypeVal); - ; - break;} -case 139: -#line 2217 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - (yyval.TypeList=yyvsp[-2].TypeList)->push_back(yyvsp[0].TypeVal); - ; - break;} -case 141: -#line 2225 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ + (yyval.TypeVal).S.makeComposite((yyvsp[(1) - (2)].TypeVal).S); + (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(PointerType::get((yyvsp[(1) - (2)].TypeVal).PAT->get()), + (yyval.TypeVal).S)); + delete (yyvsp[(1) - (2)].TypeVal).PAT; + ;} + break; + + case 139: +#line 2139 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.TypeList) = new std::list(); + (yyval.TypeList)->push_back((yyvsp[(1) - (1)].TypeVal)); + ;} + break; + + case 140: +#line 2143 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + ((yyval.TypeList)=(yyvsp[(1) - (3)].TypeList))->push_back((yyvsp[(3) - (3)].TypeVal)); + ;} + break; + + case 142: +#line 2151 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { PATypeInfo VoidTI; VoidTI.PAT = new PATypeHolder(Type::VoidTy); VoidTI.S.makeSignless(); - (yyval.TypeList=yyvsp[-2].TypeList)->push_back(VoidTI); - ; - break;} -case 142: -#line 2231 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.TypeList = new std::list(); + ((yyval.TypeList)=(yyvsp[(1) - (3)].TypeList))->push_back(VoidTI); + ;} + break; + + case 143: +#line 2157 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.TypeList) = new std::list(); PATypeInfo VoidTI; VoidTI.PAT = new PATypeHolder(Type::VoidTy); VoidTI.S.makeSignless(); - yyval.TypeList->push_back(VoidTI); - ; - break;} -case 143: -#line 2238 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.TypeList = new std::list(); - ; - break;} -case 144: -#line 2250 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Nonempty unsized arr - const ArrayType *ATy = dyn_cast(yyvsp[-3].TypeVal.PAT->get()); + (yyval.TypeList)->push_back(VoidTI); + ;} + break; + + case 144: +#line 2164 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.TypeList) = new std::list(); + ;} + break; + + case 145: +#line 2176 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Nonempty unsized arr + const ArrayType *ATy = dyn_cast((yyvsp[(1) - (4)].TypeVal).PAT->get()); if (ATy == 0) error("Cannot make array constant with type: '" + - yyvsp[-3].TypeVal.PAT->get()->getDescription() + "'"); + (yyvsp[(1) - (4)].TypeVal).PAT->get()->getDescription() + "'"); const Type *ETy = ATy->getElementType(); int NumElements = ATy->getNumElements(); // Verify that we have the correct size... - if (NumElements != -1 && NumElements != (int)yyvsp[-1].ConstVector->size()) + if (NumElements != -1 && NumElements != (int)(yyvsp[(3) - (4)].ConstVector)->size()) error("Type mismatch: constant sized array initialized with " + - utostr(yyvsp[-1].ConstVector->size()) + " arguments, but has size of " + + utostr((yyvsp[(3) - (4)].ConstVector)->size()) + " arguments, but has size of " + itostr(NumElements) + ""); // Verify all elements are correct type! std::vector Elems; - for (unsigned i = 0; i < yyvsp[-1].ConstVector->size(); i++) { - Constant *C = (*yyvsp[-1].ConstVector)[i].C; + for (unsigned i = 0; i < (yyvsp[(3) - (4)].ConstVector)->size(); i++) { + Constant *C = (*(yyvsp[(3) - (4)].ConstVector))[i].C; const Type* ValTy = C->getType(); if (ETy != ValTy) error("Element #" + utostr(i) + " is not of type '" + @@ -3805,72 +4685,75 @@ ValTy->getDescription() + "'"); Elems.push_back(C); } - yyval.ConstVal.C = ConstantArray::get(ATy, Elems); - yyval.ConstVal.S.copy(yyvsp[-3].TypeVal.S); - delete yyvsp[-3].TypeVal.PAT; - delete yyvsp[-1].ConstVector; - ; - break;} -case 145: -#line 2280 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const ArrayType *ATy = dyn_cast(yyvsp[-2].TypeVal.PAT->get()); + (yyval.ConstVal).C = ConstantArray::get(ATy, Elems); + (yyval.ConstVal).S.copy((yyvsp[(1) - (4)].TypeVal).S); + delete (yyvsp[(1) - (4)].TypeVal).PAT; + delete (yyvsp[(3) - (4)].ConstVector); + ;} + break; + + case 146: +#line 2206 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const ArrayType *ATy = dyn_cast((yyvsp[(1) - (3)].TypeVal).PAT->get()); if (ATy == 0) error("Cannot make array constant with type: '" + - yyvsp[-2].TypeVal.PAT->get()->getDescription() + "'"); + (yyvsp[(1) - (3)].TypeVal).PAT->get()->getDescription() + "'"); int NumElements = ATy->getNumElements(); if (NumElements != -1 && NumElements != 0) error("Type mismatch: constant sized array initialized with 0" " arguments, but has size of " + itostr(NumElements) +""); - yyval.ConstVal.C = ConstantArray::get(ATy, std::vector()); - yyval.ConstVal.S.copy(yyvsp[-2].TypeVal.S); - delete yyvsp[-2].TypeVal.PAT; - ; - break;} -case 146: -#line 2293 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const ArrayType *ATy = dyn_cast(yyvsp[-2].TypeVal.PAT->get()); + (yyval.ConstVal).C = ConstantArray::get(ATy, std::vector()); + (yyval.ConstVal).S.copy((yyvsp[(1) - (3)].TypeVal).S); + delete (yyvsp[(1) - (3)].TypeVal).PAT; + ;} + break; + + case 147: +#line 2219 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const ArrayType *ATy = dyn_cast((yyvsp[(1) - (3)].TypeVal).PAT->get()); if (ATy == 0) error("Cannot make array constant with type: '" + - yyvsp[-2].TypeVal.PAT->get()->getDescription() + "'"); + (yyvsp[(1) - (3)].TypeVal).PAT->get()->getDescription() + "'"); int NumElements = ATy->getNumElements(); const Type *ETy = dyn_cast(ATy->getElementType()); if (!ETy || cast(ETy)->getBitWidth() != 8) error("String arrays require type i8, not '" + ETy->getDescription() + "'"); - char *EndStr = UnEscapeLexed(yyvsp[0].StrVal, true); - if (NumElements != -1 && NumElements != (EndStr-yyvsp[0].StrVal)) + char *EndStr = UnEscapeLexed((yyvsp[(3) - (3)].StrVal), true); + if (NumElements != -1 && NumElements != (EndStr-(yyvsp[(3) - (3)].StrVal))) error("Can't build string constant of size " + - itostr((int)(EndStr-yyvsp[0].StrVal)) + " when array has size " + + itostr((int)(EndStr-(yyvsp[(3) - (3)].StrVal))) + " when array has size " + itostr(NumElements) + ""); std::vector Vals; - for (char *C = (char *)yyvsp[0].StrVal; C != (char *)EndStr; ++C) + for (char *C = (char *)(yyvsp[(3) - (3)].StrVal); C != (char *)EndStr; ++C) Vals.push_back(ConstantInt::get(ETy, *C)); - free(yyvsp[0].StrVal); - yyval.ConstVal.C = ConstantArray::get(ATy, Vals); - yyval.ConstVal.S.copy(yyvsp[-2].TypeVal.S); - delete yyvsp[-2].TypeVal.PAT; - ; - break;} -case 147: -#line 2316 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Nonempty unsized arr - const VectorType *PTy = dyn_cast(yyvsp[-3].TypeVal.PAT->get()); + free((yyvsp[(3) - (3)].StrVal)); + (yyval.ConstVal).C = ConstantArray::get(ATy, Vals); + (yyval.ConstVal).S.copy((yyvsp[(1) - (3)].TypeVal).S); + delete (yyvsp[(1) - (3)].TypeVal).PAT; + ;} + break; + + case 148: +#line 2242 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Nonempty unsized arr + const VectorType *PTy = dyn_cast((yyvsp[(1) - (4)].TypeVal).PAT->get()); if (PTy == 0) error("Cannot make packed constant with type: '" + - yyvsp[-3].TypeVal.PAT->get()->getDescription() + "'"); + (yyvsp[(1) - (4)].TypeVal).PAT->get()->getDescription() + "'"); const Type *ETy = PTy->getElementType(); int NumElements = PTy->getNumElements(); // Verify that we have the correct size... - if (NumElements != -1 && NumElements != (int)yyvsp[-1].ConstVector->size()) + if (NumElements != -1 && NumElements != (int)(yyvsp[(3) - (4)].ConstVector)->size()) error("Type mismatch: constant sized packed initialized with " + - utostr(yyvsp[-1].ConstVector->size()) + " arguments, but has size of " + + utostr((yyvsp[(3) - (4)].ConstVector)->size()) + " arguments, but has size of " + itostr(NumElements) + ""); // Verify all elements are correct type! std::vector Elems; - for (unsigned i = 0; i < yyvsp[-1].ConstVector->size(); i++) { - Constant *C = (*yyvsp[-1].ConstVector)[i].C; + for (unsigned i = 0; i < (yyvsp[(3) - (4)].ConstVector)->size(); i++) { + Constant *C = (*(yyvsp[(3) - (4)].ConstVector))[i].C; const Type* ValTy = C->getType(); if (ETy != ValTy) error("Element #" + utostr(i) + " is not of type '" + @@ -3878,117 +4761,124 @@ ValTy->getDescription() + "'"); Elems.push_back(C); } - yyval.ConstVal.C = ConstantVector::get(PTy, Elems); - yyval.ConstVal.S.copy(yyvsp[-3].TypeVal.S); - delete yyvsp[-3].TypeVal.PAT; - delete yyvsp[-1].ConstVector; - ; - break;} -case 148: -#line 2344 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const StructType *STy = dyn_cast(yyvsp[-3].TypeVal.PAT->get()); + (yyval.ConstVal).C = ConstantVector::get(PTy, Elems); + (yyval.ConstVal).S.copy((yyvsp[(1) - (4)].TypeVal).S); + delete (yyvsp[(1) - (4)].TypeVal).PAT; + delete (yyvsp[(3) - (4)].ConstVector); + ;} + break; + + case 149: +#line 2270 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const StructType *STy = dyn_cast((yyvsp[(1) - (4)].TypeVal).PAT->get()); if (STy == 0) error("Cannot make struct constant with type: '" + - yyvsp[-3].TypeVal.PAT->get()->getDescription() + "'"); - if (yyvsp[-1].ConstVector->size() != STy->getNumContainedTypes()) + (yyvsp[(1) - (4)].TypeVal).PAT->get()->getDescription() + "'"); + if ((yyvsp[(3) - (4)].ConstVector)->size() != STy->getNumContainedTypes()) error("Illegal number of initializers for structure type"); // Check to ensure that constants are compatible with the type initializer! std::vector Fields; - for (unsigned i = 0, e = yyvsp[-1].ConstVector->size(); i != e; ++i) { - Constant *C = (*yyvsp[-1].ConstVector)[i].C; + for (unsigned i = 0, e = (yyvsp[(3) - (4)].ConstVector)->size(); i != e; ++i) { + Constant *C = (*(yyvsp[(3) - (4)].ConstVector))[i].C; if (C->getType() != STy->getElementType(i)) error("Expected type '" + STy->getElementType(i)->getDescription() + "' for element #" + utostr(i) + " of structure initializer"); Fields.push_back(C); } - yyval.ConstVal.C = ConstantStruct::get(STy, Fields); - yyval.ConstVal.S.copy(yyvsp[-3].TypeVal.S); - delete yyvsp[-3].TypeVal.PAT; - delete yyvsp[-1].ConstVector; - ; - break;} -case 149: -#line 2366 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const StructType *STy = dyn_cast(yyvsp[-2].TypeVal.PAT->get()); + (yyval.ConstVal).C = ConstantStruct::get(STy, Fields); + (yyval.ConstVal).S.copy((yyvsp[(1) - (4)].TypeVal).S); + delete (yyvsp[(1) - (4)].TypeVal).PAT; + delete (yyvsp[(3) - (4)].ConstVector); + ;} + break; + + case 150: +#line 2292 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const StructType *STy = dyn_cast((yyvsp[(1) - (3)].TypeVal).PAT->get()); if (STy == 0) error("Cannot make struct constant with type: '" + - yyvsp[-2].TypeVal.PAT->get()->getDescription() + "'"); + (yyvsp[(1) - (3)].TypeVal).PAT->get()->getDescription() + "'"); if (STy->getNumContainedTypes() != 0) error("Illegal number of initializers for structure type"); - yyval.ConstVal.C = ConstantStruct::get(STy, std::vector()); - yyval.ConstVal.S.copy(yyvsp[-2].TypeVal.S); - delete yyvsp[-2].TypeVal.PAT; - ; - break;} -case 150: -#line 2377 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const StructType *STy = dyn_cast(yyvsp[-5].TypeVal.PAT->get()); + (yyval.ConstVal).C = ConstantStruct::get(STy, std::vector()); + (yyval.ConstVal).S.copy((yyvsp[(1) - (3)].TypeVal).S); + delete (yyvsp[(1) - (3)].TypeVal).PAT; + ;} + break; + + case 151: +#line 2303 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const StructType *STy = dyn_cast((yyvsp[(1) - (6)].TypeVal).PAT->get()); if (STy == 0) error("Cannot make packed struct constant with type: '" + - yyvsp[-5].TypeVal.PAT->get()->getDescription() + "'"); - if (yyvsp[-2].ConstVector->size() != STy->getNumContainedTypes()) + (yyvsp[(1) - (6)].TypeVal).PAT->get()->getDescription() + "'"); + if ((yyvsp[(4) - (6)].ConstVector)->size() != STy->getNumContainedTypes()) error("Illegal number of initializers for packed structure type"); // Check to ensure that constants are compatible with the type initializer! std::vector Fields; - for (unsigned i = 0, e = yyvsp[-2].ConstVector->size(); i != e; ++i) { - Constant *C = (*yyvsp[-2].ConstVector)[i].C; + for (unsigned i = 0, e = (yyvsp[(4) - (6)].ConstVector)->size(); i != e; ++i) { + Constant *C = (*(yyvsp[(4) - (6)].ConstVector))[i].C; if (C->getType() != STy->getElementType(i)) error("Expected type '" + STy->getElementType(i)->getDescription() + "' for element #" + utostr(i) + " of packed struct initializer"); Fields.push_back(C); } - yyval.ConstVal.C = ConstantStruct::get(STy, Fields); - yyval.ConstVal.S.copy(yyvsp[-5].TypeVal.S); - delete yyvsp[-5].TypeVal.PAT; - delete yyvsp[-2].ConstVector; - ; - break;} -case 151: -#line 2399 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const StructType *STy = dyn_cast(yyvsp[-4].TypeVal.PAT->get()); + (yyval.ConstVal).C = ConstantStruct::get(STy, Fields); + (yyval.ConstVal).S.copy((yyvsp[(1) - (6)].TypeVal).S); + delete (yyvsp[(1) - (6)].TypeVal).PAT; + delete (yyvsp[(4) - (6)].ConstVector); + ;} + break; + + case 152: +#line 2325 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const StructType *STy = dyn_cast((yyvsp[(1) - (5)].TypeVal).PAT->get()); if (STy == 0) error("Cannot make packed struct constant with type: '" + - yyvsp[-4].TypeVal.PAT->get()->getDescription() + "'"); + (yyvsp[(1) - (5)].TypeVal).PAT->get()->getDescription() + "'"); if (STy->getNumContainedTypes() != 0) error("Illegal number of initializers for packed structure type"); - yyval.ConstVal.C = ConstantStruct::get(STy, std::vector()); - yyval.ConstVal.S.copy(yyvsp[-4].TypeVal.S); - delete yyvsp[-4].TypeVal.PAT; - ; - break;} -case 152: -#line 2410 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const PointerType *PTy = dyn_cast(yyvsp[-1].TypeVal.PAT->get()); + (yyval.ConstVal).C = ConstantStruct::get(STy, std::vector()); + (yyval.ConstVal).S.copy((yyvsp[(1) - (5)].TypeVal).S); + delete (yyvsp[(1) - (5)].TypeVal).PAT; + ;} + break; + + case 153: +#line 2336 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const PointerType *PTy = dyn_cast((yyvsp[(1) - (2)].TypeVal).PAT->get()); if (PTy == 0) error("Cannot make null pointer constant with type: '" + - yyvsp[-1].TypeVal.PAT->get()->getDescription() + "'"); - yyval.ConstVal.C = ConstantPointerNull::get(PTy); - yyval.ConstVal.S.copy(yyvsp[-1].TypeVal.S); - delete yyvsp[-1].TypeVal.PAT; - ; - break;} -case 153: -#line 2419 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.ConstVal.C = UndefValue::get(yyvsp[-1].TypeVal.PAT->get()); - yyval.ConstVal.S.copy(yyvsp[-1].TypeVal.S); - delete yyvsp[-1].TypeVal.PAT; - ; - break;} -case 154: -#line 2424 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const PointerType *Ty = dyn_cast(yyvsp[-1].TypeVal.PAT->get()); + (yyvsp[(1) - (2)].TypeVal).PAT->get()->getDescription() + "'"); + (yyval.ConstVal).C = ConstantPointerNull::get(PTy); + (yyval.ConstVal).S.copy((yyvsp[(1) - (2)].TypeVal).S); + delete (yyvsp[(1) - (2)].TypeVal).PAT; + ;} + break; + + case 154: +#line 2345 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.ConstVal).C = UndefValue::get((yyvsp[(1) - (2)].TypeVal).PAT->get()); + (yyval.ConstVal).S.copy((yyvsp[(1) - (2)].TypeVal).S); + delete (yyvsp[(1) - (2)].TypeVal).PAT; + ;} + break; + + case 155: +#line 2350 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const PointerType *Ty = dyn_cast((yyvsp[(1) - (2)].TypeVal).PAT->get()); if (Ty == 0) error("Global const reference must be a pointer type, not" + - yyvsp[-1].TypeVal.PAT->get()->getDescription()); + (yyvsp[(1) - (2)].TypeVal).PAT->get()->getDescription()); // ConstExprs can exist in the body of a function, thus creating // GlobalValues whenever they refer to a variable. Because we are in @@ -3999,8 +4889,8 @@ // Function *SavedCurFn = CurFun.CurrentFunction; CurFun.CurrentFunction = 0; - yyvsp[0].ValIDVal.S.copy(yyvsp[-1].TypeVal.S); - Value *V = getExistingValue(Ty, yyvsp[0].ValIDVal); + (yyvsp[(2) - (2)].ValIDVal).S.copy((yyvsp[(1) - (2)].TypeVal).S); + Value *V = getExistingValue(Ty, (yyvsp[(2) - (2)].ValIDVal)); CurFun.CurrentFunction = SavedCurFn; // If this is an initializer for a constant pointer, which is referencing a @@ -4013,14 +4903,14 @@ // First check to see if the forward references value is already created! PerModuleInfo::GlobalRefsType::iterator I = - CurModule.GlobalRefs.find(std::make_pair(PT, yyvsp[0].ValIDVal)); + CurModule.GlobalRefs.find(std::make_pair(PT, (yyvsp[(2) - (2)].ValIDVal))); if (I != CurModule.GlobalRefs.end()) { V = I->second; // Placeholder already exists, use it... - yyvsp[0].ValIDVal.destroy(); + (yyvsp[(2) - (2)].ValIDVal).destroy(); } else { std::string Name; - if (yyvsp[0].ValIDVal.Type == ValID::NameVal) Name = yyvsp[0].ValIDVal.Name; + if ((yyvsp[(2) - (2)].ValIDVal).Type == ValID::NameVal) Name = (yyvsp[(2) - (2)].ValIDVal).Name; // Create the forward referenced global. GlobalValue *GV; @@ -4035,145 +4925,156 @@ } // Keep track of the fact that we have a forward ref to recycle it - CurModule.GlobalRefs.insert(std::make_pair(std::make_pair(PT, yyvsp[0].ValIDVal), GV)); + CurModule.GlobalRefs.insert(std::make_pair(std::make_pair(PT, (yyvsp[(2) - (2)].ValIDVal)), GV)); V = GV; } } - yyval.ConstVal.C = cast(V); - yyval.ConstVal.S.copy(yyvsp[-1].TypeVal.S); - delete yyvsp[-1].TypeVal.PAT; // Free the type handle - ; - break;} -case 155: -#line 2483 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (yyvsp[-1].TypeVal.PAT->get() != yyvsp[0].ConstVal.C->getType()) + (yyval.ConstVal).C = cast(V); + (yyval.ConstVal).S.copy((yyvsp[(1) - (2)].TypeVal).S); + delete (yyvsp[(1) - (2)].TypeVal).PAT; // Free the type handle + ;} + break; + + case 156: +#line 2409 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if ((yyvsp[(1) - (2)].TypeVal).PAT->get() != (yyvsp[(2) - (2)].ConstVal).C->getType()) error("Mismatched types for constant expression"); - yyval.ConstVal = yyvsp[0].ConstVal; - yyval.ConstVal.S.copy(yyvsp[-1].TypeVal.S); - delete yyvsp[-1].TypeVal.PAT; - ; - break;} -case 156: -#line 2490 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *Ty = yyvsp[-1].TypeVal.PAT->get(); + (yyval.ConstVal) = (yyvsp[(2) - (2)].ConstVal); + (yyval.ConstVal).S.copy((yyvsp[(1) - (2)].TypeVal).S); + delete (yyvsp[(1) - (2)].TypeVal).PAT; + ;} + break; + + case 157: +#line 2416 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *Ty = (yyvsp[(1) - (2)].TypeVal).PAT->get(); if (isa(Ty) || Ty == Type::LabelTy || isa(Ty)) error("Cannot create a null initialized value of this type"); - yyval.ConstVal.C = Constant::getNullValue(Ty); - yyval.ConstVal.S.copy(yyvsp[-1].TypeVal.S); - delete yyvsp[-1].TypeVal.PAT; - ; - break;} -case 157: -#line 2498 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // integral constants - const Type *Ty = yyvsp[-1].PrimType.T; - if (!ConstantInt::isValueValidForType(Ty, yyvsp[0].SInt64Val)) + (yyval.ConstVal).C = Constant::getNullValue(Ty); + (yyval.ConstVal).S.copy((yyvsp[(1) - (2)].TypeVal).S); + delete (yyvsp[(1) - (2)].TypeVal).PAT; + ;} + break; + + case 158: +#line 2424 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // integral constants + const Type *Ty = (yyvsp[(1) - (2)].PrimType).T; + if (!ConstantInt::isValueValidForType(Ty, (yyvsp[(2) - (2)].SInt64Val))) error("Constant value doesn't fit in type"); - yyval.ConstVal.C = ConstantInt::get(Ty, yyvsp[0].SInt64Val); - yyval.ConstVal.S.makeSigned(); - ; - break;} -case 158: -#line 2505 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // integral constants - const Type *Ty = yyvsp[-1].PrimType.T; - if (!ConstantInt::isValueValidForType(Ty, yyvsp[0].UInt64Val)) + (yyval.ConstVal).C = ConstantInt::get(Ty, (yyvsp[(2) - (2)].SInt64Val)); + (yyval.ConstVal).S.makeSigned(); + ;} + break; + + case 159: +#line 2431 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // integral constants + const Type *Ty = (yyvsp[(1) - (2)].PrimType).T; + if (!ConstantInt::isValueValidForType(Ty, (yyvsp[(2) - (2)].UInt64Val))) error("Constant value doesn't fit in type"); - yyval.ConstVal.C = ConstantInt::get(Ty, yyvsp[0].UInt64Val); - yyval.ConstVal.S.makeUnsigned(); - ; - break;} -case 159: -#line 2512 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Boolean constants - yyval.ConstVal.C = ConstantInt::get(Type::Int1Ty, true); - yyval.ConstVal.S.makeUnsigned(); - ; - break;} -case 160: -#line 2516 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Boolean constants - yyval.ConstVal.C = ConstantInt::get(Type::Int1Ty, false); - yyval.ConstVal.S.makeUnsigned(); - ; - break;} -case 161: -#line 2520 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Float & Double constants - if (!ConstantFP::isValueValidForType(yyvsp[-1].PrimType.T, *yyvsp[0].FPVal)) + (yyval.ConstVal).C = ConstantInt::get(Ty, (yyvsp[(2) - (2)].UInt64Val)); + (yyval.ConstVal).S.makeUnsigned(); + ;} + break; + + case 160: +#line 2438 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Boolean constants + (yyval.ConstVal).C = ConstantInt::get(Type::Int1Ty, true); + (yyval.ConstVal).S.makeUnsigned(); + ;} + break; + + case 161: +#line 2442 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Boolean constants + (yyval.ConstVal).C = ConstantInt::get(Type::Int1Ty, false); + (yyval.ConstVal).S.makeUnsigned(); + ;} + break; + + case 162: +#line 2446 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Float & Double constants + if (!ConstantFP::isValueValidForType((yyvsp[(1) - (2)].PrimType).T, *(yyvsp[(2) - (2)].FPVal))) error("Floating point constant invalid for type"); // Lexer has no type info, so builds all FP constants as double. // Fix this here. - if (yyvsp[-1].PrimType.T==Type::FloatTy) - yyvsp[0].FPVal->convert(APFloat::IEEEsingle, APFloat::rmNearestTiesToEven); - yyval.ConstVal.C = ConstantFP::get(yyvsp[-1].PrimType.T, *yyvsp[0].FPVal); - delete yyvsp[0].FPVal; - yyval.ConstVal.S.makeSignless(); - ; - break;} -case 162: -#line 2534 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type* SrcTy = yyvsp[-3].ConstVal.C->getType(); - const Type* DstTy = yyvsp[-1].TypeVal.PAT->get(); - Signedness SrcSign(yyvsp[-3].ConstVal.S); - Signedness DstSign(yyvsp[-1].TypeVal.S); + if ((yyvsp[(1) - (2)].PrimType).T==Type::FloatTy) + (yyvsp[(2) - (2)].FPVal)->convert(APFloat::IEEEsingle, APFloat::rmNearestTiesToEven); + (yyval.ConstVal).C = ConstantFP::get((yyvsp[(1) - (2)].PrimType).T, *(yyvsp[(2) - (2)].FPVal)); + delete (yyvsp[(2) - (2)].FPVal); + (yyval.ConstVal).S.makeSignless(); + ;} + break; + + case 163: +#line 2460 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type* SrcTy = (yyvsp[(3) - (6)].ConstVal).C->getType(); + const Type* DstTy = (yyvsp[(5) - (6)].TypeVal).PAT->get(); + Signedness SrcSign((yyvsp[(3) - (6)].ConstVal).S); + Signedness DstSign((yyvsp[(5) - (6)].TypeVal).S); if (!SrcTy->isFirstClassType()) error("cast constant expression from a non-primitive type: '" + SrcTy->getDescription() + "'"); if (!DstTy->isFirstClassType()) error("cast constant expression to a non-primitive type: '" + DstTy->getDescription() + "'"); - yyval.ConstVal.C = cast(getCast(yyvsp[-5].CastOpVal, yyvsp[-3].ConstVal.C, SrcSign, DstTy, DstSign)); - yyval.ConstVal.S.copy(DstSign); - delete yyvsp[-1].TypeVal.PAT; - ; - break;} -case 163: -#line 2549 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *Ty = yyvsp[-2].ConstVal.C->getType(); + (yyval.ConstVal).C = cast(getCast((yyvsp[(1) - (6)].CastOpVal), (yyvsp[(3) - (6)].ConstVal).C, SrcSign, DstTy, DstSign)); + (yyval.ConstVal).S.copy(DstSign); + delete (yyvsp[(5) - (6)].TypeVal).PAT; + ;} + break; + + case 164: +#line 2475 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *Ty = (yyvsp[(3) - (5)].ConstVal).C->getType(); if (!isa(Ty)) error("GetElementPtr requires a pointer operand"); std::vector CIndices; - upgradeGEPCEIndices(yyvsp[-2].ConstVal.C->getType(), yyvsp[-1].ValueList, CIndices); + upgradeGEPCEIndices((yyvsp[(3) - (5)].ConstVal).C->getType(), (yyvsp[(4) - (5)].ValueList), CIndices); - delete yyvsp[-1].ValueList; - yyval.ConstVal.C = ConstantExpr::getGetElementPtr(yyvsp[-2].ConstVal.C, &CIndices[0], CIndices.size()); - yyval.ConstVal.S.copy(getElementSign(yyvsp[-2].ConstVal, CIndices)); - ; - break;} -case 164: -#line 2561 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (!yyvsp[-5].ConstVal.C->getType()->isInteger() || - cast(yyvsp[-5].ConstVal.C->getType())->getBitWidth() != 1) + delete (yyvsp[(4) - (5)].ValueList); + (yyval.ConstVal).C = ConstantExpr::getGetElementPtr((yyvsp[(3) - (5)].ConstVal).C, &CIndices[0], CIndices.size()); + (yyval.ConstVal).S.copy(getElementSign((yyvsp[(3) - (5)].ConstVal), CIndices)); + ;} + break; + + case 165: +#line 2487 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if (!(yyvsp[(3) - (8)].ConstVal).C->getType()->isInteger() || + cast((yyvsp[(3) - (8)].ConstVal).C->getType())->getBitWidth() != 1) error("Select condition must be bool type"); - if (yyvsp[-3].ConstVal.C->getType() != yyvsp[-1].ConstVal.C->getType()) + if ((yyvsp[(5) - (8)].ConstVal).C->getType() != (yyvsp[(7) - (8)].ConstVal).C->getType()) error("Select operand types must match"); - yyval.ConstVal.C = ConstantExpr::getSelect(yyvsp[-5].ConstVal.C, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C); - yyval.ConstVal.S.copy(yyvsp[-3].ConstVal.S); - ; - break;} -case 165: -#line 2570 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *Ty = yyvsp[-3].ConstVal.C->getType(); - if (Ty != yyvsp[-1].ConstVal.C->getType()) + (yyval.ConstVal).C = ConstantExpr::getSelect((yyvsp[(3) - (8)].ConstVal).C, (yyvsp[(5) - (8)].ConstVal).C, (yyvsp[(7) - (8)].ConstVal).C); + (yyval.ConstVal).S.copy((yyvsp[(5) - (8)].ConstVal).S); + ;} + break; + + case 166: +#line 2496 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *Ty = (yyvsp[(3) - (6)].ConstVal).C->getType(); + if (Ty != (yyvsp[(5) - (6)].ConstVal).C->getType()) error("Binary operator types must match"); // First, make sure we're dealing with the right opcode by upgrading from // obsolete versions. - Instruction::BinaryOps Opcode = getBinaryOp(yyvsp[-5].BinaryOpVal, Ty, yyvsp[-3].ConstVal.S); + Instruction::BinaryOps Opcode = getBinaryOp((yyvsp[(1) - (6)].BinaryOpVal), Ty, (yyvsp[(3) - (6)].ConstVal).S); // HACK: llvm 1.3 and earlier used to emit invalid pointer constant exprs. // To retain backward compatibility with these early compilers, we emit a // cast to the appropriate integer type automatically if we are in the // broken case. See PR424 for more information. if (!isa(Ty)) { - yyval.ConstVal.C = ConstantExpr::get(Opcode, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C); + (yyval.ConstVal).C = ConstantExpr::get(Opcode, (yyvsp[(3) - (6)].ConstVal).C, (yyvsp[(5) - (6)].ConstVal).C); } else { const Type *IntPtrTy = 0; switch (CurModule.CurrentModule->getPointerSize()) { @@ -4181,147 +5082,165 @@ case Module::Pointer64: IntPtrTy = Type::Int64Ty; break; default: error("invalid pointer binary constant expr"); } - yyval.ConstVal.C = ConstantExpr::get(Opcode, - ConstantExpr::getCast(Instruction::PtrToInt, yyvsp[-3].ConstVal.C, IntPtrTy), - ConstantExpr::getCast(Instruction::PtrToInt, yyvsp[-1].ConstVal.C, IntPtrTy)); - yyval.ConstVal.C = ConstantExpr::getCast(Instruction::IntToPtr, yyval.ConstVal.C, Ty); - } - yyval.ConstVal.S.copy(yyvsp[-3].ConstVal.S); - ; - break;} -case 166: -#line 2598 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type* Ty = yyvsp[-3].ConstVal.C->getType(); - if (Ty != yyvsp[-1].ConstVal.C->getType()) + (yyval.ConstVal).C = ConstantExpr::get(Opcode, + ConstantExpr::getCast(Instruction::PtrToInt, (yyvsp[(3) - (6)].ConstVal).C, IntPtrTy), + ConstantExpr::getCast(Instruction::PtrToInt, (yyvsp[(5) - (6)].ConstVal).C, IntPtrTy)); + (yyval.ConstVal).C = ConstantExpr::getCast(Instruction::IntToPtr, (yyval.ConstVal).C, Ty); + } + (yyval.ConstVal).S.copy((yyvsp[(3) - (6)].ConstVal).S); + ;} + break; + + case 167: +#line 2524 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type* Ty = (yyvsp[(3) - (6)].ConstVal).C->getType(); + if (Ty != (yyvsp[(5) - (6)].ConstVal).C->getType()) error("Logical operator types must match"); if (!Ty->isInteger()) { if (!isa(Ty) || !cast(Ty)->getElementType()->isInteger()) error("Logical operator requires integer operands"); } - Instruction::BinaryOps Opcode = getBinaryOp(yyvsp[-5].BinaryOpVal, Ty, yyvsp[-3].ConstVal.S); - yyval.ConstVal.C = ConstantExpr::get(Opcode, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C); - yyval.ConstVal.S.copy(yyvsp[-3].ConstVal.S); - ; - break;} -case 167: -#line 2611 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type* Ty = yyvsp[-3].ConstVal.C->getType(); - if (Ty != yyvsp[-1].ConstVal.C->getType()) + Instruction::BinaryOps Opcode = getBinaryOp((yyvsp[(1) - (6)].BinaryOpVal), Ty, (yyvsp[(3) - (6)].ConstVal).S); + (yyval.ConstVal).C = ConstantExpr::get(Opcode, (yyvsp[(3) - (6)].ConstVal).C, (yyvsp[(5) - (6)].ConstVal).C); + (yyval.ConstVal).S.copy((yyvsp[(3) - (6)].ConstVal).S); + ;} + break; + + case 168: +#line 2537 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type* Ty = (yyvsp[(3) - (6)].ConstVal).C->getType(); + if (Ty != (yyvsp[(5) - (6)].ConstVal).C->getType()) error("setcc operand types must match"); unsigned short pred; - Instruction::OtherOps Opcode = getCompareOp(yyvsp[-5].BinaryOpVal, pred, Ty, yyvsp[-3].ConstVal.S); - yyval.ConstVal.C = ConstantExpr::getCompare(Opcode, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C); - yyval.ConstVal.S.makeUnsigned(); - ; - break;} -case 168: -#line 2620 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (yyvsp[-3].ConstVal.C->getType() != yyvsp[-1].ConstVal.C->getType()) + Instruction::OtherOps Opcode = getCompareOp((yyvsp[(1) - (6)].BinaryOpVal), pred, Ty, (yyvsp[(3) - (6)].ConstVal).S); + (yyval.ConstVal).C = ConstantExpr::getCompare(Opcode, (yyvsp[(3) - (6)].ConstVal).C, (yyvsp[(5) - (6)].ConstVal).C); + (yyval.ConstVal).S.makeUnsigned(); + ;} + break; + + case 169: +#line 2546 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if ((yyvsp[(4) - (7)].ConstVal).C->getType() != (yyvsp[(6) - (7)].ConstVal).C->getType()) error("icmp operand types must match"); - yyval.ConstVal.C = ConstantExpr::getCompare(yyvsp[-5].IPred, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C); - yyval.ConstVal.S.makeUnsigned(); - ; - break;} -case 169: -#line 2626 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (yyvsp[-3].ConstVal.C->getType() != yyvsp[-1].ConstVal.C->getType()) + (yyval.ConstVal).C = ConstantExpr::getCompare((yyvsp[(2) - (7)].IPred), (yyvsp[(4) - (7)].ConstVal).C, (yyvsp[(6) - (7)].ConstVal).C); + (yyval.ConstVal).S.makeUnsigned(); + ;} + break; + + case 170: +#line 2552 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if ((yyvsp[(4) - (7)].ConstVal).C->getType() != (yyvsp[(6) - (7)].ConstVal).C->getType()) error("fcmp operand types must match"); - yyval.ConstVal.C = ConstantExpr::getCompare(yyvsp[-5].FPred, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C); - yyval.ConstVal.S.makeUnsigned(); - ; - break;} -case 170: -#line 2632 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (!yyvsp[-1].ConstVal.C->getType()->isInteger() || - cast(yyvsp[-1].ConstVal.C->getType())->getBitWidth() != 8) + (yyval.ConstVal).C = ConstantExpr::getCompare((yyvsp[(2) - (7)].FPred), (yyvsp[(4) - (7)].ConstVal).C, (yyvsp[(6) - (7)].ConstVal).C); + (yyval.ConstVal).S.makeUnsigned(); + ;} + break; + + case 171: +#line 2558 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if (!(yyvsp[(5) - (6)].ConstVal).C->getType()->isInteger() || + cast((yyvsp[(5) - (6)].ConstVal).C->getType())->getBitWidth() != 8) error("Shift count for shift constant must be unsigned byte"); - const Type* Ty = yyvsp[-3].ConstVal.C->getType(); - if (!yyvsp[-3].ConstVal.C->getType()->isInteger()) + const Type* Ty = (yyvsp[(3) - (6)].ConstVal).C->getType(); + if (!(yyvsp[(3) - (6)].ConstVal).C->getType()->isInteger()) error("Shift constant expression requires integer operand"); - Constant *ShiftAmt = ConstantExpr::getZExt(yyvsp[-1].ConstVal.C, Ty); - yyval.ConstVal.C = ConstantExpr::get(getBinaryOp(yyvsp[-5].BinaryOpVal, Ty, yyvsp[-3].ConstVal.S), yyvsp[-3].ConstVal.C, ShiftAmt); - yyval.ConstVal.S.copy(yyvsp[-3].ConstVal.S); - ; - break;} -case 171: -#line 2643 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (!ExtractElementInst::isValidOperands(yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C)) + Constant *ShiftAmt = ConstantExpr::getZExt((yyvsp[(5) - (6)].ConstVal).C, Ty); + (yyval.ConstVal).C = ConstantExpr::get(getBinaryOp((yyvsp[(1) - (6)].BinaryOpVal), Ty, (yyvsp[(3) - (6)].ConstVal).S), (yyvsp[(3) - (6)].ConstVal).C, ShiftAmt); + (yyval.ConstVal).S.copy((yyvsp[(3) - (6)].ConstVal).S); + ;} + break; + + case 172: +#line 2569 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if (!ExtractElementInst::isValidOperands((yyvsp[(3) - (6)].ConstVal).C, (yyvsp[(5) - (6)].ConstVal).C)) error("Invalid extractelement operands"); - yyval.ConstVal.C = ConstantExpr::getExtractElement(yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C); - yyval.ConstVal.S.copy(yyvsp[-3].ConstVal.S.get(0)); - ; - break;} -case 172: -#line 2649 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (!InsertElementInst::isValidOperands(yyvsp[-5].ConstVal.C, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C)) + (yyval.ConstVal).C = ConstantExpr::getExtractElement((yyvsp[(3) - (6)].ConstVal).C, (yyvsp[(5) - (6)].ConstVal).C); + (yyval.ConstVal).S.copy((yyvsp[(3) - (6)].ConstVal).S.get(0)); + ;} + break; + + case 173: +#line 2575 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if (!InsertElementInst::isValidOperands((yyvsp[(3) - (8)].ConstVal).C, (yyvsp[(5) - (8)].ConstVal).C, (yyvsp[(7) - (8)].ConstVal).C)) error("Invalid insertelement operands"); - yyval.ConstVal.C = ConstantExpr::getInsertElement(yyvsp[-5].ConstVal.C, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C); - yyval.ConstVal.S.copy(yyvsp[-5].ConstVal.S); - ; - break;} -case 173: -#line 2655 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (!ShuffleVectorInst::isValidOperands(yyvsp[-5].ConstVal.C, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C)) + (yyval.ConstVal).C = ConstantExpr::getInsertElement((yyvsp[(3) - (8)].ConstVal).C, (yyvsp[(5) - (8)].ConstVal).C, (yyvsp[(7) - (8)].ConstVal).C); + (yyval.ConstVal).S.copy((yyvsp[(3) - (8)].ConstVal).S); + ;} + break; + + case 174: +#line 2581 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if (!ShuffleVectorInst::isValidOperands((yyvsp[(3) - (8)].ConstVal).C, (yyvsp[(5) - (8)].ConstVal).C, (yyvsp[(7) - (8)].ConstVal).C)) error("Invalid shufflevector operands"); - yyval.ConstVal.C = ConstantExpr::getShuffleVector(yyvsp[-5].ConstVal.C, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C); - yyval.ConstVal.S.copy(yyvsp[-5].ConstVal.S); - ; - break;} -case 174: -#line 2666 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ (yyval.ConstVector = yyvsp[-2].ConstVector)->push_back(yyvsp[0].ConstVal); ; - break;} -case 175: -#line 2667 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.ConstVector = new std::vector(); - yyval.ConstVector->push_back(yyvsp[0].ConstVal); - ; - break;} -case 176: -#line 2676 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.BoolVal = false; ; - break;} -case 177: -#line 2677 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.BoolVal = true; ; - break;} -case 178: -#line 2689 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.ModuleVal = ParserResult = yyvsp[0].ModuleVal; + (yyval.ConstVal).C = ConstantExpr::getShuffleVector((yyvsp[(3) - (8)].ConstVal).C, (yyvsp[(5) - (8)].ConstVal).C, (yyvsp[(7) - (8)].ConstVal).C); + (yyval.ConstVal).S.copy((yyvsp[(3) - (8)].ConstVal).S); + ;} + break; + + case 175: +#line 2592 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { ((yyval.ConstVector) = (yyvsp[(1) - (3)].ConstVector))->push_back((yyvsp[(3) - (3)].ConstVal)); ;} + break; + + case 176: +#line 2593 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.ConstVector) = new std::vector(); + (yyval.ConstVector)->push_back((yyvsp[(1) - (1)].ConstVal)); + ;} + break; + + case 177: +#line 2602 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.BoolVal) = false; ;} + break; + + case 178: +#line 2603 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.BoolVal) = true; ;} + break; + + case 179: +#line 2615 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.ModuleVal) = ParserResult = (yyvsp[(1) - (1)].ModuleVal); CurModule.ModuleDone(); - ; - break;} -case 179: -#line 2698 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ModuleVal = yyvsp[-1].ModuleVal; CurFun.FunctionDone(); ; - break;} -case 180: -#line 2699 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ModuleVal = yyvsp[-1].ModuleVal; ; - break;} -case 181: -#line 2700 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ModuleVal = yyvsp[-3].ModuleVal; ; - break;} -case 182: -#line 2701 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ModuleVal = yyvsp[-1].ModuleVal; ; - break;} -case 183: -#line 2702 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.ModuleVal = CurModule.CurrentModule; + ;} + break; + + case 180: +#line 2624 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ModuleVal) = (yyvsp[(1) - (2)].ModuleVal); CurFun.FunctionDone(); ;} + break; + + case 181: +#line 2625 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ModuleVal) = (yyvsp[(1) - (2)].ModuleVal); ;} + break; + + case 182: +#line 2626 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ModuleVal) = (yyvsp[(1) - (4)].ModuleVal); ;} + break; + + case 183: +#line 2627 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ModuleVal) = (yyvsp[(1) - (2)].ModuleVal); ;} + break; + + case 184: +#line 2628 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.ModuleVal) = CurModule.CurrentModule; // Emit an error if there are any unresolved types left. if (!CurModule.LateResolveTypes.empty()) { const ValID &DID = CurModule.LateResolveTypes.begin()->first; @@ -4331,11 +5250,12 @@ error("Reference to an undefined type: #" + itostr(DID.Num)); } } - ; - break;} -case 184: -#line 2718 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ + ;} + break; + + case 185: +#line 2644 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Eagerly resolve types. This is not an optimization, this is a // requirement that is due to the fact that we could have this: // @@ -4345,243 +5265,275 @@ // If types are not resolved eagerly, then the two types will not be // determined to be the same type! // - ResolveTypeTo(yyvsp[-2].StrVal, yyvsp[0].TypeVal.PAT->get(), yyvsp[0].TypeVal.S); + ResolveTypeTo((yyvsp[(2) - (4)].StrVal), (yyvsp[(4) - (4)].TypeVal).PAT->get(), (yyvsp[(4) - (4)].TypeVal).S); - if (!setTypeName(yyvsp[0].TypeVal, yyvsp[-2].StrVal) && !yyvsp[-2].StrVal) { + if (!setTypeName((yyvsp[(4) - (4)].TypeVal), (yyvsp[(2) - (4)].StrVal)) && !(yyvsp[(2) - (4)].StrVal)) { // If this is a numbered type that is not a redefinition, add it to the // slot table. - CurModule.Types.push_back(yyvsp[0].TypeVal.PAT->get()); - CurModule.TypeSigns.push_back(yyvsp[0].TypeVal.S); + CurModule.Types.push_back((yyvsp[(4) - (4)].TypeVal).PAT->get()); + CurModule.TypeSigns.push_back((yyvsp[(4) - (4)].TypeVal).S); } - delete yyvsp[0].TypeVal.PAT; - ; - break;} -case 185: -#line 2738 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Function prototypes can be in const pool - ; - break;} -case 186: -#line 2740 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Asm blocks can be in the const pool - ; - break;} -case 187: -#line 2742 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (yyvsp[0].ConstVal.C == 0) + delete (yyvsp[(4) - (4)].TypeVal).PAT; + ;} + break; + + case 186: +#line 2664 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Function prototypes can be in const pool + ;} + break; + + case 187: +#line 2666 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Asm blocks can be in the const pool + ;} + break; + + case 188: +#line 2668 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if ((yyvsp[(5) - (5)].ConstVal).C == 0) error("Global value initializer is not a constant"); - CurGV = ParseGlobalVariable(yyvsp[-3].StrVal, yyvsp[-2].Linkage, yyvsp[-1].BoolVal, yyvsp[0].ConstVal.C->getType(), yyvsp[0].ConstVal.C, yyvsp[0].ConstVal.S); - ; - break;} -case 188: -#line 2746 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ + CurGV = ParseGlobalVariable((yyvsp[(2) - (5)].StrVal), (yyvsp[(3) - (5)].Linkage), (yyvsp[(4) - (5)].BoolVal), (yyvsp[(5) - (5)].ConstVal).C->getType(), (yyvsp[(5) - (5)].ConstVal).C, (yyvsp[(5) - (5)].ConstVal).S); + ;} + break; + + case 189: +#line 2672 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { CurGV = 0; - ; - break;} -case 189: -#line 2749 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *Ty = yyvsp[0].TypeVal.PAT->get(); - CurGV = ParseGlobalVariable(yyvsp[-3].StrVal, GlobalValue::ExternalLinkage, yyvsp[-1].BoolVal, Ty, 0, - yyvsp[0].TypeVal.S); - delete yyvsp[0].TypeVal.PAT; - ; - break;} -case 190: -#line 2754 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ + ;} + break; + + case 190: +#line 2675 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *Ty = (yyvsp[(5) - (5)].TypeVal).PAT->get(); + CurGV = ParseGlobalVariable((yyvsp[(2) - (5)].StrVal), GlobalValue::ExternalLinkage, (yyvsp[(4) - (5)].BoolVal), Ty, 0, + (yyvsp[(5) - (5)].TypeVal).S); + delete (yyvsp[(5) - (5)].TypeVal).PAT; + ;} + break; + + case 191: +#line 2680 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { CurGV = 0; - ; - break;} -case 191: -#line 2757 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *Ty = yyvsp[0].TypeVal.PAT->get(); - CurGV = ParseGlobalVariable(yyvsp[-3].StrVal, GlobalValue::DLLImportLinkage, yyvsp[-1].BoolVal, Ty, 0, - yyvsp[0].TypeVal.S); - delete yyvsp[0].TypeVal.PAT; - ; - break;} -case 192: -#line 2762 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ + ;} + break; + + case 192: +#line 2683 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *Ty = (yyvsp[(5) - (5)].TypeVal).PAT->get(); + CurGV = ParseGlobalVariable((yyvsp[(2) - (5)].StrVal), GlobalValue::DLLImportLinkage, (yyvsp[(4) - (5)].BoolVal), Ty, 0, + (yyvsp[(5) - (5)].TypeVal).S); + delete (yyvsp[(5) - (5)].TypeVal).PAT; + ;} + break; + + case 193: +#line 2688 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { CurGV = 0; - ; - break;} -case 193: -#line 2765 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *Ty = yyvsp[0].TypeVal.PAT->get(); + ;} + break; + + case 194: +#line 2691 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *Ty = (yyvsp[(5) - (5)].TypeVal).PAT->get(); CurGV = - ParseGlobalVariable(yyvsp[-3].StrVal, GlobalValue::ExternalWeakLinkage, yyvsp[-1].BoolVal, Ty, 0, - yyvsp[0].TypeVal.S); - delete yyvsp[0].TypeVal.PAT; - ; - break;} -case 194: -#line 2771 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ + ParseGlobalVariable((yyvsp[(2) - (5)].StrVal), GlobalValue::ExternalWeakLinkage, (yyvsp[(4) - (5)].BoolVal), Ty, 0, + (yyvsp[(5) - (5)].TypeVal).S); + delete (yyvsp[(5) - (5)].TypeVal).PAT; + ;} + break; + + case 195: +#line 2697 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { CurGV = 0; - ; - break;} -case 195: -#line 2774 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - ; - break;} -case 196: -#line 2776 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - ; - break;} -case 197: -#line 2778 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - ; - break;} -case 198: -#line 2783 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ + ;} + break; + + case 196: +#line 2700 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + ;} + break; + + case 197: +#line 2702 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + ;} + break; + + case 198: +#line 2704 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + ;} + break; + + case 199: +#line 2709 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm(); - char *EndStr = UnEscapeLexed(yyvsp[0].StrVal, true); - std::string NewAsm(yyvsp[0].StrVal, EndStr); - free(yyvsp[0].StrVal); + char *EndStr = UnEscapeLexed((yyvsp[(1) - (1)].StrVal), true); + std::string NewAsm((yyvsp[(1) - (1)].StrVal), EndStr); + free((yyvsp[(1) - (1)].StrVal)); if (AsmSoFar.empty()) CurModule.CurrentModule->setModuleInlineAsm(NewAsm); else CurModule.CurrentModule->setModuleInlineAsm(AsmSoFar+"\n"+NewAsm); - ; - break;} -case 199: -#line 2797 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.Endianness = Module::BigEndian; ; - break;} -case 200: -#line 2798 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.Endianness = Module::LittleEndian; ; - break;} -case 201: -#line 2802 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - CurModule.setEndianness(yyvsp[0].Endianness); - ; - break;} -case 202: -#line 2805 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (yyvsp[0].UInt64Val == 32) + ;} + break; + + case 200: +#line 2723 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Endianness) = Module::BigEndian; ;} + break; + + case 201: +#line 2724 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Endianness) = Module::LittleEndian; ;} + break; + + case 202: +#line 2728 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + CurModule.setEndianness((yyvsp[(3) - (3)].Endianness)); + ;} + break; + + case 203: +#line 2731 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if ((yyvsp[(3) - (3)].UInt64Val) == 32) CurModule.setPointerSize(Module::Pointer32); - else if (yyvsp[0].UInt64Val == 64) + else if ((yyvsp[(3) - (3)].UInt64Val) == 64) CurModule.setPointerSize(Module::Pointer64); else - error("Invalid pointer size: '" + utostr(yyvsp[0].UInt64Val) + "'"); - ; - break;} -case 203: -#line 2813 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - CurModule.CurrentModule->setTargetTriple(yyvsp[0].StrVal); - free(yyvsp[0].StrVal); - ; - break;} -case 204: -#line 2817 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - CurModule.CurrentModule->setDataLayout(yyvsp[0].StrVal); - free(yyvsp[0].StrVal); - ; - break;} -case 206: -#line 2828 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - CurModule.CurrentModule->addLibrary(yyvsp[0].StrVal); - free(yyvsp[0].StrVal); - ; - break;} -case 207: -#line 2832 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - CurModule.CurrentModule->addLibrary(yyvsp[0].StrVal); - free(yyvsp[0].StrVal); - ; - break;} -case 208: -#line 2836 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ ; - break;} -case 212: -#line 2849 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.StrVal = 0; ; - break;} -case 213: -#line 2853 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (yyvsp[-1].TypeVal.PAT->get() == Type::VoidTy) + error("Invalid pointer size: '" + utostr((yyvsp[(3) - (3)].UInt64Val)) + "'"); + ;} + break; + + case 204: +#line 2739 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + CurModule.CurrentModule->setTargetTriple((yyvsp[(3) - (3)].StrVal)); + free((yyvsp[(3) - (3)].StrVal)); + ;} + break; + + case 205: +#line 2743 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + CurModule.CurrentModule->setDataLayout((yyvsp[(3) - (3)].StrVal)); + free((yyvsp[(3) - (3)].StrVal)); + ;} + break; + + case 207: +#line 2754 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + CurModule.CurrentModule->addLibrary((yyvsp[(3) - (3)].StrVal)); + free((yyvsp[(3) - (3)].StrVal)); + ;} + break; + + case 208: +#line 2758 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + CurModule.CurrentModule->addLibrary((yyvsp[(1) - (1)].StrVal)); + free((yyvsp[(1) - (1)].StrVal)); + ;} + break; + + case 209: +#line 2762 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { ;} + break; + + case 213: +#line 2775 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.StrVal) = 0; ;} + break; + + case 214: +#line 2779 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if ((yyvsp[(1) - (2)].TypeVal).PAT->get() == Type::VoidTy) error("void typed arguments are invalid"); - yyval.ArgVal = new std::pair(yyvsp[-1].TypeVal, yyvsp[0].StrVal); - ; - break;} -case 214: -#line 2861 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.ArgList = yyvsp[-2].ArgList; - yyval.ArgList->push_back(*yyvsp[0].ArgVal); - delete yyvsp[0].ArgVal; - ; - break;} -case 215: -#line 2866 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.ArgList = new std::vector >(); - yyval.ArgList->push_back(*yyvsp[0].ArgVal); - delete yyvsp[0].ArgVal; - ; - break;} -case 216: -#line 2874 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ArgList = yyvsp[0].ArgList; ; - break;} -case 217: -#line 2875 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.ArgList = yyvsp[-2].ArgList; + (yyval.ArgVal) = new std::pair((yyvsp[(1) - (2)].TypeVal), (yyvsp[(2) - (2)].StrVal)); + ;} + break; + + case 215: +#line 2787 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.ArgList) = (yyvsp[(1) - (3)].ArgList); + (yyval.ArgList)->push_back(*(yyvsp[(3) - (3)].ArgVal)); + delete (yyvsp[(3) - (3)].ArgVal); + ;} + break; + + case 216: +#line 2792 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.ArgList) = new std::vector >(); + (yyval.ArgList)->push_back(*(yyvsp[(1) - (1)].ArgVal)); + delete (yyvsp[(1) - (1)].ArgVal); + ;} + break; + + case 217: +#line 2800 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ArgList) = (yyvsp[(1) - (1)].ArgList); ;} + break; + + case 218: +#line 2801 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.ArgList) = (yyvsp[(1) - (3)].ArgList); PATypeInfo VoidTI; VoidTI.PAT = new PATypeHolder(Type::VoidTy); VoidTI.S.makeSignless(); - yyval.ArgList->push_back(std::pair(VoidTI, 0)); - ; - break;} -case 218: -#line 2882 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.ArgList = new std::vector >(); + (yyval.ArgList)->push_back(std::pair(VoidTI, 0)); + ;} + break; + + case 219: +#line 2808 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.ArgList) = new std::vector >(); PATypeInfo VoidTI; VoidTI.PAT = new PATypeHolder(Type::VoidTy); VoidTI.S.makeSignless(); - yyval.ArgList->push_back(std::pair(VoidTI, 0)); - ; - break;} -case 219: -#line 2889 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ArgList = 0; ; - break;} -case 220: -#line 2893 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - UnEscapeLexed(yyvsp[-5].StrVal); - std::string FunctionName(yyvsp[-5].StrVal); - free(yyvsp[-5].StrVal); // Free strdup'd memory! + (yyval.ArgList)->push_back(std::pair(VoidTI, 0)); + ;} + break; + + case 220: +#line 2815 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ArgList) = 0; ;} + break; + + case 221: +#line 2819 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + UnEscapeLexed((yyvsp[(3) - (8)].StrVal)); + std::string FunctionName((yyvsp[(3) - (8)].StrVal)); + free((yyvsp[(3) - (8)].StrVal)); // Free strdup'd memory! - const Type* RetTy = yyvsp[-6].TypeVal.PAT->get(); + const Type* RetTy = (yyvsp[(2) - (8)].TypeVal).PAT->get(); if (!RetTy->isFirstClassType() && RetTy != Type::VoidTy) error("LLVM functions cannot return aggregate types"); Signedness FTySign; - FTySign.makeComposite(yyvsp[-6].TypeVal.S); + FTySign.makeComposite((yyvsp[(2) - (8)].TypeVal).S); std::vector ParamTyList; // In LLVM 2.0 the signatures of three varargs intrinsics changed to take @@ -4592,9 +5544,9 @@ } else if (FunctionName == "llvm.va_copy") { ParamTyList.push_back(PointerType::get(Type::Int8Ty)); ParamTyList.push_back(PointerType::get(Type::Int8Ty)); - } else if (yyvsp[-3].ArgList) { // If there are arguments... + } else if ((yyvsp[(5) - (8)].ArgList)) { // If there are arguments... for (std::vector >::iterator - I = yyvsp[-3].ArgList->begin(), E = yyvsp[-3].ArgList->end(); I != E; ++I) { + I = (yyvsp[(5) - (8)].ArgList)->begin(), E = (yyvsp[(5) - (8)].ArgList)->end(); I != E; ++I) { const Type *Ty = I->first.PAT->get(); ParamTyList.push_back(Ty); FTySign.add(I->first.S); @@ -4605,21 +5557,9 @@ if (isVarArg) ParamTyList.pop_back(); - // Convert the CSRet calling convention into the corresponding parameter - // attribute. - ParamAttrsList *PAL = 0; - if (yyvsp[-7].UIntVal == OldCallingConv::CSRet) { - ParamAttrsVector Attrs; - ParamAttrsWithIndex PAWI; - PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg - Attrs.push_back(PAWI); - PAL = ParamAttrsList::get(Attrs); - } - - const FunctionType *FT = - FunctionType::get(RetTy, ParamTyList, isVarArg, PAL); + const FunctionType *FT = FunctionType::get(RetTy, ParamTyList, isVarArg); const PointerType *PFT = PointerType::get(FT); - delete yyvsp[-6].TypeVal.PAT; + delete (yyvsp[(2) - (8)].TypeVal).PAT; ValID ID; if (!FunctionName.empty()) { @@ -4728,143 +5668,173 @@ // argument to another function. Fn->setLinkage(CurFun.Linkage); } - Fn->setCallingConv(upgradeCallingConv(yyvsp[-7].UIntVal)); - Fn->setAlignment(yyvsp[0].UIntVal); - if (yyvsp[-1].StrVal) { - Fn->setSection(yyvsp[-1].StrVal); - free(yyvsp[-1].StrVal); + Fn->setCallingConv(upgradeCallingConv((yyvsp[(1) - (8)].UIntVal))); + Fn->setAlignment((yyvsp[(8) - (8)].UIntVal)); + if ((yyvsp[(7) - (8)].StrVal)) { + Fn->setSection((yyvsp[(7) - (8)].StrVal)); + free((yyvsp[(7) - (8)].StrVal)); + } + + // Convert the CSRet calling convention into the corresponding parameter + // attribute. + if ((yyvsp[(1) - (8)].UIntVal) == OldCallingConv::CSRet) { + ParamAttrsVector Attrs; + ParamAttrsWithIndex PAWI; + PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg + Attrs.push_back(PAWI); + Fn->setParamAttrs(ParamAttrsList::get(Attrs)); } // Add all of the arguments we parsed to the function... - if (yyvsp[-3].ArgList) { // Is null if empty... + if ((yyvsp[(5) - (8)].ArgList)) { // Is null if empty... if (isVarArg) { // Nuke the last entry - assert(yyvsp[-3].ArgList->back().first.PAT->get() == Type::VoidTy && - yyvsp[-3].ArgList->back().second == 0 && "Not a varargs marker"); - delete yyvsp[-3].ArgList->back().first.PAT; - yyvsp[-3].ArgList->pop_back(); // Delete the last entry + assert((yyvsp[(5) - (8)].ArgList)->back().first.PAT->get() == Type::VoidTy && + (yyvsp[(5) - (8)].ArgList)->back().second == 0 && "Not a varargs marker"); + delete (yyvsp[(5) - (8)].ArgList)->back().first.PAT; + (yyvsp[(5) - (8)].ArgList)->pop_back(); // Delete the last entry } Function::arg_iterator ArgIt = Fn->arg_begin(); Function::arg_iterator ArgEnd = Fn->arg_end(); - std::vector >::iterator I = yyvsp[-3].ArgList->begin(); - std::vector >::iterator E = yyvsp[-3].ArgList->end(); + std::vector >::iterator I = (yyvsp[(5) - (8)].ArgList)->begin(); + std::vector >::iterator E = (yyvsp[(5) - (8)].ArgList)->end(); for ( ; I != E && ArgIt != ArgEnd; ++I, ++ArgIt) { delete I->first.PAT; // Delete the typeholder... ValueInfo VI; VI.V = ArgIt; VI.S.copy(I->first.S); setValueName(VI, I->second); // Insert arg into symtab... InsertValue(ArgIt); } - delete yyvsp[-3].ArgList; // We're now done with the argument list + delete (yyvsp[(5) - (8)].ArgList); // We're now done with the argument list } lastCallingConv = OldCallingConv::C; - ; - break;} -case 223: -#line 3087 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ CurFun.Linkage = yyvsp[0].Linkage; ; - break;} -case 224: -#line 3087 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.FunctionVal = CurFun.CurrentFunction; + ;} + break; + + case 224: +#line 3011 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { CurFun.Linkage = (yyvsp[(1) - (1)].Linkage); ;} + break; + + case 225: +#line 3011 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.FunctionVal) = CurFun.CurrentFunction; // Make sure that we keep track of the linkage type even if there was a // previous "declare". - yyval.FunctionVal->setLinkage(yyvsp[-3].Linkage); - ; - break;} -case 227: -#line 3101 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.FunctionVal = yyvsp[-1].FunctionVal; - ; - break;} -case 228: -#line 3106 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.Linkage = GlobalValue::ExternalLinkage; ; - break;} -case 229: -#line 3107 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.Linkage = GlobalValue::DLLImportLinkage; ; - break;} -case 230: -#line 3108 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.Linkage = GlobalValue::ExternalWeakLinkage; ; - break;} -case 231: -#line 3112 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ CurFun.isDeclare = true; ; - break;} -case 232: -#line 3113 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ CurFun.Linkage = yyvsp[0].Linkage; ; - break;} -case 233: -#line 3113 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.FunctionVal = CurFun.CurrentFunction; + (yyval.FunctionVal)->setLinkage((yyvsp[(1) - (4)].Linkage)); + ;} + break; + + case 228: +#line 3025 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal); + ;} + break; + + case 229: +#line 3030 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;} + break; + + case 230: +#line 3031 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;} + break; + + case 231: +#line 3032 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;} + break; + + case 232: +#line 3036 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { CurFun.isDeclare = true; ;} + break; + + case 233: +#line 3037 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { CurFun.Linkage = (yyvsp[(3) - (3)].Linkage); ;} + break; + + case 234: +#line 3037 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.FunctionVal) = CurFun.CurrentFunction; CurFun.FunctionDone(); - ; - break;} -case 234: -#line 3125 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.BoolVal = false; ; - break;} -case 235: -#line 3126 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.BoolVal = true; ; - break;} -case 236: -#line 3131 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ValIDVal = ValID::create(yyvsp[0].SInt64Val); ; - break;} -case 237: -#line 3132 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ValIDVal = ValID::create(yyvsp[0].UInt64Val); ; - break;} -case 238: -#line 3133 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ValIDVal = ValID::create(yyvsp[0].FPVal); ; - break;} -case 239: -#line 3134 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.ValIDVal = ValID::create(ConstantInt::get(Type::Int1Ty, true)); - yyval.ValIDVal.S.makeUnsigned(); - ; - break;} -case 240: -#line 3138 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.ValIDVal = ValID::create(ConstantInt::get(Type::Int1Ty, false)); - yyval.ValIDVal.S.makeUnsigned(); - ; - break;} -case 241: -#line 3142 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ValIDVal = ValID::createNull(); ; - break;} -case 242: -#line 3143 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ValIDVal = ValID::createUndef(); ; - break;} -case 243: -#line 3144 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ValIDVal = ValID::createZeroInit(); ; - break;} -case 244: -#line 3145 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Nonempty unsized packed vector - const Type *ETy = (*yyvsp[-1].ConstVector)[0].C->getType(); - int NumElements = yyvsp[-1].ConstVector->size(); + ;} + break; + + case 235: +#line 3049 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.BoolVal) = false; ;} + break; + + case 236: +#line 3050 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.BoolVal) = true; ;} + break; + + case 237: +#line 3055 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].SInt64Val)); ;} + break; + + case 238: +#line 3056 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].UInt64Val)); ;} + break; + + case 239: +#line 3057 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].FPVal)); ;} + break; + + case 240: +#line 3058 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.ValIDVal) = ValID::create(ConstantInt::get(Type::Int1Ty, true)); + (yyval.ValIDVal).S.makeUnsigned(); + ;} + break; + + case 241: +#line 3062 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.ValIDVal) = ValID::create(ConstantInt::get(Type::Int1Ty, false)); + (yyval.ValIDVal).S.makeUnsigned(); + ;} + break; + + case 242: +#line 3066 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ValIDVal) = ValID::createNull(); ;} + break; + + case 243: +#line 3067 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ValIDVal) = ValID::createUndef(); ;} + break; + + case 244: +#line 3068 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ValIDVal) = ValID::createZeroInit(); ;} + break; + + case 245: +#line 3069 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Nonempty unsized packed vector + const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0].C->getType(); + int NumElements = (yyvsp[(2) - (3)].ConstVector)->size(); VectorType* pt = VectorType::get(ETy, NumElements); - yyval.ValIDVal.S.makeComposite((*yyvsp[-1].ConstVector)[0].S); - PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(pt, yyval.ValIDVal.S)); + (yyval.ValIDVal).S.makeComposite((*(yyvsp[(2) - (3)].ConstVector))[0].S); + PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(pt, (yyval.ValIDVal).S)); // Verify all elements are correct type! std::vector Elems; - for (unsigned i = 0; i < yyvsp[-1].ConstVector->size(); i++) { - Constant *C = (*yyvsp[-1].ConstVector)[i].C; + for (unsigned i = 0; i < (yyvsp[(2) - (3)].ConstVector)->size(); i++) { + Constant *C = (*(yyvsp[(2) - (3)].ConstVector))[i].C; const Type *CTy = C->getType(); if (ETy != CTy) error("Element #" + utostr(i) + " is not of type '" + @@ -4872,226 +5842,236 @@ CTy->getDescription() + "'"); Elems.push_back(C); } - yyval.ValIDVal = ValID::create(ConstantVector::get(pt, Elems)); - delete PTy; delete yyvsp[-1].ConstVector; - ; - break;} -case 245: -#line 3166 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.ValIDVal = ValID::create(yyvsp[0].ConstVal.C); - yyval.ValIDVal.S.copy(yyvsp[0].ConstVal.S); - ; - break;} -case 246: -#line 3170 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - char *End = UnEscapeLexed(yyvsp[-2].StrVal, true); - std::string AsmStr = std::string(yyvsp[-2].StrVal, End); - End = UnEscapeLexed(yyvsp[0].StrVal, true); - std::string Constraints = std::string(yyvsp[0].StrVal, End); - yyval.ValIDVal = ValID::createInlineAsm(AsmStr, Constraints, yyvsp[-3].BoolVal); - free(yyvsp[-2].StrVal); - free(yyvsp[0].StrVal); - ; - break;} -case 247: -#line 3184 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ValIDVal = ValID::create(yyvsp[0].SIntVal); yyval.ValIDVal.S.makeSignless(); ; - break;} -case 248: -#line 3185 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ValIDVal = ValID::create(yyvsp[0].StrVal); yyval.ValIDVal.S.makeSignless(); ; - break;} -case 251: -#line 3198 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *Ty = yyvsp[-1].TypeVal.PAT->get(); - yyvsp[0].ValIDVal.S.copy(yyvsp[-1].TypeVal.S); - yyval.ValueVal.V = getVal(Ty, yyvsp[0].ValIDVal); - yyval.ValueVal.S.copy(yyvsp[-1].TypeVal.S); - delete yyvsp[-1].TypeVal.PAT; - ; - break;} -case 252: -#line 3208 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.FunctionVal = yyvsp[-1].FunctionVal; - ; - break;} -case 253: -#line 3211 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Do not allow functions with 0 basic blocks - yyval.FunctionVal = yyvsp[-1].FunctionVal; - ; - break;} -case 254: -#line 3220 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - ValueInfo VI; VI.V = yyvsp[0].TermInstVal.TI; VI.S.copy(yyvsp[0].TermInstVal.S); - setValueName(VI, yyvsp[-1].StrVal); - InsertValue(yyvsp[0].TermInstVal.TI); - yyvsp[-2].BasicBlockVal->getInstList().push_back(yyvsp[0].TermInstVal.TI); - InsertValue(yyvsp[-2].BasicBlockVal); - yyval.BasicBlockVal = yyvsp[-2].BasicBlockVal; - ; - break;} -case 255: -#line 3231 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (yyvsp[0].InstVal.I) - yyvsp[-1].BasicBlockVal->getInstList().push_back(yyvsp[0].InstVal.I); - yyval.BasicBlockVal = yyvsp[-1].BasicBlockVal; - ; - break;} -case 256: -#line 3236 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.BasicBlockVal = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++),true); + (yyval.ValIDVal) = ValID::create(ConstantVector::get(pt, Elems)); + delete PTy; delete (yyvsp[(2) - (3)].ConstVector); + ;} + break; + + case 246: +#line 3090 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].ConstVal).C); + (yyval.ValIDVal).S.copy((yyvsp[(1) - (1)].ConstVal).S); + ;} + break; + + case 247: +#line 3094 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + char *End = UnEscapeLexed((yyvsp[(3) - (5)].StrVal), true); + std::string AsmStr = std::string((yyvsp[(3) - (5)].StrVal), End); + End = UnEscapeLexed((yyvsp[(5) - (5)].StrVal), true); + std::string Constraints = std::string((yyvsp[(5) - (5)].StrVal), End); + (yyval.ValIDVal) = ValID::createInlineAsm(AsmStr, Constraints, (yyvsp[(2) - (5)].BoolVal)); + free((yyvsp[(3) - (5)].StrVal)); + free((yyvsp[(5) - (5)].StrVal)); + ;} + break; + + case 248: +#line 3108 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].SIntVal)); (yyval.ValIDVal).S.makeSignless(); ;} + break; + + case 249: +#line 3109 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].StrVal)); (yyval.ValIDVal).S.makeSignless(); ;} + break; + + case 252: +#line 3122 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *Ty = (yyvsp[(1) - (2)].TypeVal).PAT->get(); + (yyvsp[(2) - (2)].ValIDVal).S.copy((yyvsp[(1) - (2)].TypeVal).S); + (yyval.ValueVal).V = getVal(Ty, (yyvsp[(2) - (2)].ValIDVal)); + (yyval.ValueVal).S.copy((yyvsp[(1) - (2)].TypeVal).S); + delete (yyvsp[(1) - (2)].TypeVal).PAT; + ;} + break; + + case 253: +#line 3132 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal); + ;} + break; + + case 254: +#line 3135 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Do not allow functions with 0 basic blocks + (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal); + ;} + break; + + case 255: +#line 3144 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + ValueInfo VI; VI.V = (yyvsp[(3) - (3)].TermInstVal).TI; VI.S.copy((yyvsp[(3) - (3)].TermInstVal).S); + setValueName(VI, (yyvsp[(2) - (3)].StrVal)); + InsertValue((yyvsp[(3) - (3)].TermInstVal).TI); + (yyvsp[(1) - (3)].BasicBlockVal)->getInstList().push_back((yyvsp[(3) - (3)].TermInstVal).TI); + InsertValue((yyvsp[(1) - (3)].BasicBlockVal)); + (yyval.BasicBlockVal) = (yyvsp[(1) - (3)].BasicBlockVal); + ;} + break; + + case 256: +#line 3155 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if ((yyvsp[(2) - (2)].InstVal).I) + (yyvsp[(1) - (2)].BasicBlockVal)->getInstList().push_back((yyvsp[(2) - (2)].InstVal).I); + (yyval.BasicBlockVal) = (yyvsp[(1) - (2)].BasicBlockVal); + ;} + break; + + case 257: +#line 3160 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++),true); // Make sure to move the basic block to the correct location in the // function, instead of leaving it inserted wherever it was first // referenced. Function::BasicBlockListType &BBL = CurFun.CurrentFunction->getBasicBlockList(); - BBL.splice(BBL.end(), BBL, yyval.BasicBlockVal); - ; - break;} -case 257: -#line 3245 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.BasicBlockVal = CurBB = getBBVal(ValID::create(yyvsp[0].StrVal), true); + BBL.splice(BBL.end(), BBL, (yyval.BasicBlockVal)); + ;} + break; + + case 258: +#line 3169 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((yyvsp[(1) - (1)].StrVal)), true); // Make sure to move the basic block to the correct location in the // function, instead of leaving it inserted wherever it was first // referenced. Function::BasicBlockListType &BBL = CurFun.CurrentFunction->getBasicBlockList(); - BBL.splice(BBL.end(), BBL, yyval.BasicBlockVal); - ; - break;} -case 260: -#line 3259 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Return with a result... - yyval.TermInstVal.TI = new ReturnInst(yyvsp[0].ValueVal.V); - yyval.TermInstVal.S.makeSignless(); - ; - break;} -case 261: -#line 3263 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Return with no result... - yyval.TermInstVal.TI = new ReturnInst(); - yyval.TermInstVal.S.makeSignless(); - ; - break;} -case 262: -#line 3267 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Unconditional Branch... - BasicBlock* tmpBB = getBBVal(yyvsp[0].ValIDVal); - yyval.TermInstVal.TI = new BranchInst(tmpBB); - yyval.TermInstVal.S.makeSignless(); - ; - break;} -case 263: -#line 3272 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyvsp[-3].ValIDVal.S.makeSignless(); - yyvsp[0].ValIDVal.S.makeSignless(); - BasicBlock* tmpBBA = getBBVal(yyvsp[-3].ValIDVal); - BasicBlock* tmpBBB = getBBVal(yyvsp[0].ValIDVal); - yyvsp[-6].ValIDVal.S.makeUnsigned(); - Value* tmpVal = getVal(Type::Int1Ty, yyvsp[-6].ValIDVal); - yyval.TermInstVal.TI = new BranchInst(tmpBBA, tmpBBB, tmpVal); - yyval.TermInstVal.S.makeSignless(); - ; - break;} -case 264: -#line 3282 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyvsp[-6].ValIDVal.S.copy(yyvsp[-7].PrimType.S); - Value* tmpVal = getVal(yyvsp[-7].PrimType.T, yyvsp[-6].ValIDVal); - yyvsp[-3].ValIDVal.S.makeSignless(); - BasicBlock* tmpBB = getBBVal(yyvsp[-3].ValIDVal); - SwitchInst *S = new SwitchInst(tmpVal, tmpBB, yyvsp[-1].JumpTable->size()); - yyval.TermInstVal.TI = S; - yyval.TermInstVal.S.makeSignless(); - std::vector >::iterator I = yyvsp[-1].JumpTable->begin(), - E = yyvsp[-1].JumpTable->end(); + BBL.splice(BBL.end(), BBL, (yyval.BasicBlockVal)); + ;} + break; + + case 261: +#line 3183 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Return with a result... + (yyval.TermInstVal).TI = new ReturnInst((yyvsp[(2) - (2)].ValueVal).V); + (yyval.TermInstVal).S.makeSignless(); + ;} + break; + + case 262: +#line 3187 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Return with no result... + (yyval.TermInstVal).TI = new ReturnInst(); + (yyval.TermInstVal).S.makeSignless(); + ;} + break; + + case 263: +#line 3191 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Unconditional Branch... + BasicBlock* tmpBB = getBBVal((yyvsp[(3) - (3)].ValIDVal)); + (yyval.TermInstVal).TI = new BranchInst(tmpBB); + (yyval.TermInstVal).S.makeSignless(); + ;} + break; + + case 264: +#line 3196 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyvsp[(6) - (9)].ValIDVal).S.makeSignless(); + (yyvsp[(9) - (9)].ValIDVal).S.makeSignless(); + BasicBlock* tmpBBA = getBBVal((yyvsp[(6) - (9)].ValIDVal)); + BasicBlock* tmpBBB = getBBVal((yyvsp[(9) - (9)].ValIDVal)); + (yyvsp[(3) - (9)].ValIDVal).S.makeUnsigned(); + Value* tmpVal = getVal(Type::Int1Ty, (yyvsp[(3) - (9)].ValIDVal)); + (yyval.TermInstVal).TI = new BranchInst(tmpBBA, tmpBBB, tmpVal); + (yyval.TermInstVal).S.makeSignless(); + ;} + break; + + case 265: +#line 3206 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyvsp[(3) - (9)].ValIDVal).S.copy((yyvsp[(2) - (9)].PrimType).S); + Value* tmpVal = getVal((yyvsp[(2) - (9)].PrimType).T, (yyvsp[(3) - (9)].ValIDVal)); + (yyvsp[(6) - (9)].ValIDVal).S.makeSignless(); + BasicBlock* tmpBB = getBBVal((yyvsp[(6) - (9)].ValIDVal)); + SwitchInst *S = new SwitchInst(tmpVal, tmpBB, (yyvsp[(8) - (9)].JumpTable)->size()); + (yyval.TermInstVal).TI = S; + (yyval.TermInstVal).S.makeSignless(); + std::vector >::iterator I = (yyvsp[(8) - (9)].JumpTable)->begin(), + E = (yyvsp[(8) - (9)].JumpTable)->end(); for (; I != E; ++I) { if (ConstantInt *CI = dyn_cast(I->first)) S->addCase(CI, I->second); else error("Switch case is constant, but not a simple integer"); } - delete yyvsp[-1].JumpTable; - ; - break;} -case 265: -#line 3300 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyvsp[-5].ValIDVal.S.copy(yyvsp[-6].PrimType.S); - Value* tmpVal = getVal(yyvsp[-6].PrimType.T, yyvsp[-5].ValIDVal); - yyvsp[-2].ValIDVal.S.makeSignless(); - BasicBlock* tmpBB = getBBVal(yyvsp[-2].ValIDVal); + delete (yyvsp[(8) - (9)].JumpTable); + ;} + break; + + case 266: +#line 3224 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyvsp[(3) - (8)].ValIDVal).S.copy((yyvsp[(2) - (8)].PrimType).S); + Value* tmpVal = getVal((yyvsp[(2) - (8)].PrimType).T, (yyvsp[(3) - (8)].ValIDVal)); + (yyvsp[(6) - (8)].ValIDVal).S.makeSignless(); + BasicBlock* tmpBB = getBBVal((yyvsp[(6) - (8)].ValIDVal)); SwitchInst *S = new SwitchInst(tmpVal, tmpBB, 0); - yyval.TermInstVal.TI = S; - yyval.TermInstVal.S.makeSignless(); - ; - break;} -case 266: -#line 3310 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ + (yyval.TermInstVal).TI = S; + (yyval.TermInstVal).S.makeSignless(); + ;} + break; + + case 267: +#line 3234 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { const PointerType *PFTy; const FunctionType *Ty; Signedness FTySign; - if (!(PFTy = dyn_cast(yyvsp[-10].TypeVal.PAT->get())) || + if (!(PFTy = dyn_cast((yyvsp[(3) - (13)].TypeVal).PAT->get())) || !(Ty = dyn_cast(PFTy->getElementType()))) { // Pull out the types of all of the arguments... std::vector ParamTypes; - FTySign.makeComposite(yyvsp[-10].TypeVal.S); - if (yyvsp[-7].ValueList) { - for (std::vector::iterator I = yyvsp[-7].ValueList->begin(), E = yyvsp[-7].ValueList->end(); + FTySign.makeComposite((yyvsp[(3) - (13)].TypeVal).S); + if ((yyvsp[(6) - (13)].ValueList)) { + for (std::vector::iterator I = (yyvsp[(6) - (13)].ValueList)->begin(), E = (yyvsp[(6) - (13)].ValueList)->end(); I != E; ++I) { ParamTypes.push_back((*I).V->getType()); FTySign.add(I->S); } } - ParamAttrsList *PAL = 0; - if (yyvsp[-11].UIntVal == OldCallingConv::CSRet) { - ParamAttrsVector Attrs; - ParamAttrsWithIndex PAWI; - PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg - Attrs.push_back(PAWI); - PAL = ParamAttrsList::get(Attrs); - } bool isVarArg = ParamTypes.size() && ParamTypes.back() == Type::VoidTy; if (isVarArg) ParamTypes.pop_back(); - Ty = FunctionType::get(yyvsp[-10].TypeVal.PAT->get(), ParamTypes, isVarArg, PAL); + Ty = FunctionType::get((yyvsp[(3) - (13)].TypeVal).PAT->get(), ParamTypes, isVarArg); PFTy = PointerType::get(Ty); - yyval.TermInstVal.S.copy(yyvsp[-10].TypeVal.S); + (yyval.TermInstVal).S.copy((yyvsp[(3) - (13)].TypeVal).S); } else { - FTySign = yyvsp[-10].TypeVal.S; + FTySign = (yyvsp[(3) - (13)].TypeVal).S; // Get the signedness of the result type. $3 is the pointer to the // function type so we get the 0th element to extract the function type, // and then the 0th element again to get the result type. - yyval.TermInstVal.S.copy(yyvsp[-10].TypeVal.S.get(0).get(0)); + (yyval.TermInstVal).S.copy((yyvsp[(3) - (13)].TypeVal).S.get(0).get(0)); } - yyvsp[-9].ValIDVal.S.makeComposite(FTySign); - Value *V = getVal(PFTy, yyvsp[-9].ValIDVal); // Get the function we're calling... - BasicBlock *Normal = getBBVal(yyvsp[-3].ValIDVal); - BasicBlock *Except = getBBVal(yyvsp[0].ValIDVal); + (yyvsp[(4) - (13)].ValIDVal).S.makeComposite(FTySign); + Value *V = getVal(PFTy, (yyvsp[(4) - (13)].ValIDVal)); // Get the function we're calling... + BasicBlock *Normal = getBBVal((yyvsp[(10) - (13)].ValIDVal)); + BasicBlock *Except = getBBVal((yyvsp[(13) - (13)].ValIDVal)); // Create the call node... - if (!yyvsp[-7].ValueList) { // Has no arguments? + if (!(yyvsp[(6) - (13)].ValueList)) { // Has no arguments? std::vector Args; - yyval.TermInstVal.TI = new InvokeInst(V, Normal, Except, Args.begin(), Args.end()); + (yyval.TermInstVal).TI = new InvokeInst(V, Normal, Except, Args.begin(), Args.end()); } else { // Has arguments? // Loop through FunctionType's arguments and ensure they are specified // correctly! // FunctionType::param_iterator I = Ty->param_begin(); FunctionType::param_iterator E = Ty->param_end(); - std::vector::iterator ArgI = yyvsp[-7].ValueList->begin(), ArgE = yyvsp[-7].ValueList->end(); + std::vector::iterator ArgI = (yyvsp[(6) - (13)].ValueList)->begin(), ArgE = (yyvsp[(6) - (13)].ValueList)->end(); std::vector Args; for (; ArgI != ArgE && I != E; ++ArgI, ++I) { @@ -5104,66 +6084,78 @@ if (I != E || (ArgI != ArgE && !Ty->isVarArg())) error("Invalid number of parameters detected"); - yyval.TermInstVal.TI = new InvokeInst(V, Normal, Except, Args.begin(), Args.end()); + (yyval.TermInstVal).TI = new InvokeInst(V, Normal, Except, Args.begin(), Args.end()); + } + cast((yyval.TermInstVal).TI)->setCallingConv(upgradeCallingConv((yyvsp[(2) - (13)].UIntVal))); + if ((yyvsp[(2) - (13)].UIntVal) == OldCallingConv::CSRet) { + ParamAttrsVector Attrs; + ParamAttrsWithIndex PAWI; + PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg + Attrs.push_back(PAWI); + cast((yyval.TermInstVal).TI)->setParamAttrs(ParamAttrsList::get(Attrs)); } - cast(yyval.TermInstVal.TI)->setCallingConv(upgradeCallingConv(yyvsp[-11].UIntVal)); - delete yyvsp[-10].TypeVal.PAT; - delete yyvsp[-7].ValueList; + delete (yyvsp[(3) - (13)].TypeVal).PAT; + delete (yyvsp[(6) - (13)].ValueList); lastCallingConv = OldCallingConv::C; - ; - break;} -case 267: -#line 3383 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.TermInstVal.TI = new UnwindInst(); - yyval.TermInstVal.S.makeSignless(); - ; - break;} -case 268: -#line 3387 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.TermInstVal.TI = new UnreachableInst(); - yyval.TermInstVal.S.makeSignless(); - ; - break;} -case 269: -#line 3394 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.JumpTable = yyvsp[-5].JumpTable; - yyvsp[-3].ValIDVal.S.copy(yyvsp[-4].PrimType.S); - Constant *V = cast(getExistingValue(yyvsp[-4].PrimType.T, yyvsp[-3].ValIDVal)); + ;} + break; + + case 268: +#line 3306 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.TermInstVal).TI = new UnwindInst(); + (yyval.TermInstVal).S.makeSignless(); + ;} + break; + + case 269: +#line 3310 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.TermInstVal).TI = new UnreachableInst(); + (yyval.TermInstVal).S.makeSignless(); + ;} + break; + + case 270: +#line 3317 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.JumpTable) = (yyvsp[(1) - (6)].JumpTable); + (yyvsp[(3) - (6)].ValIDVal).S.copy((yyvsp[(2) - (6)].PrimType).S); + Constant *V = cast(getExistingValue((yyvsp[(2) - (6)].PrimType).T, (yyvsp[(3) - (6)].ValIDVal))); if (V == 0) error("May only switch on a constant pool value"); - yyvsp[0].ValIDVal.S.makeSignless(); - BasicBlock* tmpBB = getBBVal(yyvsp[0].ValIDVal); - yyval.JumpTable->push_back(std::make_pair(V, tmpBB)); - ; - break;} -case 270: -#line 3406 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.JumpTable = new std::vector >(); - yyvsp[-3].ValIDVal.S.copy(yyvsp[-4].PrimType.S); - Constant *V = cast(getExistingValue(yyvsp[-4].PrimType.T, yyvsp[-3].ValIDVal)); + (yyvsp[(6) - (6)].ValIDVal).S.makeSignless(); + BasicBlock* tmpBB = getBBVal((yyvsp[(6) - (6)].ValIDVal)); + (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB)); + ;} + break; + + case 271: +#line 3329 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.JumpTable) = new std::vector >(); + (yyvsp[(2) - (5)].ValIDVal).S.copy((yyvsp[(1) - (5)].PrimType).S); + Constant *V = cast(getExistingValue((yyvsp[(1) - (5)].PrimType).T, (yyvsp[(2) - (5)].ValIDVal))); if (V == 0) error("May only switch on a constant pool value"); - yyvsp[0].ValIDVal.S.makeSignless(); - BasicBlock* tmpBB = getBBVal(yyvsp[0].ValIDVal); - yyval.JumpTable->push_back(std::make_pair(V, tmpBB)); - ; - break;} -case 271: -#line 3421 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ + (yyvsp[(5) - (5)].ValIDVal).S.makeSignless(); + BasicBlock* tmpBB = getBBVal((yyvsp[(5) - (5)].ValIDVal)); + (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB)); + ;} + break; + + case 272: +#line 3344 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { bool omit = false; - if (yyvsp[-1].StrVal) - if (BitCastInst *BCI = dyn_cast(yyvsp[0].InstVal.I)) + if ((yyvsp[(1) - (2)].StrVal)) + if (BitCastInst *BCI = dyn_cast((yyvsp[(2) - (2)].InstVal).I)) if (BCI->getSrcTy() == BCI->getDestTy() && - BCI->getOperand(0)->getName() == yyvsp[-1].StrVal) + BCI->getOperand(0)->getName() == (yyvsp[(1) - (2)].StrVal)) // This is a useless bit cast causing a name redefinition. It is // a bit cast from a type to the same type of an operand with the // same name as the name we would give this instruction. Since this @@ -5178,240 +6170,258 @@ // The bitcast is clearly useless so we omit it. omit = true; if (omit) { - yyval.InstVal.I = 0; - yyval.InstVal.S.makeSignless(); + (yyval.InstVal).I = 0; + (yyval.InstVal).S.makeSignless(); } else { - ValueInfo VI; VI.V = yyvsp[0].InstVal.I; VI.S.copy(yyvsp[0].InstVal.S); - setValueName(VI, yyvsp[-1].StrVal); - InsertValue(yyvsp[0].InstVal.I); - yyval.InstVal = yyvsp[0].InstVal; - } - ; - break;} -case 272: -#line 3451 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Used for PHI nodes - yyval.PHIList.P = new std::list >(); - yyval.PHIList.S.copy(yyvsp[-5].TypeVal.S); - yyvsp[-3].ValIDVal.S.copy(yyvsp[-5].TypeVal.S); - Value* tmpVal = getVal(yyvsp[-5].TypeVal.PAT->get(), yyvsp[-3].ValIDVal); - yyvsp[-1].ValIDVal.S.makeSignless(); - BasicBlock* tmpBB = getBBVal(yyvsp[-1].ValIDVal); - yyval.PHIList.P->push_back(std::make_pair(tmpVal, tmpBB)); - delete yyvsp[-5].TypeVal.PAT; - ; - break;} -case 273: -#line 3461 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.PHIList = yyvsp[-6].PHIList; - yyvsp[-3].ValIDVal.S.copy(yyvsp[-6].PHIList.S); - Value* tmpVal = getVal(yyvsp[-6].PHIList.P->front().first->getType(), yyvsp[-3].ValIDVal); - yyvsp[-1].ValIDVal.S.makeSignless(); - BasicBlock* tmpBB = getBBVal(yyvsp[-1].ValIDVal); - yyvsp[-6].PHIList.P->push_back(std::make_pair(tmpVal, tmpBB)); - ; - break;} -case 274: -#line 3471 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Used for call statements, and memory insts... - yyval.ValueList = new std::vector(); - yyval.ValueList->push_back(yyvsp[0].ValueVal); - ; - break;} -case 275: -#line 3475 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.ValueList = yyvsp[-2].ValueList; - yyvsp[-2].ValueList->push_back(yyvsp[0].ValueVal); - ; - break;} -case 277: -#line 3483 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ValueList = 0; ; - break;} -case 278: -#line 3487 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.BoolVal = true; - ; - break;} -case 279: -#line 3490 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.BoolVal = false; - ; - break;} -case 280: -#line 3496 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyvsp[-2].ValIDVal.S.copy(yyvsp[-3].TypeVal.S); - yyvsp[0].ValIDVal.S.copy(yyvsp[-3].TypeVal.S); - const Type* Ty = yyvsp[-3].TypeVal.PAT->get(); + ValueInfo VI; VI.V = (yyvsp[(2) - (2)].InstVal).I; VI.S.copy((yyvsp[(2) - (2)].InstVal).S); + setValueName(VI, (yyvsp[(1) - (2)].StrVal)); + InsertValue((yyvsp[(2) - (2)].InstVal).I); + (yyval.InstVal) = (yyvsp[(2) - (2)].InstVal); + } + ;} + break; + + case 273: +#line 3374 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Used for PHI nodes + (yyval.PHIList).P = new std::list >(); + (yyval.PHIList).S.copy((yyvsp[(1) - (6)].TypeVal).S); + (yyvsp[(3) - (6)].ValIDVal).S.copy((yyvsp[(1) - (6)].TypeVal).S); + Value* tmpVal = getVal((yyvsp[(1) - (6)].TypeVal).PAT->get(), (yyvsp[(3) - (6)].ValIDVal)); + (yyvsp[(5) - (6)].ValIDVal).S.makeSignless(); + BasicBlock* tmpBB = getBBVal((yyvsp[(5) - (6)].ValIDVal)); + (yyval.PHIList).P->push_back(std::make_pair(tmpVal, tmpBB)); + delete (yyvsp[(1) - (6)].TypeVal).PAT; + ;} + break; + + case 274: +#line 3384 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.PHIList) = (yyvsp[(1) - (7)].PHIList); + (yyvsp[(4) - (7)].ValIDVal).S.copy((yyvsp[(1) - (7)].PHIList).S); + Value* tmpVal = getVal((yyvsp[(1) - (7)].PHIList).P->front().first->getType(), (yyvsp[(4) - (7)].ValIDVal)); + (yyvsp[(6) - (7)].ValIDVal).S.makeSignless(); + BasicBlock* tmpBB = getBBVal((yyvsp[(6) - (7)].ValIDVal)); + (yyvsp[(1) - (7)].PHIList).P->push_back(std::make_pair(tmpVal, tmpBB)); + ;} + break; + + case 275: +#line 3394 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Used for call statements, and memory insts... + (yyval.ValueList) = new std::vector(); + (yyval.ValueList)->push_back((yyvsp[(1) - (1)].ValueVal)); + ;} + break; + + case 276: +#line 3398 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.ValueList) = (yyvsp[(1) - (3)].ValueList); + (yyvsp[(1) - (3)].ValueList)->push_back((yyvsp[(3) - (3)].ValueVal)); + ;} + break; + + case 278: +#line 3406 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ValueList) = 0; ;} + break; + + case 279: +#line 3410 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.BoolVal) = true; + ;} + break; + + case 280: +#line 3413 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.BoolVal) = false; + ;} + break; + + case 281: +#line 3419 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyvsp[(3) - (5)].ValIDVal).S.copy((yyvsp[(2) - (5)].TypeVal).S); + (yyvsp[(5) - (5)].ValIDVal).S.copy((yyvsp[(2) - (5)].TypeVal).S); + const Type* Ty = (yyvsp[(2) - (5)].TypeVal).PAT->get(); if (!Ty->isInteger() && !Ty->isFloatingPoint() && !isa(Ty)) error("Arithmetic operator requires integer, FP, or packed operands"); if (isa(Ty) && - (yyvsp[-4].BinaryOpVal == URemOp || yyvsp[-4].BinaryOpVal == SRemOp || yyvsp[-4].BinaryOpVal == FRemOp || yyvsp[-4].BinaryOpVal == RemOp)) + ((yyvsp[(1) - (5)].BinaryOpVal) == URemOp || (yyvsp[(1) - (5)].BinaryOpVal) == SRemOp || (yyvsp[(1) - (5)].BinaryOpVal) == FRemOp || (yyvsp[(1) - (5)].BinaryOpVal) == RemOp)) error("Remainder not supported on vector types"); // Upgrade the opcode from obsolete versions before we do anything with it. - Instruction::BinaryOps Opcode = getBinaryOp(yyvsp[-4].BinaryOpVal, Ty, yyvsp[-3].TypeVal.S); - Value* val1 = getVal(Ty, yyvsp[-2].ValIDVal); - Value* val2 = getVal(Ty, yyvsp[0].ValIDVal); - yyval.InstVal.I = BinaryOperator::create(Opcode, val1, val2); - if (yyval.InstVal.I == 0) + Instruction::BinaryOps Opcode = getBinaryOp((yyvsp[(1) - (5)].BinaryOpVal), Ty, (yyvsp[(2) - (5)].TypeVal).S); + Value* val1 = getVal(Ty, (yyvsp[(3) - (5)].ValIDVal)); + Value* val2 = getVal(Ty, (yyvsp[(5) - (5)].ValIDVal)); + (yyval.InstVal).I = BinaryOperator::create(Opcode, val1, val2); + if ((yyval.InstVal).I == 0) error("binary operator returned null"); - yyval.InstVal.S.copy(yyvsp[-3].TypeVal.S); - delete yyvsp[-3].TypeVal.PAT; - ; - break;} -case 281: -#line 3515 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyvsp[-2].ValIDVal.S.copy(yyvsp[-3].TypeVal.S); - yyvsp[0].ValIDVal.S.copy(yyvsp[-3].TypeVal.S); - const Type *Ty = yyvsp[-3].TypeVal.PAT->get(); + (yyval.InstVal).S.copy((yyvsp[(2) - (5)].TypeVal).S); + delete (yyvsp[(2) - (5)].TypeVal).PAT; + ;} + break; + + case 282: +#line 3438 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyvsp[(3) - (5)].ValIDVal).S.copy((yyvsp[(2) - (5)].TypeVal).S); + (yyvsp[(5) - (5)].ValIDVal).S.copy((yyvsp[(2) - (5)].TypeVal).S); + const Type *Ty = (yyvsp[(2) - (5)].TypeVal).PAT->get(); if (!Ty->isInteger()) { if (!isa(Ty) || !cast(Ty)->getElementType()->isInteger()) error("Logical operator requires integral operands"); } - Instruction::BinaryOps Opcode = getBinaryOp(yyvsp[-4].BinaryOpVal, Ty, yyvsp[-3].TypeVal.S); - Value* tmpVal1 = getVal(Ty, yyvsp[-2].ValIDVal); - Value* tmpVal2 = getVal(Ty, yyvsp[0].ValIDVal); - yyval.InstVal.I = BinaryOperator::create(Opcode, tmpVal1, tmpVal2); - if (yyval.InstVal.I == 0) + Instruction::BinaryOps Opcode = getBinaryOp((yyvsp[(1) - (5)].BinaryOpVal), Ty, (yyvsp[(2) - (5)].TypeVal).S); + Value* tmpVal1 = getVal(Ty, (yyvsp[(3) - (5)].ValIDVal)); + Value* tmpVal2 = getVal(Ty, (yyvsp[(5) - (5)].ValIDVal)); + (yyval.InstVal).I = BinaryOperator::create(Opcode, tmpVal1, tmpVal2); + if ((yyval.InstVal).I == 0) error("binary operator returned null"); - yyval.InstVal.S.copy(yyvsp[-3].TypeVal.S); - delete yyvsp[-3].TypeVal.PAT; - ; - break;} -case 282: -#line 3533 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyvsp[-2].ValIDVal.S.copy(yyvsp[-3].TypeVal.S); - yyvsp[0].ValIDVal.S.copy(yyvsp[-3].TypeVal.S); - const Type* Ty = yyvsp[-3].TypeVal.PAT->get(); + (yyval.InstVal).S.copy((yyvsp[(2) - (5)].TypeVal).S); + delete (yyvsp[(2) - (5)].TypeVal).PAT; + ;} + break; + + case 283: +#line 3456 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyvsp[(3) - (5)].ValIDVal).S.copy((yyvsp[(2) - (5)].TypeVal).S); + (yyvsp[(5) - (5)].ValIDVal).S.copy((yyvsp[(2) - (5)].TypeVal).S); + const Type* Ty = (yyvsp[(2) - (5)].TypeVal).PAT->get(); if(isa(Ty)) error("VectorTypes currently not supported in setcc instructions"); unsigned short pred; - Instruction::OtherOps Opcode = getCompareOp(yyvsp[-4].BinaryOpVal, pred, Ty, yyvsp[-3].TypeVal.S); - Value* tmpVal1 = getVal(Ty, yyvsp[-2].ValIDVal); - Value* tmpVal2 = getVal(Ty, yyvsp[0].ValIDVal); - yyval.InstVal.I = CmpInst::create(Opcode, pred, tmpVal1, tmpVal2); - if (yyval.InstVal.I == 0) + Instruction::OtherOps Opcode = getCompareOp((yyvsp[(1) - (5)].BinaryOpVal), pred, Ty, (yyvsp[(2) - (5)].TypeVal).S); + Value* tmpVal1 = getVal(Ty, (yyvsp[(3) - (5)].ValIDVal)); + Value* tmpVal2 = getVal(Ty, (yyvsp[(5) - (5)].ValIDVal)); + (yyval.InstVal).I = CmpInst::create(Opcode, pred, tmpVal1, tmpVal2); + if ((yyval.InstVal).I == 0) error("binary operator returned null"); - yyval.InstVal.S.makeUnsigned(); - delete yyvsp[-3].TypeVal.PAT; - ; - break;} -case 283: -#line 3549 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyvsp[-2].ValIDVal.S.copy(yyvsp[-3].TypeVal.S); - yyvsp[0].ValIDVal.S.copy(yyvsp[-3].TypeVal.S); - const Type *Ty = yyvsp[-3].TypeVal.PAT->get(); + (yyval.InstVal).S.makeUnsigned(); + delete (yyvsp[(2) - (5)].TypeVal).PAT; + ;} + break; + + case 284: +#line 3472 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyvsp[(4) - (6)].ValIDVal).S.copy((yyvsp[(3) - (6)].TypeVal).S); + (yyvsp[(6) - (6)].ValIDVal).S.copy((yyvsp[(3) - (6)].TypeVal).S); + const Type *Ty = (yyvsp[(3) - (6)].TypeVal).PAT->get(); if (isa(Ty)) error("VectorTypes currently not supported in icmp instructions"); else if (!Ty->isInteger() && !isa(Ty)) error("icmp requires integer or pointer typed operands"); - Value* tmpVal1 = getVal(Ty, yyvsp[-2].ValIDVal); - Value* tmpVal2 = getVal(Ty, yyvsp[0].ValIDVal); - yyval.InstVal.I = new ICmpInst(yyvsp[-4].IPred, tmpVal1, tmpVal2); - yyval.InstVal.S.makeUnsigned(); - delete yyvsp[-3].TypeVal.PAT; - ; - break;} -case 284: -#line 3563 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyvsp[-2].ValIDVal.S.copy(yyvsp[-3].TypeVal.S); - yyvsp[0].ValIDVal.S.copy(yyvsp[-3].TypeVal.S); - const Type *Ty = yyvsp[-3].TypeVal.PAT->get(); + Value* tmpVal1 = getVal(Ty, (yyvsp[(4) - (6)].ValIDVal)); + Value* tmpVal2 = getVal(Ty, (yyvsp[(6) - (6)].ValIDVal)); + (yyval.InstVal).I = new ICmpInst((yyvsp[(2) - (6)].IPred), tmpVal1, tmpVal2); + (yyval.InstVal).S.makeUnsigned(); + delete (yyvsp[(3) - (6)].TypeVal).PAT; + ;} + break; + + case 285: +#line 3486 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyvsp[(4) - (6)].ValIDVal).S.copy((yyvsp[(3) - (6)].TypeVal).S); + (yyvsp[(6) - (6)].ValIDVal).S.copy((yyvsp[(3) - (6)].TypeVal).S); + const Type *Ty = (yyvsp[(3) - (6)].TypeVal).PAT->get(); if (isa(Ty)) error("VectorTypes currently not supported in fcmp instructions"); else if (!Ty->isFloatingPoint()) error("fcmp instruction requires floating point operands"); - Value* tmpVal1 = getVal(Ty, yyvsp[-2].ValIDVal); - Value* tmpVal2 = getVal(Ty, yyvsp[0].ValIDVal); - yyval.InstVal.I = new FCmpInst(yyvsp[-4].FPred, tmpVal1, tmpVal2); - yyval.InstVal.S.makeUnsigned(); - delete yyvsp[-3].TypeVal.PAT; - ; - break;} -case 285: -#line 3577 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ + Value* tmpVal1 = getVal(Ty, (yyvsp[(4) - (6)].ValIDVal)); + Value* tmpVal2 = getVal(Ty, (yyvsp[(6) - (6)].ValIDVal)); + (yyval.InstVal).I = new FCmpInst((yyvsp[(2) - (6)].FPred), tmpVal1, tmpVal2); + (yyval.InstVal).S.makeUnsigned(); + delete (yyvsp[(3) - (6)].TypeVal).PAT; + ;} + break; + + case 286: +#line 3500 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { warning("Use of obsolete 'not' instruction: Replacing with 'xor"); - const Type *Ty = yyvsp[0].ValueVal.V->getType(); + const Type *Ty = (yyvsp[(2) - (2)].ValueVal).V->getType(); Value *Ones = ConstantInt::getAllOnesValue(Ty); if (Ones == 0) error("Expected integral type for not instruction"); - yyval.InstVal.I = BinaryOperator::create(Instruction::Xor, yyvsp[0].ValueVal.V, Ones); - if (yyval.InstVal.I == 0) + (yyval.InstVal).I = BinaryOperator::create(Instruction::Xor, (yyvsp[(2) - (2)].ValueVal).V, Ones); + if ((yyval.InstVal).I == 0) error("Could not create a xor instruction"); - yyval.InstVal.S.copy(yyvsp[0].ValueVal.S); - ; - break;} -case 286: -#line 3588 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (!yyvsp[0].ValueVal.V->getType()->isInteger() || - cast(yyvsp[0].ValueVal.V->getType())->getBitWidth() != 8) + (yyval.InstVal).S.copy((yyvsp[(2) - (2)].ValueVal).S); + ;} + break; + + case 287: +#line 3511 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if (!(yyvsp[(4) - (4)].ValueVal).V->getType()->isInteger() || + cast((yyvsp[(4) - (4)].ValueVal).V->getType())->getBitWidth() != 8) error("Shift amount must be int8"); - const Type* Ty = yyvsp[-2].ValueVal.V->getType(); + const Type* Ty = (yyvsp[(2) - (4)].ValueVal).V->getType(); if (!Ty->isInteger()) error("Shift constant expression requires integer operand"); Value* ShiftAmt = 0; if (cast(Ty)->getBitWidth() > Type::Int8Ty->getBitWidth()) - if (Constant *C = dyn_cast(yyvsp[0].ValueVal.V)) + if (Constant *C = dyn_cast((yyvsp[(4) - (4)].ValueVal).V)) ShiftAmt = ConstantExpr::getZExt(C, Ty); else - ShiftAmt = new ZExtInst(yyvsp[0].ValueVal.V, Ty, makeNameUnique("shift"), CurBB); + ShiftAmt = new ZExtInst((yyvsp[(4) - (4)].ValueVal).V, Ty, makeNameUnique("shift"), CurBB); else - ShiftAmt = yyvsp[0].ValueVal.V; - yyval.InstVal.I = BinaryOperator::create(getBinaryOp(yyvsp[-3].BinaryOpVal, Ty, yyvsp[-2].ValueVal.S), yyvsp[-2].ValueVal.V, ShiftAmt); - yyval.InstVal.S.copy(yyvsp[-2].ValueVal.S); - ; - break;} -case 287: -#line 3606 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *DstTy = yyvsp[0].TypeVal.PAT->get(); + ShiftAmt = (yyvsp[(4) - (4)].ValueVal).V; + (yyval.InstVal).I = BinaryOperator::create(getBinaryOp((yyvsp[(1) - (4)].BinaryOpVal), Ty, (yyvsp[(2) - (4)].ValueVal).S), (yyvsp[(2) - (4)].ValueVal).V, ShiftAmt); + (yyval.InstVal).S.copy((yyvsp[(2) - (4)].ValueVal).S); + ;} + break; + + case 288: +#line 3529 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *DstTy = (yyvsp[(4) - (4)].TypeVal).PAT->get(); if (!DstTy->isFirstClassType()) error("cast instruction to a non-primitive type: '" + DstTy->getDescription() + "'"); - yyval.InstVal.I = cast(getCast(yyvsp[-3].CastOpVal, yyvsp[-2].ValueVal.V, yyvsp[-2].ValueVal.S, DstTy, yyvsp[0].TypeVal.S, true)); - yyval.InstVal.S.copy(yyvsp[0].TypeVal.S); - delete yyvsp[0].TypeVal.PAT; - ; - break;} -case 288: -#line 3615 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (!yyvsp[-4].ValueVal.V->getType()->isInteger() || - cast(yyvsp[-4].ValueVal.V->getType())->getBitWidth() != 1) + (yyval.InstVal).I = cast(getCast((yyvsp[(1) - (4)].CastOpVal), (yyvsp[(2) - (4)].ValueVal).V, (yyvsp[(2) - (4)].ValueVal).S, DstTy, (yyvsp[(4) - (4)].TypeVal).S, true)); + (yyval.InstVal).S.copy((yyvsp[(4) - (4)].TypeVal).S); + delete (yyvsp[(4) - (4)].TypeVal).PAT; + ;} + break; + + case 289: +#line 3538 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if (!(yyvsp[(2) - (6)].ValueVal).V->getType()->isInteger() || + cast((yyvsp[(2) - (6)].ValueVal).V->getType())->getBitWidth() != 1) error("select condition must be bool"); - if (yyvsp[-2].ValueVal.V->getType() != yyvsp[0].ValueVal.V->getType()) + if ((yyvsp[(4) - (6)].ValueVal).V->getType() != (yyvsp[(6) - (6)].ValueVal).V->getType()) error("select value types should match"); - yyval.InstVal.I = new SelectInst(yyvsp[-4].ValueVal.V, yyvsp[-2].ValueVal.V, yyvsp[0].ValueVal.V); - yyval.InstVal.S.copy(yyvsp[-2].ValueVal.S); - ; - break;} -case 289: -#line 3624 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *Ty = yyvsp[0].TypeVal.PAT->get(); + (yyval.InstVal).I = new SelectInst((yyvsp[(2) - (6)].ValueVal).V, (yyvsp[(4) - (6)].ValueVal).V, (yyvsp[(6) - (6)].ValueVal).V); + (yyval.InstVal).S.copy((yyvsp[(4) - (6)].ValueVal).S); + ;} + break; + + case 290: +#line 3547 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *Ty = (yyvsp[(4) - (4)].TypeVal).PAT->get(); NewVarArgs = true; - yyval.InstVal.I = new VAArgInst(yyvsp[-2].ValueVal.V, Ty); - yyval.InstVal.S.copy(yyvsp[0].TypeVal.S); - delete yyvsp[0].TypeVal.PAT; - ; - break;} -case 290: -#line 3631 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type* ArgTy = yyvsp[-2].ValueVal.V->getType(); - const Type* DstTy = yyvsp[0].TypeVal.PAT->get(); + (yyval.InstVal).I = new VAArgInst((yyvsp[(2) - (4)].ValueVal).V, Ty); + (yyval.InstVal).S.copy((yyvsp[(4) - (4)].TypeVal).S); + delete (yyvsp[(4) - (4)].TypeVal).PAT; + ;} + break; + + case 291: +#line 3554 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type* ArgTy = (yyvsp[(2) - (4)].ValueVal).V->getType(); + const Type* DstTy = (yyvsp[(4) - (4)].TypeVal).PAT->get(); ObsoleteVarArgs = true; Function* NF = cast(CurModule.CurrentModule-> getOrInsertFunction("llvm.va_copy", ArgTy, ArgTy, (Type *)0)); @@ -5423,19 +6433,20 @@ //b = vaarg foo, t AllocaInst* foo = new AllocaInst(ArgTy, 0, "vaarg.fix"); CurBB->getInstList().push_back(foo); - CallInst* bar = new CallInst(NF, yyvsp[-2].ValueVal.V); + CallInst* bar = new CallInst(NF, (yyvsp[(2) - (4)].ValueVal).V); CurBB->getInstList().push_back(bar); CurBB->getInstList().push_back(new StoreInst(bar, foo)); - yyval.InstVal.I = new VAArgInst(foo, DstTy); - yyval.InstVal.S.copy(yyvsp[0].TypeVal.S); - delete yyvsp[0].TypeVal.PAT; - ; - break;} -case 291: -#line 3652 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type* ArgTy = yyvsp[-2].ValueVal.V->getType(); - const Type* DstTy = yyvsp[0].TypeVal.PAT->get(); + (yyval.InstVal).I = new VAArgInst(foo, DstTy); + (yyval.InstVal).S.copy((yyvsp[(4) - (4)].TypeVal).S); + delete (yyvsp[(4) - (4)].TypeVal).PAT; + ;} + break; + + case 292: +#line 3575 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type* ArgTy = (yyvsp[(2) - (4)].ValueVal).V->getType(); + const Type* DstTy = (yyvsp[(4) - (4)].TypeVal).PAT->get(); ObsoleteVarArgs = true; Function* NF = cast(CurModule.CurrentModule-> getOrInsertFunction("llvm.va_copy", ArgTy, ArgTy, (Type *)0)); @@ -5448,76 +6459,81 @@ //b = load foo AllocaInst* foo = new AllocaInst(ArgTy, 0, "vanext.fix"); CurBB->getInstList().push_back(foo); - CallInst* bar = new CallInst(NF, yyvsp[-2].ValueVal.V); + CallInst* bar = new CallInst(NF, (yyvsp[(2) - (4)].ValueVal).V); CurBB->getInstList().push_back(bar); CurBB->getInstList().push_back(new StoreInst(bar, foo)); Instruction* tmp = new VAArgInst(foo, DstTy); CurBB->getInstList().push_back(tmp); - yyval.InstVal.I = new LoadInst(foo); - yyval.InstVal.S.copy(yyvsp[0].TypeVal.S); - delete yyvsp[0].TypeVal.PAT; - ; - break;} -case 292: -#line 3676 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (!ExtractElementInst::isValidOperands(yyvsp[-2].ValueVal.V, yyvsp[0].ValueVal.V)) + (yyval.InstVal).I = new LoadInst(foo); + (yyval.InstVal).S.copy((yyvsp[(4) - (4)].TypeVal).S); + delete (yyvsp[(4) - (4)].TypeVal).PAT; + ;} + break; + + case 293: +#line 3599 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if (!ExtractElementInst::isValidOperands((yyvsp[(2) - (4)].ValueVal).V, (yyvsp[(4) - (4)].ValueVal).V)) error("Invalid extractelement operands"); - yyval.InstVal.I = new ExtractElementInst(yyvsp[-2].ValueVal.V, yyvsp[0].ValueVal.V); - yyval.InstVal.S.copy(yyvsp[-2].ValueVal.S.get(0)); - ; - break;} -case 293: -#line 3682 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (!InsertElementInst::isValidOperands(yyvsp[-4].ValueVal.V, yyvsp[-2].ValueVal.V, yyvsp[0].ValueVal.V)) + (yyval.InstVal).I = new ExtractElementInst((yyvsp[(2) - (4)].ValueVal).V, (yyvsp[(4) - (4)].ValueVal).V); + (yyval.InstVal).S.copy((yyvsp[(2) - (4)].ValueVal).S.get(0)); + ;} + break; + + case 294: +#line 3605 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if (!InsertElementInst::isValidOperands((yyvsp[(2) - (6)].ValueVal).V, (yyvsp[(4) - (6)].ValueVal).V, (yyvsp[(6) - (6)].ValueVal).V)) error("Invalid insertelement operands"); - yyval.InstVal.I = new InsertElementInst(yyvsp[-4].ValueVal.V, yyvsp[-2].ValueVal.V, yyvsp[0].ValueVal.V); - yyval.InstVal.S.copy(yyvsp[-4].ValueVal.S); - ; - break;} -case 294: -#line 3688 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (!ShuffleVectorInst::isValidOperands(yyvsp[-4].ValueVal.V, yyvsp[-2].ValueVal.V, yyvsp[0].ValueVal.V)) + (yyval.InstVal).I = new InsertElementInst((yyvsp[(2) - (6)].ValueVal).V, (yyvsp[(4) - (6)].ValueVal).V, (yyvsp[(6) - (6)].ValueVal).V); + (yyval.InstVal).S.copy((yyvsp[(2) - (6)].ValueVal).S); + ;} + break; + + case 295: +#line 3611 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if (!ShuffleVectorInst::isValidOperands((yyvsp[(2) - (6)].ValueVal).V, (yyvsp[(4) - (6)].ValueVal).V, (yyvsp[(6) - (6)].ValueVal).V)) error("Invalid shufflevector operands"); - yyval.InstVal.I = new ShuffleVectorInst(yyvsp[-4].ValueVal.V, yyvsp[-2].ValueVal.V, yyvsp[0].ValueVal.V); - yyval.InstVal.S.copy(yyvsp[-4].ValueVal.S); - ; - break;} -case 295: -#line 3694 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *Ty = yyvsp[0].PHIList.P->front().first->getType(); + (yyval.InstVal).I = new ShuffleVectorInst((yyvsp[(2) - (6)].ValueVal).V, (yyvsp[(4) - (6)].ValueVal).V, (yyvsp[(6) - (6)].ValueVal).V); + (yyval.InstVal).S.copy((yyvsp[(2) - (6)].ValueVal).S); + ;} + break; + + case 296: +#line 3617 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *Ty = (yyvsp[(2) - (2)].PHIList).P->front().first->getType(); if (!Ty->isFirstClassType()) error("PHI node operands must be of first class type"); PHINode *PHI = new PHINode(Ty); - PHI->reserveOperandSpace(yyvsp[0].PHIList.P->size()); - while (yyvsp[0].PHIList.P->begin() != yyvsp[0].PHIList.P->end()) { - if (yyvsp[0].PHIList.P->front().first->getType() != Ty) + PHI->reserveOperandSpace((yyvsp[(2) - (2)].PHIList).P->size()); + while ((yyvsp[(2) - (2)].PHIList).P->begin() != (yyvsp[(2) - (2)].PHIList).P->end()) { + if ((yyvsp[(2) - (2)].PHIList).P->front().first->getType() != Ty) error("All elements of a PHI node must be of the same type"); - PHI->addIncoming(yyvsp[0].PHIList.P->front().first, yyvsp[0].PHIList.P->front().second); - yyvsp[0].PHIList.P->pop_front(); + PHI->addIncoming((yyvsp[(2) - (2)].PHIList).P->front().first, (yyvsp[(2) - (2)].PHIList).P->front().second); + (yyvsp[(2) - (2)].PHIList).P->pop_front(); } - yyval.InstVal.I = PHI; - yyval.InstVal.S.copy(yyvsp[0].PHIList.S); - delete yyvsp[0].PHIList.P; // Free the list... - ; - break;} -case 296: -#line 3710 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ + (yyval.InstVal).I = PHI; + (yyval.InstVal).S.copy((yyvsp[(2) - (2)].PHIList).S); + delete (yyvsp[(2) - (2)].PHIList).P; // Free the list... + ;} + break; + + case 297: +#line 3633 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Handle the short call syntax const PointerType *PFTy; const FunctionType *FTy; Signedness FTySign; - if (!(PFTy = dyn_cast(yyvsp[-4].TypeVal.PAT->get())) || + if (!(PFTy = dyn_cast((yyvsp[(3) - (7)].TypeVal).PAT->get())) || !(FTy = dyn_cast(PFTy->getElementType()))) { // Pull out the types of all of the arguments... std::vector ParamTypes; - FTySign.makeComposite(yyvsp[-4].TypeVal.S); - if (yyvsp[-1].ValueList) { - for (std::vector::iterator I = yyvsp[-1].ValueList->begin(), E = yyvsp[-1].ValueList->end(); + FTySign.makeComposite((yyvsp[(3) - (7)].TypeVal).S); + if ((yyvsp[(6) - (7)].ValueList)) { + for (std::vector::iterator I = (yyvsp[(6) - (7)].ValueList)->begin(), E = (yyvsp[(6) - (7)].ValueList)->end(); I != E; ++I) { ParamTypes.push_back((*I).V->getType()); FTySign.add(I->S); @@ -5527,48 +6543,38 @@ bool isVarArg = ParamTypes.size() && ParamTypes.back() == Type::VoidTy; if (isVarArg) ParamTypes.pop_back(); - const Type *RetTy = yyvsp[-4].TypeVal.PAT->get(); + const Type *RetTy = (yyvsp[(3) - (7)].TypeVal).PAT->get(); if (!RetTy->isFirstClassType() && RetTy != Type::VoidTy) error("Functions cannot return aggregate types"); - // Deal with CSRetCC - ParamAttrsList *PAL = 0; - if (yyvsp[-5].UIntVal == OldCallingConv::CSRet) { - ParamAttrsVector Attrs; - ParamAttrsWithIndex PAWI; - PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg - Attrs.push_back(PAWI); - PAL = ParamAttrsList::get(Attrs); - } - - FTy = FunctionType::get(RetTy, ParamTypes, isVarArg, PAL); + FTy = FunctionType::get(RetTy, ParamTypes, isVarArg); PFTy = PointerType::get(FTy); - yyval.InstVal.S.copy(yyvsp[-4].TypeVal.S); + (yyval.InstVal).S.copy((yyvsp[(3) - (7)].TypeVal).S); } else { - FTySign = yyvsp[-4].TypeVal.S; + FTySign = (yyvsp[(3) - (7)].TypeVal).S; // Get the signedness of the result type. $3 is the pointer to the // function type so we get the 0th element to extract the function type, // and then the 0th element again to get the result type. - yyval.InstVal.S.copy(yyvsp[-4].TypeVal.S.get(0).get(0)); + (yyval.InstVal).S.copy((yyvsp[(3) - (7)].TypeVal).S.get(0).get(0)); } - yyvsp[-3].ValIDVal.S.makeComposite(FTySign); + (yyvsp[(4) - (7)].ValIDVal).S.makeComposite(FTySign); // First upgrade any intrinsic calls. std::vector Args; - if (yyvsp[-1].ValueList) - for (unsigned i = 0, e = yyvsp[-1].ValueList->size(); i < e; ++i) - Args.push_back((*yyvsp[-1].ValueList)[i].V); - Instruction *Inst = upgradeIntrinsicCall(FTy->getReturnType(), yyvsp[-3].ValIDVal, Args); + if ((yyvsp[(6) - (7)].ValueList)) + for (unsigned i = 0, e = (yyvsp[(6) - (7)].ValueList)->size(); i < e; ++i) + Args.push_back((*(yyvsp[(6) - (7)].ValueList))[i].V); + Instruction *Inst = upgradeIntrinsicCall(FTy->getReturnType(), (yyvsp[(4) - (7)].ValIDVal), Args); // If we got an upgraded intrinsic if (Inst) { - yyval.InstVal.I = Inst; + (yyval.InstVal).I = Inst; } else { // Get the function we're calling - Value *V = getVal(PFTy, yyvsp[-3].ValIDVal); + Value *V = getVal(PFTy, (yyvsp[(4) - (7)].ValIDVal)); // Check the argument values match - if (!yyvsp[-1].ValueList) { // Has no arguments? + if (!(yyvsp[(6) - (7)].ValueList)) { // Has no arguments? // Make sure no arguments is a good thing! if (FTy->getNumParams() != 0) error("No arguments passed to a function that expects arguments"); @@ -5578,7 +6584,7 @@ // FunctionType::param_iterator I = FTy->param_begin(); FunctionType::param_iterator E = FTy->param_end(); - std::vector::iterator ArgI = yyvsp[-1].ValueList->begin(), ArgE = yyvsp[-1].ValueList->end(); + std::vector::iterator ArgI = (yyvsp[(6) - (7)].ValueList)->begin(), ArgE = (yyvsp[(6) - (7)].ValueList)->end(); for (; ArgI != ArgE && I != E; ++ArgI, ++I) if ((*ArgI).V->getType() != *I) @@ -5591,372 +6597,383 @@ // Create the call instruction CallInst *CI = new CallInst(V, Args.begin(), Args.end()); - CI->setTailCall(yyvsp[-6].BoolVal); - CI->setCallingConv(upgradeCallingConv(yyvsp[-5].UIntVal)); - yyval.InstVal.I = CI; + CI->setTailCall((yyvsp[(1) - (7)].BoolVal)); + CI->setCallingConv(upgradeCallingConv((yyvsp[(2) - (7)].UIntVal))); + + (yyval.InstVal).I = CI; + } + // Deal with CSRetCC + if ((yyvsp[(2) - (7)].UIntVal) == OldCallingConv::CSRet) { + ParamAttrsVector Attrs; + ParamAttrsWithIndex PAWI; + PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg + Attrs.push_back(PAWI); + cast((yyval.InstVal).I)->setParamAttrs(ParamAttrsList::get(Attrs)); } - delete yyvsp[-4].TypeVal.PAT; - delete yyvsp[-1].ValueList; + delete (yyvsp[(3) - (7)].TypeVal).PAT; + delete (yyvsp[(6) - (7)].ValueList); lastCallingConv = OldCallingConv::C; - ; - break;} -case 297: -#line 3803 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.InstVal = yyvsp[0].InstVal; - ; - break;} -case 298: -#line 3811 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ValueList = yyvsp[0].ValueList; ; - break;} -case 299: -#line 3812 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ValueList = new std::vector(); ; - break;} -case 300: -#line 3816 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.BoolVal = true; ; - break;} -case 301: -#line 3817 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.BoolVal = false; ; - break;} -case 302: -#line 3821 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *Ty = yyvsp[-1].TypeVal.PAT->get(); - yyval.InstVal.S.makeComposite(yyvsp[-1].TypeVal.S); - yyval.InstVal.I = new MallocInst(Ty, 0, yyvsp[0].UIntVal); - delete yyvsp[-1].TypeVal.PAT; - ; - break;} -case 303: -#line 3827 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *Ty = yyvsp[-4].TypeVal.PAT->get(); - yyvsp[-1].ValIDVal.S.makeUnsigned(); - yyval.InstVal.S.makeComposite(yyvsp[-4].TypeVal.S); - yyval.InstVal.I = new MallocInst(Ty, getVal(yyvsp[-2].PrimType.T, yyvsp[-1].ValIDVal), yyvsp[0].UIntVal); - delete yyvsp[-4].TypeVal.PAT; - ; - break;} -case 304: -#line 3834 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *Ty = yyvsp[-1].TypeVal.PAT->get(); - yyval.InstVal.S.makeComposite(yyvsp[-1].TypeVal.S); - yyval.InstVal.I = new AllocaInst(Ty, 0, yyvsp[0].UIntVal); - delete yyvsp[-1].TypeVal.PAT; - ; - break;} -case 305: -#line 3840 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *Ty = yyvsp[-4].TypeVal.PAT->get(); - yyvsp[-1].ValIDVal.S.makeUnsigned(); - yyval.InstVal.S.makeComposite(yyvsp[-2].PrimType.S); - yyval.InstVal.I = new AllocaInst(Ty, getVal(yyvsp[-2].PrimType.T, yyvsp[-1].ValIDVal), yyvsp[0].UIntVal); - delete yyvsp[-4].TypeVal.PAT; - ; - break;} -case 306: -#line 3847 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *PTy = yyvsp[0].ValueVal.V->getType(); + ;} + break; + + case 298: +#line 3725 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.InstVal) = (yyvsp[(1) - (1)].InstVal); + ;} + break; + + case 299: +#line 3733 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ValueList) = (yyvsp[(2) - (2)].ValueList); ;} + break; + + case 300: +#line 3734 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ValueList) = new std::vector(); ;} + break; + + case 301: +#line 3738 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.BoolVal) = true; ;} + break; + + case 302: +#line 3739 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.BoolVal) = false; ;} + break; + + case 303: +#line 3743 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *Ty = (yyvsp[(2) - (3)].TypeVal).PAT->get(); + (yyval.InstVal).S.makeComposite((yyvsp[(2) - (3)].TypeVal).S); + (yyval.InstVal).I = new MallocInst(Ty, 0, (yyvsp[(3) - (3)].UIntVal)); + delete (yyvsp[(2) - (3)].TypeVal).PAT; + ;} + break; + + case 304: +#line 3749 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *Ty = (yyvsp[(2) - (6)].TypeVal).PAT->get(); + (yyvsp[(5) - (6)].ValIDVal).S.makeUnsigned(); + (yyval.InstVal).S.makeComposite((yyvsp[(2) - (6)].TypeVal).S); + (yyval.InstVal).I = new MallocInst(Ty, getVal((yyvsp[(4) - (6)].PrimType).T, (yyvsp[(5) - (6)].ValIDVal)), (yyvsp[(6) - (6)].UIntVal)); + delete (yyvsp[(2) - (6)].TypeVal).PAT; + ;} + break; + + case 305: +#line 3756 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *Ty = (yyvsp[(2) - (3)].TypeVal).PAT->get(); + (yyval.InstVal).S.makeComposite((yyvsp[(2) - (3)].TypeVal).S); + (yyval.InstVal).I = new AllocaInst(Ty, 0, (yyvsp[(3) - (3)].UIntVal)); + delete (yyvsp[(2) - (3)].TypeVal).PAT; + ;} + break; + + case 306: +#line 3762 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *Ty = (yyvsp[(2) - (6)].TypeVal).PAT->get(); + (yyvsp[(5) - (6)].ValIDVal).S.makeUnsigned(); + (yyval.InstVal).S.makeComposite((yyvsp[(4) - (6)].PrimType).S); + (yyval.InstVal).I = new AllocaInst(Ty, getVal((yyvsp[(4) - (6)].PrimType).T, (yyvsp[(5) - (6)].ValIDVal)), (yyvsp[(6) - (6)].UIntVal)); + delete (yyvsp[(2) - (6)].TypeVal).PAT; + ;} + break; + + case 307: +#line 3769 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *PTy = (yyvsp[(2) - (2)].ValueVal).V->getType(); if (!isa(PTy)) error("Trying to free nonpointer type '" + PTy->getDescription() + "'"); - yyval.InstVal.I = new FreeInst(yyvsp[0].ValueVal.V); - yyval.InstVal.S.makeSignless(); - ; - break;} -case 307: -#line 3854 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type* Ty = yyvsp[-1].TypeVal.PAT->get(); - yyvsp[0].ValIDVal.S.copy(yyvsp[-1].TypeVal.S); + (yyval.InstVal).I = new FreeInst((yyvsp[(2) - (2)].ValueVal).V); + (yyval.InstVal).S.makeSignless(); + ;} + break; + + case 308: +#line 3776 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type* Ty = (yyvsp[(3) - (4)].TypeVal).PAT->get(); + (yyvsp[(4) - (4)].ValIDVal).S.copy((yyvsp[(3) - (4)].TypeVal).S); if (!isa(Ty)) error("Can't load from nonpointer type: " + Ty->getDescription()); if (!cast(Ty)->getElementType()->isFirstClassType()) error("Can't load from pointer of non-first-class type: " + Ty->getDescription()); - Value* tmpVal = getVal(Ty, yyvsp[0].ValIDVal); - yyval.InstVal.I = new LoadInst(tmpVal, "", yyvsp[-3].BoolVal); - yyval.InstVal.S.copy(yyvsp[-1].TypeVal.S.get(0)); - delete yyvsp[-1].TypeVal.PAT; - ; - break;} -case 308: -#line 3867 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyvsp[0].ValIDVal.S.copy(yyvsp[-1].TypeVal.S); - const PointerType *PTy = dyn_cast(yyvsp[-1].TypeVal.PAT->get()); + Value* tmpVal = getVal(Ty, (yyvsp[(4) - (4)].ValIDVal)); + (yyval.InstVal).I = new LoadInst(tmpVal, "", (yyvsp[(1) - (4)].BoolVal)); + (yyval.InstVal).S.copy((yyvsp[(3) - (4)].TypeVal).S.get(0)); + delete (yyvsp[(3) - (4)].TypeVal).PAT; + ;} + break; + + case 309: +#line 3789 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyvsp[(6) - (6)].ValIDVal).S.copy((yyvsp[(5) - (6)].TypeVal).S); + const PointerType *PTy = dyn_cast((yyvsp[(5) - (6)].TypeVal).PAT->get()); if (!PTy) error("Can't store to a nonpointer type: " + - yyvsp[-1].TypeVal.PAT->get()->getDescription()); + (yyvsp[(5) - (6)].TypeVal).PAT->get()->getDescription()); const Type *ElTy = PTy->getElementType(); - Value *StoreVal = yyvsp[-3].ValueVal.V; - Value* tmpVal = getVal(PTy, yyvsp[0].ValIDVal); - if (ElTy != yyvsp[-3].ValueVal.V->getType()) { - StoreVal = handleSRetFuncTypeMerge(yyvsp[-3].ValueVal.V, ElTy); - if (!StoreVal) - error("Can't store '" + yyvsp[-3].ValueVal.V->getType()->getDescription() + - "' into space of type '" + ElTy->getDescription() + "'"); - else { - PTy = PointerType::get(StoreVal->getType()); - if (Constant *C = dyn_cast(tmpVal)) - tmpVal = ConstantExpr::getBitCast(C, PTy); - else - tmpVal = new BitCastInst(tmpVal, PTy, "upgrd.cast", CurBB); - } + Value *StoreVal = (yyvsp[(3) - (6)].ValueVal).V; + Value* tmpVal = getVal(PTy, (yyvsp[(6) - (6)].ValIDVal)); + if (ElTy != (yyvsp[(3) - (6)].ValueVal).V->getType()) { + PTy = PointerType::get(StoreVal->getType()); + if (Constant *C = dyn_cast(tmpVal)) + tmpVal = ConstantExpr::getBitCast(C, PTy); + else + tmpVal = new BitCastInst(tmpVal, PTy, "upgrd.cast", CurBB); } - yyval.InstVal.I = new StoreInst(StoreVal, tmpVal, yyvsp[-5].BoolVal); - yyval.InstVal.S.makeSignless(); - delete yyvsp[-1].TypeVal.PAT; - ; - break;} -case 309: -#line 3893 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyvsp[-1].ValIDVal.S.copy(yyvsp[-2].TypeVal.S); - const Type* Ty = yyvsp[-2].TypeVal.PAT->get(); + (yyval.InstVal).I = new StoreInst(StoreVal, tmpVal, (yyvsp[(1) - (6)].BoolVal)); + (yyval.InstVal).S.makeSignless(); + delete (yyvsp[(5) - (6)].TypeVal).PAT; + ;} + break; + + case 310: +#line 3809 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyvsp[(3) - (4)].ValIDVal).S.copy((yyvsp[(2) - (4)].TypeVal).S); + const Type* Ty = (yyvsp[(2) - (4)].TypeVal).PAT->get(); if (!isa(Ty)) error("getelementptr insn requires pointer operand"); std::vector VIndices; - upgradeGEPInstIndices(Ty, yyvsp[0].ValueList, VIndices); + upgradeGEPInstIndices(Ty, (yyvsp[(4) - (4)].ValueList), VIndices); - Value* tmpVal = getVal(Ty, yyvsp[-1].ValIDVal); - yyval.InstVal.I = new GetElementPtrInst(tmpVal, VIndices.begin(), VIndices.end()); - ValueInfo VI; VI.V = tmpVal; VI.S.copy(yyvsp[-2].TypeVal.S); - yyval.InstVal.S.copy(getElementSign(VI, VIndices)); - delete yyvsp[-2].TypeVal.PAT; - delete yyvsp[0].ValueList; - ; - break;} -} - /* the action file gets copied in in place of this dollarsign */ -#line 543 "/usr/share/bison.simple" - - yyvsp -= yylen; - yyssp -= yylen; -#ifdef YYLSP_NEEDED - yylsp -= yylen; -#endif + Value* tmpVal = getVal(Ty, (yyvsp[(3) - (4)].ValIDVal)); + (yyval.InstVal).I = new GetElementPtrInst(tmpVal, VIndices.begin(), VIndices.end()); + ValueInfo VI; VI.V = tmpVal; VI.S.copy((yyvsp[(2) - (4)].TypeVal).S); + (yyval.InstVal).S.copy(getElementSign(VI, VIndices)); + delete (yyvsp[(2) - (4)].TypeVal).PAT; + delete (yyvsp[(4) - (4)].ValueList); + ;} + break; -#if YYDEBUG != 0 - if (yydebug) - { - short *ssp1 = yyss - 1; - fprintf (stderr, "state stack now"); - while (ssp1 != yyssp) - fprintf (stderr, " %d", *++ssp1); - fprintf (stderr, "\n"); - } -#endif + +/* Line 1267 of yacc.c. */ +#line 6763 "UpgradeParser.tab.c" + default: break; + } + YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); + + YYPOPSTACK (yylen); + yylen = 0; + YY_STACK_PRINT (yyss, yyssp); *++yyvsp = yyval; -#ifdef YYLSP_NEEDED - yylsp++; - if (yylen == 0) - { - yylsp->first_line = yylloc.first_line; - yylsp->first_column = yylloc.first_column; - yylsp->last_line = (yylsp-1)->last_line; - yylsp->last_column = (yylsp-1)->last_column; - yylsp->text = 0; - } - else - { - yylsp->last_line = (yylsp+yylen-1)->last_line; - yylsp->last_column = (yylsp+yylen-1)->last_column; - } -#endif - /* Now "shift" the result of the reduction. - Determine what state that goes to, - based on the state we popped back to - and the rule number reduced by. */ + /* Now `shift' the result of the reduction. Determine what state + that goes to, based on the state we popped back to and the rule + number reduced by. */ yyn = yyr1[yyn]; - yystate = yypgoto[yyn - YYNTBASE] + *yyssp; - if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp) + yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; + if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) yystate = yytable[yystate]; else - yystate = yydefgoto[yyn - YYNTBASE]; + yystate = yydefgoto[yyn - YYNTOKENS]; goto yynewstate; -yyerrlab: /* here on detecting error */ - if (! yyerrstatus) - /* If not already recovering from an error, report this error. */ +/*------------------------------------. +| yyerrlab -- here on detecting error | +`------------------------------------*/ +yyerrlab: + /* If not already recovering from an error, report this error. */ + if (!yyerrstatus) { ++yynerrs; - -#ifdef YYERROR_VERBOSE - yyn = yypact[yystate]; - - if (yyn > YYFLAG && yyn < YYLAST) - { - int size = 0; - char *msg; - int x, count; - - count = 0; - /* Start X at -yyn if nec to avoid negative indexes in yycheck. */ - for (x = (yyn < 0 ? -yyn : 0); - x < (sizeof(yytname) / sizeof(char *)); x++) - if (yycheck[x + yyn] == x) - size += strlen(yytname[x]) + 15, count++; - msg = (char *) malloc(size + 15); - if (msg != 0) - { - strcpy(msg, "parse error"); - - if (count < 5) - { - count = 0; - for (x = (yyn < 0 ? -yyn : 0); - x < (sizeof(yytname) / sizeof(char *)); x++) - if (yycheck[x + yyn] == x) - { - strcat(msg, count == 0 ? ", expecting `" : " or `"); - strcat(msg, yytname[x]); - strcat(msg, "'"); - count++; - } - } - yyerror(msg); - free(msg); - } - else - yyerror ("parse error; also virtual memory exceeded"); - } - else -#endif /* YYERROR_VERBOSE */ - yyerror("parse error"); +#if ! YYERROR_VERBOSE + yyerror (YY_("syntax error")); +#else + { + YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); + if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) + { + YYSIZE_T yyalloc = 2 * yysize; + if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) + yyalloc = YYSTACK_ALLOC_MAXIMUM; + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); + yymsg = (char *) YYSTACK_ALLOC (yyalloc); + if (yymsg) + yymsg_alloc = yyalloc; + else + { + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; + } + } + + if (0 < yysize && yysize <= yymsg_alloc) + { + (void) yysyntax_error (yymsg, yystate, yychar); + yyerror (yymsg); + } + else + { + yyerror (YY_("syntax error")); + if (yysize != 0) + goto yyexhaustedlab; + } + } +#endif } - goto yyerrlab1; -yyerrlab1: /* here on error raised explicitly by an action */ + if (yyerrstatus == 3) { - /* if just tried and failed to reuse lookahead token after an error, discard it. */ - - /* return failure if at end of input */ - if (yychar == YYEOF) - YYABORT; - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]); -#endif + /* If just tried and failed to reuse look-ahead token after an + error, discard it. */ - yychar = YYEMPTY; + if (yychar <= YYEOF) + { + /* Return failure if at end of input. */ + if (yychar == YYEOF) + YYABORT; + } + else + { + yydestruct ("Error: discarding", + yytoken, &yylval); + yychar = YYEMPTY; + } } - /* Else will try to reuse lookahead token - after shifting the error token. */ - - yyerrstatus = 3; /* Each real token shifted decrements this */ - - goto yyerrhandle; + /* Else will try to reuse look-ahead token after shifting the error + token. */ + goto yyerrlab1; -yyerrdefault: /* current state does not do anything special for the error token. */ -#if 0 - /* This is wrong; only states that explicitly want error tokens - should shift them. */ - yyn = yydefact[yystate]; /* If its default is to accept any token, ok. Otherwise pop it.*/ - if (yyn) goto yydefault; -#endif +/*---------------------------------------------------. +| yyerrorlab -- error raised explicitly by YYERROR. | +`---------------------------------------------------*/ +yyerrorlab: + + /* Pacify compilers like GCC when the user code never invokes + YYERROR and the label yyerrorlab therefore never appears in user + code. */ + if (/*CONSTCOND*/ 0) + goto yyerrorlab; + + /* Do not reclaim the symbols of the rule which action triggered + this YYERROR. */ + YYPOPSTACK (yylen); + yylen = 0; + YY_STACK_PRINT (yyss, yyssp); + yystate = *yyssp; + goto yyerrlab1; -yyerrpop: /* pop the current state because it cannot handle the error token */ - if (yyssp == yyss) YYABORT; - yyvsp--; - yystate = *--yyssp; -#ifdef YYLSP_NEEDED - yylsp--; -#endif +/*-------------------------------------------------------------. +| yyerrlab1 -- common code for both syntax error and YYERROR. | +`-------------------------------------------------------------*/ +yyerrlab1: + yyerrstatus = 3; /* Each real token shifted decrements this. */ -#if YYDEBUG != 0 - if (yydebug) + for (;;) { - short *ssp1 = yyss - 1; - fprintf (stderr, "Error: state stack now"); - while (ssp1 != yyssp) - fprintf (stderr, " %d", *++ssp1); - fprintf (stderr, "\n"); - } -#endif - -yyerrhandle: + yyn = yypact[yystate]; + if (yyn != YYPACT_NINF) + { + yyn += YYTERROR; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } - yyn = yypact[yystate]; - if (yyn == YYFLAG) - goto yyerrdefault; + /* Pop the current state because it cannot handle the error token. */ + if (yyssp == yyss) + YYABORT; - yyn += YYTERROR; - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR) - goto yyerrdefault; - yyn = yytable[yyn]; - if (yyn < 0) - { - if (yyn == YYFLAG) - goto yyerrpop; - yyn = -yyn; - goto yyreduce; + yydestruct ("Error: popping", + yystos[yystate], yyvsp); + YYPOPSTACK (1); + yystate = *yyssp; + YY_STACK_PRINT (yyss, yyssp); } - else if (yyn == 0) - goto yyerrpop; if (yyn == YYFINAL) YYACCEPT; -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Shifting error token, "); -#endif - *++yyvsp = yylval; -#ifdef YYLSP_NEEDED - *++yylsp = yylloc; -#endif + + + /* Shift the error token. */ + YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); yystate = yyn; goto yynewstate; - yyacceptlab: - /* YYACCEPT comes here. */ - if (yyfree_stacks) - { - free (yyss); - free (yyvs); -#ifdef YYLSP_NEEDED - free (yyls); -#endif - } - return 0; - yyabortlab: - /* YYABORT comes here. */ - if (yyfree_stacks) +/*-------------------------------------. +| yyacceptlab -- YYACCEPT comes here. | +`-------------------------------------*/ +yyacceptlab: + yyresult = 0; + goto yyreturn; + +/*-----------------------------------. +| yyabortlab -- YYABORT comes here. | +`-----------------------------------*/ +yyabortlab: + yyresult = 1; + goto yyreturn; + +#ifndef yyoverflow +/*-------------------------------------------------. +| yyexhaustedlab -- memory exhaustion comes here. | +`-------------------------------------------------*/ +yyexhaustedlab: + yyerror (YY_("memory exhausted")); + yyresult = 2; + /* Fall through. */ +#endif + +yyreturn: + if (yychar != YYEOF && yychar != YYEMPTY) + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval); + /* Do not reclaim the symbols of the rule which action triggered + this YYABORT or YYACCEPT. */ + YYPOPSTACK (yylen); + YY_STACK_PRINT (yyss, yyssp); + while (yyssp != yyss) { - free (yyss); - free (yyvs); -#ifdef YYLSP_NEEDED - free (yyls); -#endif + yydestruct ("Cleanup: popping", + yystos[*yyssp], yyvsp); + YYPOPSTACK (1); } - return 1; +#ifndef yyoverflow + if (yyss != yyssa) + YYSTACK_FREE (yyss); +#endif +#if YYERROR_VERBOSE + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); +#endif + /* Make sure YYID is used. */ + return YYID (yyresult); } -#line 3911 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" + + +#line 3827 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" int yyerror(const char *ErrorMsg) { @@ -5989,3 +7006,4 @@ yyerror(ErrorMsg.c_str()); } + Modified: llvm/trunk/tools/llvm-upgrade/UpgradeParser.h.cvs URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-upgrade/UpgradeParser.h.cvs?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/tools/llvm-upgrade/UpgradeParser.h.cvs (original) +++ llvm/trunk/tools/llvm-upgrade/UpgradeParser.h.cvs Tue Nov 27 07:23:08 2007 @@ -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, + SINTVAL = 260, + UINTVAL = 261, + FPVAL = 262, + VOID = 263, + BOOL = 264, + SBYTE = 265, + UBYTE = 266, + SHORT = 267, + USHORT = 268, + INT = 269, + UINT = 270, + LONG = 271, + ULONG = 272, + FLOAT = 273, + DOUBLE = 274, + TYPE = 275, + LABEL = 276, + VAR_ID = 277, + LABELSTR = 278, + STRINGCONSTANT = 279, + IMPLEMENTATION = 280, + ZEROINITIALIZER = 281, + TRUETOK = 282, + FALSETOK = 283, + BEGINTOK = 284, + ENDTOK = 285, + DECLARE = 286, + GLOBAL = 287, + CONSTANT = 288, + SECTION = 289, + VOLATILE = 290, + TO = 291, + DOTDOTDOT = 292, + NULL_TOK = 293, + UNDEF = 294, + CONST = 295, + INTERNAL = 296, + LINKONCE = 297, + WEAK = 298, + APPENDING = 299, + DLLIMPORT = 300, + DLLEXPORT = 301, + EXTERN_WEAK = 302, + OPAQUE = 303, + NOT = 304, + EXTERNAL = 305, + TARGET = 306, + TRIPLE = 307, + ENDIAN = 308, + POINTERSIZE = 309, + LITTLE = 310, + BIG = 311, + ALIGN = 312, + DEPLIBS = 313, + CALL = 314, + TAIL = 315, + ASM_TOK = 316, + MODULE = 317, + SIDEEFFECT = 318, + CC_TOK = 319, + CCC_TOK = 320, + CSRETCC_TOK = 321, + FASTCC_TOK = 322, + COLDCC_TOK = 323, + X86_STDCALLCC_TOK = 324, + X86_FASTCALLCC_TOK = 325, + DATALAYOUT = 326, + RET = 327, + BR = 328, + SWITCH = 329, + INVOKE = 330, + UNREACHABLE = 331, + UNWIND = 332, + EXCEPT = 333, + ADD = 334, + SUB = 335, + MUL = 336, + DIV = 337, + UDIV = 338, + SDIV = 339, + FDIV = 340, + REM = 341, + UREM = 342, + SREM = 343, + FREM = 344, + AND = 345, + OR = 346, + XOR = 347, + SHL = 348, + SHR = 349, + ASHR = 350, + LSHR = 351, + SETLE = 352, + SETGE = 353, + SETLT = 354, + SETGT = 355, + SETEQ = 356, + SETNE = 357, + ICMP = 358, + FCMP = 359, + MALLOC = 360, + ALLOCA = 361, + FREE = 362, + LOAD = 363, + STORE = 364, + GETELEMENTPTR = 365, + PHI_TOK = 366, + SELECT = 367, + VAARG = 368, + EXTRACTELEMENT = 369, + INSERTELEMENT = 370, + SHUFFLEVECTOR = 371, + VAARG_old = 372, + VANEXT_old = 373, + EQ = 374, + NE = 375, + SLT = 376, + SGT = 377, + SLE = 378, + SGE = 379, + ULT = 380, + UGT = 381, + ULE = 382, + UGE = 383, + OEQ = 384, + ONE = 385, + OLT = 386, + OGT = 387, + OLE = 388, + OGE = 389, + ORD = 390, + UNO = 391, + UEQ = 392, + UNE = 393, + CAST = 394, + TRUNC = 395, + ZEXT = 396, + SEXT = 397, + FPTRUNC = 398, + FPEXT = 399, + FPTOUI = 400, + FPTOSI = 401, + UITOFP = 402, + SITOFP = 403, + PTRTOINT = 404, + INTTOPTR = 405, + BITCAST = 406 + }; +#endif +/* Tokens. */ +#define ESINT64VAL 258 +#define EUINT64VAL 259 +#define SINTVAL 260 +#define UINTVAL 261 +#define FPVAL 262 +#define VOID 263 +#define BOOL 264 +#define SBYTE 265 +#define UBYTE 266 +#define SHORT 267 +#define USHORT 268 +#define INT 269 +#define UINT 270 +#define LONG 271 +#define ULONG 272 +#define FLOAT 273 +#define DOUBLE 274 +#define TYPE 275 +#define LABEL 276 +#define VAR_ID 277 +#define LABELSTR 278 +#define STRINGCONSTANT 279 +#define IMPLEMENTATION 280 +#define ZEROINITIALIZER 281 +#define TRUETOK 282 +#define FALSETOK 283 +#define BEGINTOK 284 +#define ENDTOK 285 +#define DECLARE 286 +#define GLOBAL 287 +#define CONSTANT 288 +#define SECTION 289 +#define VOLATILE 290 +#define TO 291 +#define DOTDOTDOT 292 +#define NULL_TOK 293 +#define UNDEF 294 +#define CONST 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 NOT 304 +#define EXTERNAL 305 +#define TARGET 306 +#define TRIPLE 307 +#define ENDIAN 308 +#define POINTERSIZE 309 +#define LITTLE 310 +#define BIG 311 +#define ALIGN 312 +#define DEPLIBS 313 +#define CALL 314 +#define TAIL 315 +#define ASM_TOK 316 +#define MODULE 317 +#define SIDEEFFECT 318 +#define CC_TOK 319 +#define CCC_TOK 320 +#define CSRETCC_TOK 321 +#define FASTCC_TOK 322 +#define COLDCC_TOK 323 +#define X86_STDCALLCC_TOK 324 +#define X86_FASTCALLCC_TOK 325 +#define DATALAYOUT 326 +#define RET 327 +#define BR 328 +#define SWITCH 329 +#define INVOKE 330 +#define UNREACHABLE 331 +#define UNWIND 332 +#define EXCEPT 333 +#define ADD 334 +#define SUB 335 +#define MUL 336 +#define DIV 337 +#define UDIV 338 +#define SDIV 339 +#define FDIV 340 +#define REM 341 +#define UREM 342 +#define SREM 343 +#define FREM 344 +#define AND 345 +#define OR 346 +#define XOR 347 +#define SHL 348 +#define SHR 349 +#define ASHR 350 +#define LSHR 351 +#define SETLE 352 +#define SETGE 353 +#define SETLT 354 +#define SETGT 355 +#define SETEQ 356 +#define SETNE 357 +#define ICMP 358 +#define FCMP 359 +#define MALLOC 360 +#define ALLOCA 361 +#define FREE 362 +#define LOAD 363 +#define STORE 364 +#define GETELEMENTPTR 365 +#define PHI_TOK 366 +#define SELECT 367 +#define VAARG 368 +#define EXTRACTELEMENT 369 +#define INSERTELEMENT 370 +#define SHUFFLEVECTOR 371 +#define VAARG_old 372 +#define VANEXT_old 373 +#define EQ 374 +#define NE 375 +#define SLT 376 +#define SGT 377 +#define SLE 378 +#define SGE 379 +#define ULT 380 +#define UGT 381 +#define ULE 382 +#define UGE 383 +#define OEQ 384 +#define ONE 385 +#define OLT 386 +#define OGT 387 +#define OLE 388 +#define OGE 389 +#define ORD 390 +#define UNO 391 +#define UEQ 392 +#define UNE 393 +#define CAST 394 +#define TRUNC 395 +#define ZEXT 396 +#define SEXT 397 +#define FPTRUNC 398 +#define FPEXT 399 +#define FPTOUI 400 +#define FPTOSI 401 +#define UITOFP 402 +#define SITOFP 403 +#define PTRTOINT 404 +#define INTTOPTR 405 +#define BITCAST 406 + + + + +#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +typedef union YYSTYPE +#line 1680 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" +{ llvm::Module *ModuleVal; llvm::Function *FunctionVal; std::pair *ArgVal; @@ -38,156 +387,14 @@ llvm::ICmpInst::Predicate IPred; llvm::FCmpInst::Predicate FPred; llvm::Module::Endianness Endianness; -} YYSTYPE; -#define ESINT64VAL 257 -#define EUINT64VAL 258 -#define SINTVAL 259 -#define UINTVAL 260 -#define FPVAL 261 -#define VOID 262 -#define BOOL 263 -#define SBYTE 264 -#define UBYTE 265 -#define SHORT 266 -#define USHORT 267 -#define INT 268 -#define UINT 269 -#define LONG 270 -#define ULONG 271 -#define FLOAT 272 -#define DOUBLE 273 -#define TYPE 274 -#define LABEL 275 -#define VAR_ID 276 -#define LABELSTR 277 -#define STRINGCONSTANT 278 -#define IMPLEMENTATION 279 -#define ZEROINITIALIZER 280 -#define TRUETOK 281 -#define FALSETOK 282 -#define BEGINTOK 283 -#define ENDTOK 284 -#define DECLARE 285 -#define GLOBAL 286 -#define CONSTANT 287 -#define SECTION 288 -#define VOLATILE 289 -#define TO 290 -#define DOTDOTDOT 291 -#define NULL_TOK 292 -#define UNDEF 293 -#define CONST 294 -#define INTERNAL 295 -#define LINKONCE 296 -#define WEAK 297 -#define APPENDING 298 -#define DLLIMPORT 299 -#define DLLEXPORT 300 -#define EXTERN_WEAK 301 -#define OPAQUE 302 -#define NOT 303 -#define EXTERNAL 304 -#define TARGET 305 -#define TRIPLE 306 -#define ENDIAN 307 -#define POINTERSIZE 308 -#define LITTLE 309 -#define BIG 310 -#define ALIGN 311 -#define DEPLIBS 312 -#define CALL 313 -#define TAIL 314 -#define ASM_TOK 315 -#define MODULE 316 -#define SIDEEFFECT 317 -#define CC_TOK 318 -#define CCC_TOK 319 -#define CSRETCC_TOK 320 -#define FASTCC_TOK 321 -#define COLDCC_TOK 322 -#define X86_STDCALLCC_TOK 323 -#define X86_FASTCALLCC_TOK 324 -#define DATALAYOUT 325 -#define RET 326 -#define BR 327 -#define SWITCH 328 -#define INVOKE 329 -#define UNREACHABLE 330 -#define UNWIND 331 -#define EXCEPT 332 -#define ADD 333 -#define SUB 334 -#define MUL 335 -#define DIV 336 -#define UDIV 337 -#define SDIV 338 -#define FDIV 339 -#define REM 340 -#define UREM 341 -#define SREM 342 -#define FREM 343 -#define AND 344 -#define OR 345 -#define XOR 346 -#define SHL 347 -#define SHR 348 -#define ASHR 349 -#define LSHR 350 -#define SETLE 351 -#define SETGE 352 -#define SETLT 353 -#define SETGT 354 -#define SETEQ 355 -#define SETNE 356 -#define ICMP 357 -#define FCMP 358 -#define MALLOC 359 -#define ALLOCA 360 -#define FREE 361 -#define LOAD 362 -#define STORE 363 -#define GETELEMENTPTR 364 -#define PHI_TOK 365 -#define SELECT 366 -#define VAARG 367 -#define EXTRACTELEMENT 368 -#define INSERTELEMENT 369 -#define SHUFFLEVECTOR 370 -#define VAARG_old 371 -#define VANEXT_old 372 -#define EQ 373 -#define NE 374 -#define SLT 375 -#define SGT 376 -#define SLE 377 -#define SGE 378 -#define ULT 379 -#define UGT 380 -#define ULE 381 -#define UGE 382 -#define OEQ 383 -#define ONE 384 -#define OLT 385 -#define OGT 386 -#define OLE 387 -#define OGE 388 -#define ORD 389 -#define UNO 390 -#define UEQ 391 -#define UNE 392 -#define CAST 393 -#define TRUNC 394 -#define ZEXT 395 -#define SEXT 396 -#define FPTRUNC 397 -#define FPEXT 398 -#define FPTOUI 399 -#define FPTOSI 400 -#define UITOFP 401 -#define SITOFP 402 -#define PTRTOINT 403 -#define INTTOPTR 404 -#define BITCAST 405 - +} +/* Line 1489 of yacc.c. */ +#line 393 "UpgradeParser.tab.h" + YYSTYPE; +# define yystype YYSTYPE /* obsolescent; will be withdrawn */ +# define YYSTYPE_IS_DECLARED 1 +# define YYSTYPE_IS_TRIVIAL 1 +#endif extern YYSTYPE Upgradelval; + Modified: llvm/trunk/tools/llvm-upgrade/UpgradeParser.y URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-upgrade/UpgradeParser.y?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/tools/llvm-upgrade/UpgradeParser.y (original) +++ llvm/trunk/tools/llvm-upgrade/UpgradeParser.y Tue Nov 27 07:23:08 2007 @@ -373,78 +373,6 @@ return result; } -/// This function determines if two function types differ only in their use of -/// the sret parameter attribute in the first argument. If they are identical -/// in all other respects, it returns true. Otherwise, it returns false. -static bool FuncTysDifferOnlyBySRet(const FunctionType *F1, - const FunctionType *F2) { - if (F1->getReturnType() != F2->getReturnType() || - F1->getNumParams() != F2->getNumParams()) - return false; - const ParamAttrsList *PAL1 = F1->getParamAttrs(); - const ParamAttrsList *PAL2 = F2->getParamAttrs(); - if (PAL1 && !PAL2 || PAL2 && !PAL1) - return false; - if (PAL1 && PAL2 && ((PAL1->size() != PAL2->size()) || - (PAL1->getParamAttrs(0) != PAL2->getParamAttrs(0)))) - return false; - unsigned SRetMask = ~unsigned(ParamAttr::StructRet); - for (unsigned i = 0; i < F1->getNumParams(); ++i) { - if (F1->getParamType(i) != F2->getParamType(i) || (PAL1 && PAL2 && - (unsigned(PAL1->getParamAttrs(i+1)) & SRetMask != - unsigned(PAL2->getParamAttrs(i+1)) & SRetMask))) - return false; - } - return true; -} - -/// This function determines if the type of V and Ty differ only by the SRet -/// parameter attribute. This is a more generalized case of -/// FuncTysDIfferOnlyBySRet since it doesn't require FunctionType arguments. -static bool TypesDifferOnlyBySRet(Value *V, const Type* Ty) { - if (V->getType() == Ty) - return true; - const PointerType *PF1 = dyn_cast(Ty); - const PointerType *PF2 = dyn_cast(V->getType()); - if (PF1 && PF2) { - const FunctionType* FT1 = dyn_cast(PF1->getElementType()); - const FunctionType* FT2 = dyn_cast(PF2->getElementType()); - if (FT1 && FT2) - return FuncTysDifferOnlyBySRet(FT1, FT2); - } - return false; -} - -// The upgrade of csretcc to sret param attribute may have caused a function -// to not be found because the param attribute changed the type of the called -// function. This helper function, used in getExistingValue, detects that -// situation and bitcasts the function to the correct type. -static Value* handleSRetFuncTypeMerge(Value *V, const Type* Ty) { - // Handle degenerate cases - if (!V) - return 0; - if (V->getType() == Ty) - return V; - - const PointerType *PF1 = dyn_cast(Ty); - const PointerType *PF2 = dyn_cast(V->getType()); - if (PF1 && PF2) { - const FunctionType *FT1 = dyn_cast(PF1->getElementType()); - const FunctionType *FT2 = dyn_cast(PF2->getElementType()); - if (FT1 && FT2 && FuncTysDifferOnlyBySRet(FT1, FT2)) { - const ParamAttrsList *PAL2 = FT2->getParamAttrs(); - if (PAL2 && PAL2->paramHasAttr(1, ParamAttr::StructRet)) - return V; - else if (Constant *C = dyn_cast(V)) - return ConstantExpr::getBitCast(C, PF1); - else - return new BitCastInst(V, PF1, "upgrd.cast", CurBB); - } - - } - return 0; -} - // getExistingValue - Look up the value specified by the provided type and // the provided ValID. If the value exists and has already been defined, return // it. Otherwise return null. @@ -491,8 +419,7 @@ ValueSymbolTable &SymTab = CurFun.CurrentFunction->getValueSymbolTable(); V = SymTab.lookup(LookupName); if (V && V->getType() != Ty) - V = handleSRetFuncTypeMerge(V, Ty); - assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong type"); + V = 0; } if (!V) { RenameMapType::const_iterator I = CurModule.RenameMap.find(Key); @@ -503,8 +430,7 @@ LookupName = D.Name; V = CurModule.CurrentModule->getValueSymbolTable().lookup(LookupName); if (V && V->getType() != Ty) - V = handleSRetFuncTypeMerge(V, Ty); - assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong type"); + V = 0; } if (!V) return 0; @@ -2139,7 +2065,7 @@ } const FunctionType *FTy = - FunctionType::get($1.PAT->get(), Params, isVarArg, PAL); + FunctionType::get($1.PAT->get(), Params, isVarArg); $$.PAT = new PATypeHolder( HandleUpRefs(FTy, $$.S) ); delete $1.PAT; // Delete the return type handle @@ -2925,19 +2851,7 @@ if (isVarArg) ParamTyList.pop_back(); - // Convert the CSRet calling convention into the corresponding parameter - // attribute. - ParamAttrsList *PAL = 0; - if ($1 == OldCallingConv::CSRet) { - ParamAttrsVector Attrs; - ParamAttrsWithIndex PAWI; - PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg - Attrs.push_back(PAWI); - PAL = ParamAttrsList::get(Attrs); - } - - const FunctionType *FT = - FunctionType::get(RetTy, ParamTyList, isVarArg, PAL); + const FunctionType *FT = FunctionType::get(RetTy, ParamTyList, isVarArg); const PointerType *PFT = PointerType::get(FT); delete $2.PAT; @@ -3055,6 +2969,16 @@ free($7); } + // Convert the CSRet calling convention into the corresponding parameter + // attribute. + if ($1 == OldCallingConv::CSRet) { + ParamAttrsVector Attrs; + ParamAttrsWithIndex PAWI; + PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg + Attrs.push_back(PAWI); + Fn->setParamAttrs(ParamAttrsList::get(Attrs)); + } + // Add all of the arguments we parsed to the function... if ($5) { // Is null if empty... if (isVarArg) { // Nuke the last entry @@ -3324,17 +3248,9 @@ FTySign.add(I->S); } } - ParamAttrsList *PAL = 0; - if ($2 == OldCallingConv::CSRet) { - ParamAttrsVector Attrs; - ParamAttrsWithIndex PAWI; - PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg - Attrs.push_back(PAWI); - PAL = ParamAttrsList::get(Attrs); - } bool isVarArg = ParamTypes.size() && ParamTypes.back() == Type::VoidTy; if (isVarArg) ParamTypes.pop_back(); - Ty = FunctionType::get($3.PAT->get(), ParamTypes, isVarArg, PAL); + Ty = FunctionType::get($3.PAT->get(), ParamTypes, isVarArg); PFTy = PointerType::get(Ty); $$.S.copy($3.S); } else { @@ -3376,6 +3292,13 @@ $$.TI = new InvokeInst(V, Normal, Except, Args.begin(), Args.end()); } cast($$.TI)->setCallingConv(upgradeCallingConv($2)); + if ($2 == OldCallingConv::CSRet) { + ParamAttrsVector Attrs; + ParamAttrsWithIndex PAWI; + PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg + Attrs.push_back(PAWI); + cast($$.TI)->setParamAttrs(ParamAttrsList::get(Attrs)); + } delete $3.PAT; delete $6; lastCallingConv = OldCallingConv::C; @@ -3732,17 +3655,7 @@ if (!RetTy->isFirstClassType() && RetTy != Type::VoidTy) error("Functions cannot return aggregate types"); - // Deal with CSRetCC - ParamAttrsList *PAL = 0; - if ($2 == OldCallingConv::CSRet) { - ParamAttrsVector Attrs; - ParamAttrsWithIndex PAWI; - PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg - Attrs.push_back(PAWI); - PAL = ParamAttrsList::get(Attrs); - } - - FTy = FunctionType::get(RetTy, ParamTypes, isVarArg, PAL); + FTy = FunctionType::get(RetTy, ParamTypes, isVarArg); PFTy = PointerType::get(FTy); $$.S.copy($3.S); } else { @@ -3794,8 +3707,17 @@ CallInst *CI = new CallInst(V, Args.begin(), Args.end()); CI->setTailCall($1); CI->setCallingConv(upgradeCallingConv($2)); + $$.I = CI; } + // Deal with CSRetCC + if ($2 == OldCallingConv::CSRet) { + ParamAttrsVector Attrs; + ParamAttrsWithIndex PAWI; + PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg + Attrs.push_back(PAWI); + cast($$.I)->setParamAttrs(ParamAttrsList::get(Attrs)); + } delete $3.PAT; delete $6; lastCallingConv = OldCallingConv::C; @@ -3874,17 +3796,11 @@ Value *StoreVal = $3.V; Value* tmpVal = getVal(PTy, $6); if (ElTy != $3.V->getType()) { - StoreVal = handleSRetFuncTypeMerge($3.V, ElTy); - if (!StoreVal) - error("Can't store '" + $3.V->getType()->getDescription() + - "' into space of type '" + ElTy->getDescription() + "'"); - else { - PTy = PointerType::get(StoreVal->getType()); - if (Constant *C = dyn_cast(tmpVal)) - tmpVal = ConstantExpr::getBitCast(C, PTy); - else - tmpVal = new BitCastInst(tmpVal, PTy, "upgrd.cast", CurBB); - } + PTy = PointerType::get(StoreVal->getType()); + if (Constant *C = dyn_cast(tmpVal)) + tmpVal = ConstantExpr::getBitCast(C, PTy); + else + tmpVal = new BitCastInst(tmpVal, PTy, "upgrd.cast", CurBB); } $$.I = new StoreInst(StoreVal, tmpVal, $1); $$.S.makeSignless(); Modified: llvm/trunk/tools/llvm-upgrade/UpgradeParser.y.cvs URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-upgrade/UpgradeParser.y.cvs?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/tools/llvm-upgrade/UpgradeParser.y.cvs (original) +++ llvm/trunk/tools/llvm-upgrade/UpgradeParser.y.cvs Tue Nov 27 07:23:08 2007 @@ -373,78 +373,6 @@ return result; } -/// This function determines if two function types differ only in their use of -/// the sret parameter attribute in the first argument. If they are identical -/// in all other respects, it returns true. Otherwise, it returns false. -static bool FuncTysDifferOnlyBySRet(const FunctionType *F1, - const FunctionType *F2) { - if (F1->getReturnType() != F2->getReturnType() || - F1->getNumParams() != F2->getNumParams()) - return false; - const ParamAttrsList *PAL1 = F1->getParamAttrs(); - const ParamAttrsList *PAL2 = F2->getParamAttrs(); - if (PAL1 && !PAL2 || PAL2 && !PAL1) - return false; - if (PAL1 && PAL2 && ((PAL1->size() != PAL2->size()) || - (PAL1->getParamAttrs(0) != PAL2->getParamAttrs(0)))) - return false; - unsigned SRetMask = ~unsigned(ParamAttr::StructRet); - for (unsigned i = 0; i < F1->getNumParams(); ++i) { - if (F1->getParamType(i) != F2->getParamType(i) || (PAL1 && PAL2 && - (unsigned(PAL1->getParamAttrs(i+1)) & SRetMask != - unsigned(PAL2->getParamAttrs(i+1)) & SRetMask))) - return false; - } - return true; -} - -/// This function determines if the type of V and Ty differ only by the SRet -/// parameter attribute. This is a more generalized case of -/// FuncTysDIfferOnlyBySRet since it doesn't require FunctionType arguments. -static bool TypesDifferOnlyBySRet(Value *V, const Type* Ty) { - if (V->getType() == Ty) - return true; - const PointerType *PF1 = dyn_cast(Ty); - const PointerType *PF2 = dyn_cast(V->getType()); - if (PF1 && PF2) { - const FunctionType* FT1 = dyn_cast(PF1->getElementType()); - const FunctionType* FT2 = dyn_cast(PF2->getElementType()); - if (FT1 && FT2) - return FuncTysDifferOnlyBySRet(FT1, FT2); - } - return false; -} - -// The upgrade of csretcc to sret param attribute may have caused a function -// to not be found because the param attribute changed the type of the called -// function. This helper function, used in getExistingValue, detects that -// situation and bitcasts the function to the correct type. -static Value* handleSRetFuncTypeMerge(Value *V, const Type* Ty) { - // Handle degenerate cases - if (!V) - return 0; - if (V->getType() == Ty) - return V; - - const PointerType *PF1 = dyn_cast(Ty); - const PointerType *PF2 = dyn_cast(V->getType()); - if (PF1 && PF2) { - const FunctionType *FT1 = dyn_cast(PF1->getElementType()); - const FunctionType *FT2 = dyn_cast(PF2->getElementType()); - if (FT1 && FT2 && FuncTysDifferOnlyBySRet(FT1, FT2)) { - const ParamAttrsList *PAL2 = FT2->getParamAttrs(); - if (PAL2 && PAL2->paramHasAttr(1, ParamAttr::StructRet)) - return V; - else if (Constant *C = dyn_cast(V)) - return ConstantExpr::getBitCast(C, PF1); - else - return new BitCastInst(V, PF1, "upgrd.cast", CurBB); - } - - } - return 0; -} - // getExistingValue - Look up the value specified by the provided type and // the provided ValID. If the value exists and has already been defined, return // it. Otherwise return null. @@ -491,8 +419,7 @@ ValueSymbolTable &SymTab = CurFun.CurrentFunction->getValueSymbolTable(); V = SymTab.lookup(LookupName); if (V && V->getType() != Ty) - V = handleSRetFuncTypeMerge(V, Ty); - assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong type"); + V = 0; } if (!V) { RenameMapType::const_iterator I = CurModule.RenameMap.find(Key); @@ -503,8 +430,7 @@ LookupName = D.Name; V = CurModule.CurrentModule->getValueSymbolTable().lookup(LookupName); if (V && V->getType() != Ty) - V = handleSRetFuncTypeMerge(V, Ty); - assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong type"); + V = 0; } if (!V) return 0; @@ -2139,7 +2065,7 @@ } const FunctionType *FTy = - FunctionType::get($1.PAT->get(), Params, isVarArg, PAL); + FunctionType::get($1.PAT->get(), Params, isVarArg); $$.PAT = new PATypeHolder( HandleUpRefs(FTy, $$.S) ); delete $1.PAT; // Delete the return type handle @@ -2925,19 +2851,7 @@ if (isVarArg) ParamTyList.pop_back(); - // Convert the CSRet calling convention into the corresponding parameter - // attribute. - ParamAttrsList *PAL = 0; - if ($1 == OldCallingConv::CSRet) { - ParamAttrsVector Attrs; - ParamAttrsWithIndex PAWI; - PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg - Attrs.push_back(PAWI); - PAL = ParamAttrsList::get(Attrs); - } - - const FunctionType *FT = - FunctionType::get(RetTy, ParamTyList, isVarArg, PAL); + const FunctionType *FT = FunctionType::get(RetTy, ParamTyList, isVarArg); const PointerType *PFT = PointerType::get(FT); delete $2.PAT; @@ -3055,6 +2969,16 @@ free($7); } + // Convert the CSRet calling convention into the corresponding parameter + // attribute. + if ($1 == OldCallingConv::CSRet) { + ParamAttrsVector Attrs; + ParamAttrsWithIndex PAWI; + PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg + Attrs.push_back(PAWI); + Fn->setParamAttrs(ParamAttrsList::get(Attrs)); + } + // Add all of the arguments we parsed to the function... if ($5) { // Is null if empty... if (isVarArg) { // Nuke the last entry @@ -3324,17 +3248,9 @@ FTySign.add(I->S); } } - ParamAttrsList *PAL = 0; - if ($2 == OldCallingConv::CSRet) { - ParamAttrsVector Attrs; - ParamAttrsWithIndex PAWI; - PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg - Attrs.push_back(PAWI); - PAL = ParamAttrsList::get(Attrs); - } bool isVarArg = ParamTypes.size() && ParamTypes.back() == Type::VoidTy; if (isVarArg) ParamTypes.pop_back(); - Ty = FunctionType::get($3.PAT->get(), ParamTypes, isVarArg, PAL); + Ty = FunctionType::get($3.PAT->get(), ParamTypes, isVarArg); PFTy = PointerType::get(Ty); $$.S.copy($3.S); } else { @@ -3376,6 +3292,13 @@ $$.TI = new InvokeInst(V, Normal, Except, Args.begin(), Args.end()); } cast($$.TI)->setCallingConv(upgradeCallingConv($2)); + if ($2 == OldCallingConv::CSRet) { + ParamAttrsVector Attrs; + ParamAttrsWithIndex PAWI; + PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg + Attrs.push_back(PAWI); + cast($$.TI)->setParamAttrs(ParamAttrsList::get(Attrs)); + } delete $3.PAT; delete $6; lastCallingConv = OldCallingConv::C; @@ -3732,17 +3655,7 @@ if (!RetTy->isFirstClassType() && RetTy != Type::VoidTy) error("Functions cannot return aggregate types"); - // Deal with CSRetCC - ParamAttrsList *PAL = 0; - if ($2 == OldCallingConv::CSRet) { - ParamAttrsVector Attrs; - ParamAttrsWithIndex PAWI; - PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg - Attrs.push_back(PAWI); - PAL = ParamAttrsList::get(Attrs); - } - - FTy = FunctionType::get(RetTy, ParamTypes, isVarArg, PAL); + FTy = FunctionType::get(RetTy, ParamTypes, isVarArg); PFTy = PointerType::get(FTy); $$.S.copy($3.S); } else { @@ -3794,8 +3707,17 @@ CallInst *CI = new CallInst(V, Args.begin(), Args.end()); CI->setTailCall($1); CI->setCallingConv(upgradeCallingConv($2)); + $$.I = CI; } + // Deal with CSRetCC + if ($2 == OldCallingConv::CSRet) { + ParamAttrsVector Attrs; + ParamAttrsWithIndex PAWI; + PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg + Attrs.push_back(PAWI); + cast($$.I)->setParamAttrs(ParamAttrsList::get(Attrs)); + } delete $3.PAT; delete $6; lastCallingConv = OldCallingConv::C; @@ -3874,17 +3796,11 @@ Value *StoreVal = $3.V; Value* tmpVal = getVal(PTy, $6); if (ElTy != $3.V->getType()) { - StoreVal = handleSRetFuncTypeMerge($3.V, ElTy); - if (!StoreVal) - error("Can't store '" + $3.V->getType()->getDescription() + - "' into space of type '" + ElTy->getDescription() + "'"); - else { - PTy = PointerType::get(StoreVal->getType()); - if (Constant *C = dyn_cast(tmpVal)) - tmpVal = ConstantExpr::getBitCast(C, PTy); - else - tmpVal = new BitCastInst(tmpVal, PTy, "upgrd.cast", CurBB); - } + PTy = PointerType::get(StoreVal->getType()); + if (Constant *C = dyn_cast(tmpVal)) + tmpVal = ConstantExpr::getBitCast(C, PTy); + else + tmpVal = new BitCastInst(tmpVal, PTy, "upgrd.cast", CurBB); } $$.I = new StoreInst(StoreVal, tmpVal, $1); $$.S.makeSignless(); Modified: llvm/trunk/tools/llvm2cpp/CppWriter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm2cpp/CppWriter.cpp?rev=44359&r1=44358&r2=44359&view=diff ============================================================================== --- llvm/trunk/tools/llvm2cpp/CppWriter.cpp (original) +++ llvm/trunk/tools/llvm2cpp/CppWriter.cpp Tue Nov 27 07:23:08 2007 @@ -114,6 +114,7 @@ private: void printLinkageType(GlobalValue::LinkageTypes LT); + void printVisibilityType(GlobalValue::VisibilityTypes VisTypes); void printCallingConv(unsigned cc); void printEscapedString(const std::string& str); void printCFP(const ConstantFP* CFP); @@ -124,6 +125,7 @@ std::string getCppName(const Value* val); inline void printCppName(const Value* val); + void printParamAttrs(const ParamAttrsList* PAL, const std::string &name); bool printTypeInternal(const Type* Ty); inline void printType(const Type* Ty); void printTypes(const Module* M); @@ -302,6 +304,22 @@ } } +void +CppWriter::printVisibilityType(GlobalValue::VisibilityTypes VisType) { + switch (VisType) { + default: assert(0 && "Unknown GVar visibility"); + case GlobalValue::DefaultVisibility: + Out << "GlobalValue::DefaultVisibility"; + break; + case GlobalValue::HiddenVisibility: + Out << "GlobalValue::HiddenVisibility"; + break; + case GlobalValue::ProtectedVisibility: + Out << "GlobalValue::ProtectedVisibility"; + break; + } +} + // printEscapedString - Print each character of the specified string, escaping // it if it is not printable or if it is an escape char. void @@ -419,6 +437,42 @@ printEscapedString(getCppName(val)); } +void +CppWriter::printParamAttrs(const ParamAttrsList* PAL, const std::string &name) { + Out << "ParamAttrsList *" << name << "_PAL = 0;"; + nl(Out); + if (PAL) { + Out << '{'; in(); nl(Out); + Out << "ParamAttrsVector Attrs;"; nl(Out); + Out << "ParamAttrsWithIndex PAWI;"; nl(Out); + for (unsigned i = 0; i < PAL->size(); ++i) { + uint16_t index = PAL->getParamIndex(i); + uint16_t attrs = PAL->getParamAttrs(index); + Out << "PAWI.index = " << index << "; PAWI.attrs = 0 "; + if (attrs & ParamAttr::SExt) + Out << " | ParamAttr::SExt"; + if (attrs & ParamAttr::ZExt) + Out << " | ParamAttr::ZExt"; + if (attrs & ParamAttr::StructRet) + Out << " | ParamAttr::StructRet"; + if (attrs & ParamAttr::InReg) + Out << " | ParamAttr::InReg"; + if (attrs & ParamAttr::NoReturn) + Out << " | ParamAttr::NoReturn"; + if (attrs & ParamAttr::NoUnwind) + Out << " | ParamAttr::NoUnwind"; + Out << ";"; + nl(Out); + Out << "Attrs.push_back(PAWI);"; + nl(Out); + } + Out << name << "_PAL = ParamAttrsList::get(Attrs);"; + nl(Out); + out(); nl(Out); + Out << '}'; nl(Out); + } +} + bool CppWriter::printTypeInternal(const Type* Ty) { // We don't print definitions for primitive types @@ -471,41 +525,6 @@ Out << ");"; nl(Out); } - const ParamAttrsList *PAL = FT->getParamAttrs(); - Out << "ParamAttrsList *" << typeName << "_PAL = 0;"; - nl(Out); - if (PAL) { - Out << '{'; in(); nl(Out); - Out << "ParamAttrsVector Attrs;"; nl(Out); - Out << "ParamAttrsWithIndex PAWI;"; nl(Out); - for (unsigned i = 0; i < PAL->size(); ++i) { - uint16_t index = PAL->getParamIndex(i); - uint16_t attrs = PAL->getParamAttrs(index); - Out << "PAWI.index = " << index << "; PAWI.attrs = 0 "; - if (attrs & ParamAttr::SExt) - Out << " | ParamAttr::SExt"; - if (attrs & ParamAttr::ZExt) - Out << " | ParamAttr::ZExt"; - if (attrs & ParamAttr::NoAlias) - Out << " | ParamAttr::NoAlias"; - if (attrs & ParamAttr::StructRet) - Out << " | ParamAttr::StructRet"; - if (attrs & ParamAttr::InReg) - Out << " | ParamAttr::InReg"; - if (attrs & ParamAttr::NoReturn) - Out << " | ParamAttr::NoReturn"; - if (attrs & ParamAttr::NoUnwind) - Out << " | ParamAttr::NoUnwind"; - Out << ";"; - nl(Out); - Out << "Attrs.push_back(PAWI);"; - nl(Out); - } - Out << typeName << "_PAL = ParamAttrsList::get(Attrs);"; - nl(Out); - out(); nl(Out); - Out << '}'; nl(Out); - } bool isForward = printTypeInternal(FT->getReturnType()); std::string retTypeName(getCppName(FT->getReturnType())); Out << "FunctionType* " << typeName << " = FunctionType::get("; @@ -514,8 +533,7 @@ Out << "_fwd"; Out << ","; nl(Out) << "/*Params=*/" << typeName << "_args,"; - nl(Out) << "/*isVarArg=*/" << (FT->isVarArg() ? "true," : "false,") ; - nl(Out) << "/*ParamAttrs=*/" << typeName << "_PAL" << ");"; + nl(Out) << "/*isVarArg=*/" << (FT->isVarArg() ? "true" : "false") << ");"; out(); nl(Out); break; @@ -992,6 +1010,13 @@ Out << "->setAlignment(" << utostr(GV->getAlignment()) << ");"; nl(Out); }; + if (GV->getVisibility() != GlobalValue::DefaultVisibility) { + printCppName(GV); + Out << "->setVisibility("; + printVisibilityType(GV->getVisibility()); + Out << ");"; + nl(Out); + } if (is_inline) { out(); Out << "}"; nl(Out); } @@ -1102,6 +1127,9 @@ nl(Out) << iName << "->setCallingConv("; printCallingConv(inv->getCallingConv()); Out << ");"; + printParamAttrs(inv->getParamAttrs(), iName); + Out << iName << "->setParamAttrs(" << iName << "_PAL);"; + nl(Out); break; } case Instruction::Unwind: { @@ -1362,6 +1390,9 @@ nl(Out) << iName << "->setTailCall(" << (call->isTailCall() ? "true":"false"); Out << ");"; + printParamAttrs(call->getParamAttrs(), iName); + Out << iName << "->setParamAttrs(" << iName << "_PAL);"; + nl(Out); break; } case Instruction::Select: { @@ -1533,10 +1564,21 @@ Out << "->setAlignment(" << F->getAlignment() << ");"; nl(Out); } + if (F->getVisibility() != GlobalValue::DefaultVisibility) { + printCppName(F); + Out << "->setVisibility("; + printVisibilityType(F->getVisibility()); + Out << ");"; + nl(Out); + } if (is_inline) { Out << "}"; nl(Out); } + printParamAttrs(F->getParamAttrs(), getCppName(F)); + printCppName(F); + Out << "->setParamAttrs(" << getCppName(F) << "_PAL);"; + nl(Out); } void CppWriter::printFunctionBody(const Function *F) { From baldrick at free.fr Tue Nov 27 07:23:48 2007 From: baldrick at free.fr (Duncan Sands) Date: Tue, 27 Nov 2007 13:23:48 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r44360 - in /llvm-gcc-4.2/trunk/gcc: llvm-backend.cpp llvm-convert.cpp llvm-internal.h llvm-types.cpp Message-ID: <200711271323.lARDNnXh025681@zion.cs.uiuc.edu> Author: baldrick Date: Tue Nov 27 07:23:48 2007 New Revision: 44360 URL: http://llvm.org/viewvc/llvm-project?rev=44360&view=rev Log: Fix PR1146: function attributes go on functions and function calls, not on function types. This is an updated version of Reid Spencer's original patch. Modified: llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp llvm-gcc-4.2/trunk/gcc/llvm-internal.h llvm-gcc-4.2/trunk/gcc/llvm-types.cpp Modified: llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp?rev=44360&r1=44359&r2=44360&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Tue Nov 27 07:23:48 2007 @@ -1022,10 +1022,13 @@ Function *FnEntry = TheModule->getFunction(Name); if (FnEntry == 0) { unsigned CC; + const ParamAttrsList *PAL; const FunctionType *Ty = - TheTypeConverter->ConvertFunctionType(TREE_TYPE(decl), decl, NULL, CC); + TheTypeConverter->ConvertFunctionType(TREE_TYPE(decl), decl, NULL, + CC, PAL); FnEntry = new Function(Ty, Function::ExternalLinkage, Name, TheModule); FnEntry->setCallingConv(CC); + FnEntry->setParamAttrs(PAL); // Check for external weak linkage if (DECL_EXTERNAL(decl) && DECL_WEAK(decl)) Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=44360&r1=44359&r2=44360&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Tue Nov 27 07:23:48 2007 @@ -33,7 +33,6 @@ #include "llvm/DerivedTypes.h" #include "llvm/InlineAsm.h" #include "llvm/Instructions.h" -#include "llvm/IntrinsicInst.h" // FIXME: Remove once PR1146 is done. #include "llvm/Module.h" #include "llvm/Analysis/ConstantFolding.h" #include "llvm/Support/MathExtras.h" @@ -526,7 +525,8 @@ tree static_chain = cfun->static_chain_decl; const FunctionType *FTy; unsigned CallingConv; - + const ParamAttrsList *PAL; + // If the function has no arguments and is varargs (...), turn it into a // non-varargs function by scanning the param list for the function. This // allows C functions declared as "T foo() {}" to be treated like @@ -536,7 +536,7 @@ FTy = TheTypeConverter->ConvertArgListToFnType(TREE_TYPE(TREE_TYPE(FnDecl)), DECL_ARGUMENTS(FnDecl), static_chain, - CallingConv); + CallingConv, PAL); #ifdef TARGET_ADJUST_LLVM_CC TARGET_ADJUST_LLVM_CC(CallingConv, TREE_TYPE(FnDecl)); #endif @@ -545,7 +545,7 @@ FTy = TheTypeConverter->ConvertFunctionType(TREE_TYPE(FnDecl), FnDecl, static_chain, - CallingConv); + CallingConv, PAL); } // If we've already seen this function and created a prototype, and if the @@ -581,7 +581,8 @@ Fn = new Function(FTy, Function::ExternalLinkage, Name, TheModule); assert(Fn->getName() == Name && "Preexisting fn with the same name!"); Fn->setCallingConv(CallingConv); - + Fn->setParamAttrs(PAL); + // If a previous proto existed with the wrong type, replace any uses of it // with the actual function and delete the proto. if (FnEntry) { @@ -2166,34 +2167,25 @@ Value *Callee = Emit(TREE_OPERAND(exp, 0), 0); - // Avoid this kind of thing while waiting for PR1146 to be fixed: - // - // call void bitcast (void (i32* noalias , i32*)* @_Z3fooPiPVi - // to void (i32*, i32*)*)( i32* %x, i32* %y ) - // - // The problem is that some attributes like noalias are only stored in the - // GCC function declaration and are not available from the function type. - // Converting the function type to LLVM results in an LLVM function type - // without the attributes. The function declaration however is turned into - // an LLVM function type with the attributes present. The discrepancy in - // the types results in the bitcast. The solution is to bitcast back to the - // type of the function declaration. Once PR1146 is done this logic will only - // be needed for nested functions (-> TREE_OPERAND(exp, 2) is not NULL) - they - // get an extra parameter. assert(TREE_TYPE (TREE_OPERAND (exp, 0)) && TREE_CODE(TREE_TYPE (TREE_OPERAND (exp, 0))) == POINTER_TYPE && "Not calling a function pointer?"); tree function_type = TREE_TYPE(TREE_TYPE (TREE_OPERAND (exp, 0))); unsigned CallingConv; + const ParamAttrsList *PAL; + const Type *Ty = TheTypeConverter->ConvertFunctionType(function_type, fndecl, TREE_OPERAND(exp, 2), - CallingConv); - Callee = BitCastToType(IntrinsicInst::StripPointerCasts(Callee), - PointerType::get(Ty)); + CallingConv, PAL); + + // If this is a direct call to a function using a static chain then we need + // to ensure the function type is the one just calculated: it has an extra + // parameter for the chain. + Callee = BitCastToType(Callee, PointerType::get(Ty)); //EmitCall(exp, DestLoc); - Value *Result = EmitCallOf(Callee, exp, DestLoc); + Value *Result = EmitCallOf(Callee, exp, DestLoc, PAL); // If the function has the volatile bit set, then it is a "noreturn" function. // Output an unreachable instruction right after the function to prevent LLVM @@ -2214,7 +2206,6 @@ tree CallExpression; SmallVector &CallOperands; CallingConv::ID &CallingConvention; - bool isStructRet; LLVMBuilder &Builder; const MemRef *DestLoc; std::vector LocStack; @@ -2225,7 +2216,6 @@ : CallExpression(exp), CallOperands(ops), CallingConvention(cc), Builder(b), DestLoc(destloc) { CallingConvention = CallingConv::C; - isStructRet = false; #ifdef TARGET_ADJUST_LLVM_CC tree ftype; if (tree fdecl = get_callee_fndecl(exp)) { @@ -2271,9 +2261,6 @@ /// function. void HandleAggregateShadowArgument(const PointerType *PtrArgTy, bool RetPtr) { - // Make sure this call is marked as 'struct return'. - isStructRet = true; - // We need to pass a buffer to return into. If the caller uses the // result, DestLoc will be set. If it ignores it, it could be unset, // in which case we need to create a dummy buffer. @@ -2318,7 +2305,8 @@ /// EmitCallOf - Emit a call to the specified callee with the operands specified /// in the CALL_EXP 'exp'. If the result of the call is a scalar, return the /// result, otherwise store it in DestLoc. -Value *TreeToLLVM::EmitCallOf(Value *Callee, tree exp, const MemRef *DestLoc) { +Value *TreeToLLVM::EmitCallOf(Value *Callee, tree exp, const MemRef *DestLoc, + const ParamAttrsList *PAL) { // Determine if we need to generate an invoke instruction (instead of a simple // call) and if so, what the exception destination will be. BasicBlock *LandingPad = 0; @@ -2428,11 +2416,13 @@ if (!LandingPad) { Call = Builder.CreateCall(Callee, CallOperands.begin(), CallOperands.end()); cast(Call)->setCallingConv(CallingConvention); + cast(Call)->setParamAttrs(PAL); } else { BasicBlock *NextBlock = new BasicBlock("invcont"); Call = Builder.CreateInvoke(Callee, NextBlock, LandingPad, CallOperands.begin(), CallOperands.end()); cast(Call)->setCallingConv(CallingConvention); + cast(Call)->setParamAttrs(PAL); EmitBlock(NextBlock); } @@ -3920,7 +3910,7 @@ Intrinsic::getDeclaration(TheModule, IntrinsicID); } - Result = EmitCallOf(TargetBuiltinCache[FnCode], exp, DestLoc); + Result = EmitCallOf(TargetBuiltinCache[FnCode], exp, DestLoc, 0); return true; } Modified: llvm-gcc-4.2/trunk/gcc/llvm-internal.h URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-internal.h?rev=44360&r1=44359&r2=44360&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-internal.h (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-internal.h Tue Nov 27 07:23:48 2007 @@ -151,11 +151,12 @@ /// ConvertFunctionType - Convert the specified FUNCTION_TYPE or METHOD_TYPE /// tree to an LLVM type. This does the same thing that ConvertType does, but - /// it also returns the function's LLVM calling convention. + /// it also returns the function's LLVM calling convention and attributes. const FunctionType *ConvertFunctionType(tree_node *type, tree_node *decl, tree_node *static_chain, - unsigned &CallingConv); + unsigned &CallingConv, + const ParamAttrsList *&PAL); /// ConvertArgListToFnType - Given a DECL_ARGUMENTS list on an GCC tree, /// return the LLVM type corresponding to the function. This is useful for @@ -163,7 +164,8 @@ const FunctionType *ConvertArgListToFnType(tree_node *retty, tree_node *arglist, tree_node *static_chain, - unsigned &CallingConv); + unsigned &CallingConv, + const ParamAttrsList *&PAL); private: const Type *ConvertRECORD(tree_node *type, tree_node *orig_type); @@ -463,7 +465,8 @@ Value *EmitADDR_EXPR(tree_node *exp); Value *EmitOBJ_TYPE_REF(tree_node *exp); Value *EmitCALL_EXPR(tree_node *exp, const MemRef *DestLoc); - Value *EmitCallOf(Value *Callee, tree_node *exp, const MemRef *DestLoc); + Value *EmitCallOf(Value *Callee, tree_node *exp, const MemRef *DestLoc, + const ParamAttrsList *PAL); Value *EmitMODIFY_EXPR(tree_node *exp, const MemRef *DestLoc); Value *EmitNOP_EXPR(tree_node *exp, const MemRef *DestLoc); Value *EmitCONVERT_EXPR(tree_node *exp, const MemRef *DestLoc); Modified: llvm-gcc-4.2/trunk/gcc/llvm-types.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-types.cpp?rev=44360&r1=44359&r2=44360&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-types.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-types.cpp Tue Nov 27 07:23:48 2007 @@ -215,14 +215,13 @@ /// takes PATypeHolders. static FunctionType *GetFunctionType(const PATypeHolder &Res, std::vector &ArgTys, - bool isVarArg, - const ParamAttrsList *Attrs) { + bool isVarArg) { std::vector ArgTysP; ArgTysP.reserve(ArgTys.size()); for (unsigned i = 0, e = ArgTys.size(); i != e; ++i) ArgTysP.push_back(ArgTys[i]); - return FunctionType::get(Res, ArgTysP, isVarArg, Attrs); + return FunctionType::get(Res, ArgTysP, isVarArg); } //===----------------------------------------------------------------------===// @@ -840,10 +839,10 @@ // No declaration to pass through, passing NULL. unsigned CallingConv; - return TypeDB.setType(type, ConvertFunctionType(type, - NULL, - NULL, - CallingConv)); + const ParamAttrsList *PAL; + + return TypeDB.setType(type, ConvertFunctionType(type, NULL, NULL, + CallingConv, PAL)); } case ARRAY_TYPE: { if (const Type *Ty = GET_TYPE_LLVM(type)) @@ -973,7 +972,7 @@ /// specified result type for the function. const FunctionType *TypeConverter:: ConvertArgListToFnType(tree ReturnType, tree Args, tree static_chain, - unsigned &CallingConv) { + unsigned &CallingConv, const ParamAttrsList *&PAL) { std::vector ArgTys; PATypeHolder RetTy(Type::VoidTy); @@ -995,17 +994,16 @@ for (; Args && TREE_TYPE(Args) != void_type_node; Args = TREE_CHAIN(Args)) ABIConverter.HandleArgument(TREE_TYPE(Args)); - ParamAttrsList *PAL = 0; + PAL = 0; if (!Attrs.empty()) PAL = ParamAttrsList::get(Attrs); - return GetFunctionType(RetTy, ArgTys, false, PAL); + return GetFunctionType(RetTy, ArgTys, false); } -const FunctionType *TypeConverter::ConvertFunctionType(tree type, - tree decl, - tree static_chain, - unsigned &CallingConv) { +const FunctionType *TypeConverter:: +ConvertFunctionType(tree type, tree decl, tree static_chain, + unsigned &CallingConv, const ParamAttrsList *&PAL) { PATypeHolder RetTy = Type::VoidTy; std::vector ArgTypes; bool isVarArg = false; @@ -1149,12 +1147,12 @@ assert(RetTy && "Return type not specified!"); // Only instantiate the parameter attributes if we got some. - ParamAttrsList *PAL = 0; + PAL = 0; if (!Attrs.empty()) PAL = ParamAttrsList::get(Attrs); // Finally, make the function type - return GetFunctionType(RetTy, ArgTypes, isVarArg, PAL); + return GetFunctionType(RetTy, ArgTypes, isVarArg); } //===----------------------------------------------------------------------===// From baldrick at free.fr Tue Nov 27 07:23:50 2007 From: baldrick at free.fr (Duncan Sands) Date: Tue, 27 Nov 2007 13:23:50 -0000 Subject: [llvm-commits] [llvm-gcc-4.0] r44361 - in /llvm-gcc-4.0/trunk/gcc: llvm-backend.cpp llvm-convert.cpp llvm-internal.h llvm-types.cpp Message-ID: <200711271323.lARDNoCP025698@zion.cs.uiuc.edu> Author: baldrick Date: Tue Nov 27 07:23:49 2007 New Revision: 44361 URL: http://llvm.org/viewvc/llvm-project?rev=44361&view=rev Log: Fix PR1146: function attributes go on functions and function calls, not on function types. This is an updated version of Reid Spencer's original patch. Modified: llvm-gcc-4.0/trunk/gcc/llvm-backend.cpp llvm-gcc-4.0/trunk/gcc/llvm-convert.cpp llvm-gcc-4.0/trunk/gcc/llvm-internal.h llvm-gcc-4.0/trunk/gcc/llvm-types.cpp Modified: llvm-gcc-4.0/trunk/gcc/llvm-backend.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/gcc/llvm-backend.cpp?rev=44361&r1=44360&r2=44361&view=diff ============================================================================== --- llvm-gcc-4.0/trunk/gcc/llvm-backend.cpp (original) +++ llvm-gcc-4.0/trunk/gcc/llvm-backend.cpp Tue Nov 27 07:23:49 2007 @@ -1000,10 +1000,13 @@ Function *FnEntry = TheModule->getFunction(Name); if (FnEntry == 0) { unsigned CC; + const ParamAttrsList *PAL; const FunctionType *Ty = - TheTypeConverter->ConvertFunctionType(TREE_TYPE(decl), decl, NULL, CC); + TheTypeConverter->ConvertFunctionType(TREE_TYPE(decl), decl, NULL, + CC, PAL); FnEntry = new Function(Ty, Function::ExternalLinkage, Name, TheModule); FnEntry->setCallingConv(CC); + FnEntry->setParamAttrs(PAL); // Check for external weak linkage if (DECL_EXTERNAL(decl) && DECL_WEAK(decl)) Modified: llvm-gcc-4.0/trunk/gcc/llvm-convert.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/gcc/llvm-convert.cpp?rev=44361&r1=44360&r2=44361&view=diff ============================================================================== --- llvm-gcc-4.0/trunk/gcc/llvm-convert.cpp (original) +++ llvm-gcc-4.0/trunk/gcc/llvm-convert.cpp Tue Nov 27 07:23:49 2007 @@ -33,7 +33,6 @@ #include "llvm/DerivedTypes.h" #include "llvm/InlineAsm.h" #include "llvm/Instructions.h" -#include "llvm/IntrinsicInst.h" // FIXME: Remove once PR1146 is done. #include "llvm/Module.h" #include "llvm/Analysis/ConstantFolding.h" #include "llvm/Support/MathExtras.h" @@ -500,7 +499,8 @@ tree static_chain = cfun->static_chain_decl; const FunctionType *FTy; unsigned CallingConv; - + const ParamAttrsList *PAL; + // If the function has no arguments and is varargs (...), turn it into a // non-varargs function by scanning the param list for the function. This // allows C functions declared as "T foo() {}" to be treated like @@ -510,7 +510,7 @@ FTy = TheTypeConverter->ConvertArgListToFnType(TREE_TYPE(TREE_TYPE(FnDecl)), DECL_ARGUMENTS(FnDecl), static_chain, - CallingConv); + CallingConv, PAL); #ifdef TARGET_ADJUST_LLVM_CC TARGET_ADJUST_LLVM_CC(CallingConv, TREE_TYPE(FnDecl)); #endif @@ -519,7 +519,7 @@ FTy = TheTypeConverter->ConvertFunctionType(TREE_TYPE(FnDecl), FnDecl, static_chain, - CallingConv); + CallingConv, PAL); } // If we've already seen this function and created a prototype, and if the @@ -555,7 +555,8 @@ Fn = new Function(FTy, Function::ExternalLinkage, Name, TheModule); assert(Fn->getName() == Name && "Preexisting fn with the same name!"); Fn->setCallingConv(CallingConv); - + Fn->setParamAttrs(PAL); + // If a previous proto existed with the wrong type, replace any uses of it // with the actual function and delete the proto. if (FnEntry) { @@ -2649,34 +2650,25 @@ Value *Callee = Emit(TREE_OPERAND(exp, 0), 0); - // Avoid this kind of thing while waiting for PR1146 to be fixed: - // - // call void bitcast (void (i32* noalias , i32*)* @_Z3fooPiPVi - // to void (i32*, i32*)*)( i32* %x, i32* %y ) - // - // The problem is that some attributes like noalias are only stored in the - // GCC function declaration and are not available from the function type. - // Converting the function type to LLVM results in an LLVM function type - // without the attributes. The function declaration however is turned into - // an LLVM function type with the attributes present. The discrepancy in - // the types results in the bitcast. The solution is to bitcast back to the - // type of the function declaration. Once PR1146 is done this logic will only - // be needed for nested functions (-> TREE_OPERAND(exp, 2) is not NULL) - they - // get an extra parameter. assert(TREE_TYPE (TREE_OPERAND (exp, 0)) && TREE_CODE(TREE_TYPE (TREE_OPERAND (exp, 0))) == POINTER_TYPE && "Not calling a function pointer?"); tree function_type = TREE_TYPE(TREE_TYPE (TREE_OPERAND (exp, 0))); unsigned CallingConv; + const ParamAttrsList *PAL; + const Type *Ty = TheTypeConverter->ConvertFunctionType(function_type, fndecl, TREE_OPERAND(exp, 2), - CallingConv); - Callee = BitCastToType(IntrinsicInst::StripPointerCasts(Callee), - PointerType::get(Ty)); + CallingConv, PAL); + + // If this is a direct call to a function using a static chain then we need + // to ensure the function type is the one just calculated: it has an extra + // parameter for the chain. + Callee = BitCastToType(Callee, PointerType::get(Ty)); //EmitCall(exp, DestLoc); - Value *Result = EmitCallOf(Callee, exp, DestLoc); + Value *Result = EmitCallOf(Callee, exp, DestLoc, PAL); // If the function has the volatile bit set, then it is a "noreturn" function. // Output an unreachable instruction right after the function to prevent LLVM @@ -2697,7 +2689,6 @@ tree CallExpression; SmallVector &CallOperands; CallingConv::ID &CallingConvention; - bool isStructRet; LLVMBuilder &Builder; const MemRef *DestLoc; std::vector LocStack; @@ -2708,7 +2699,6 @@ : CallExpression(exp), CallOperands(ops), CallingConvention(cc), Builder(b), DestLoc(destloc) { CallingConvention = CallingConv::C; - isStructRet = false; #ifdef TARGET_ADJUST_LLVM_CC tree ftype; if (tree fdecl = get_callee_fndecl(exp)) { @@ -2754,9 +2744,6 @@ /// function. void HandleAggregateShadowArgument(const PointerType *PtrArgTy, bool RetPtr) { - // Make sure this call is marked as 'struct return'. - isStructRet = true; - // If the front-end has already made the argument explicit, don't do it // again. if (CALL_EXPR_HAS_RETURN_SLOT_ADDR(CallExpression)) @@ -2807,7 +2794,8 @@ /// EmitCallOf - Emit a call to the specified callee with the operands specified /// in the CALL_EXP 'exp'. If the result of the call is a scalar, return the /// result, otherwise store it in DestLoc. -Value *TreeToLLVM::EmitCallOf(Value *Callee, tree exp, const MemRef *DestLoc) { +Value *TreeToLLVM::EmitCallOf(Value *Callee, tree exp, const MemRef *DestLoc, + const ParamAttrsList *PAL) { // Determine if we need to generate an invoke instruction (instead of a simple // call) and if so, what the exception destination will be. BasicBlock *UnwindBlock = 0; @@ -2897,11 +2885,13 @@ if (!UnwindBlock) { Call = Builder.CreateCall(Callee, CallOperands.begin(), CallOperands.end()); cast(Call)->setCallingConv(CallingConvention); + cast(Call)->setParamAttrs(PAL); } else { BasicBlock *NextBlock = new BasicBlock("invcont"); Call = Builder.CreateInvoke(Callee, NextBlock, UnwindBlock, CallOperands.begin(), CallOperands.end()); cast(Call)->setCallingConv(CallingConvention); + cast(Call)->setParamAttrs(PAL); // Lazily create an unwind block for this scope, which we can emit a fixup // branch in. @@ -4361,7 +4351,7 @@ Intrinsic::getDeclaration(TheModule, IntrinsicID); } - Result = EmitCallOf(TargetBuiltinCache[FnCode], exp, DestLoc); + Result = EmitCallOf(TargetBuiltinCache[FnCode], exp, DestLoc, 0); return true; } Modified: llvm-gcc-4.0/trunk/gcc/llvm-internal.h URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/gcc/llvm-internal.h?rev=44361&r1=44360&r2=44361&view=diff ============================================================================== --- llvm-gcc-4.0/trunk/gcc/llvm-internal.h (original) +++ llvm-gcc-4.0/trunk/gcc/llvm-internal.h Tue Nov 27 07:23:49 2007 @@ -138,11 +138,12 @@ /// ConvertFunctionType - Convert the specified FUNCTION_TYPE or METHOD_TYPE /// tree to an LLVM type. This does the same thing that ConvertType does, but - /// it also returns the function's LLVM calling convention. + /// it also returns the function's LLVM calling convention and attributes. const FunctionType *ConvertFunctionType(tree_node *type, tree_node *decl, tree_node *static_chain, - unsigned &CallingConv); + unsigned &CallingConv, + const ParamAttrsList *&PAL); /// ConvertArgListToFnType - Given a DECL_ARGUMENTS list on an GCC tree, /// return the LLVM type corresponding to the function. This is useful for @@ -150,7 +151,8 @@ const FunctionType *ConvertArgListToFnType(tree_node *retty, tree_node *arglist, tree_node *static_chain, - unsigned &CallingConv); + unsigned &CallingConv, + const ParamAttrsList *&PAL); private: const Type *ConvertRECORD(tree_node *type, tree_node *orig_type); @@ -534,7 +536,8 @@ Value *EmitADDR_EXPR(tree_node *exp); Value *EmitOBJ_TYPE_REF(tree_node *exp); Value *EmitCALL_EXPR(tree_node *exp, const MemRef *DestLoc); - Value *EmitCallOf(Value *Callee, tree_node *exp, const MemRef *DestLoc); + Value *EmitCallOf(Value *Callee, tree_node *exp, const MemRef *DestLoc, + const ParamAttrsList *PAL); Value *EmitMODIFY_EXPR(tree_node *exp, const MemRef *DestLoc); Value *EmitNOP_EXPR(tree_node *exp, const MemRef *DestLoc); Value *EmitCONVERT_EXPR(tree_node *exp, const MemRef *DestLoc); Modified: llvm-gcc-4.0/trunk/gcc/llvm-types.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/gcc/llvm-types.cpp?rev=44361&r1=44360&r2=44361&view=diff ============================================================================== --- llvm-gcc-4.0/trunk/gcc/llvm-types.cpp (original) +++ llvm-gcc-4.0/trunk/gcc/llvm-types.cpp Tue Nov 27 07:23:49 2007 @@ -215,14 +215,13 @@ /// takes PATypeHolders. static FunctionType *GetFunctionType(const PATypeHolder &Res, std::vector &ArgTys, - bool isVarArg, - const ParamAttrsList *Attrs) { + bool isVarArg) { std::vector ArgTysP; ArgTysP.reserve(ArgTys.size()); for (unsigned i = 0, e = ArgTys.size(); i != e; ++i) ArgTysP.push_back(ArgTys[i]); - return FunctionType::get(Res, ArgTysP, isVarArg, Attrs); + return FunctionType::get(Res, ArgTysP, isVarArg); } //===----------------------------------------------------------------------===// @@ -812,10 +811,10 @@ // No declaration to pass through, passing NULL. unsigned CallingConv; - return TypeDB.setType(type, ConvertFunctionType(type, - NULL, - NULL, - CallingConv)); + const ParamAttrsList *PAL; + + return TypeDB.setType(type, ConvertFunctionType(type, NULL, NULL, + CallingConv, PAL)); } case ARRAY_TYPE: { if (const Type *Ty = GET_TYPE_LLVM(type)) @@ -938,7 +937,7 @@ /// specified result type for the function. const FunctionType *TypeConverter:: ConvertArgListToFnType(tree ReturnType, tree Args, tree static_chain, - unsigned &CallingConv) { + unsigned &CallingConv, const ParamAttrsList *&PAL) { std::vector ArgTys; PATypeHolder RetTy(Type::VoidTy); @@ -960,17 +959,16 @@ for (; Args && TREE_TYPE(Args) != void_type_node; Args = TREE_CHAIN(Args)) ABIConverter.HandleArgument(TREE_TYPE(Args)); - ParamAttrsList *PAL = 0; + PAL = 0; if (!Attrs.empty()) PAL = ParamAttrsList::get(Attrs); - return GetFunctionType(RetTy, ArgTys, false, PAL); + return GetFunctionType(RetTy, ArgTys, false); } -const FunctionType *TypeConverter::ConvertFunctionType(tree type, - tree decl, - tree static_chain, - unsigned &CallingConv) { +const FunctionType *TypeConverter:: +ConvertFunctionType(tree type, tree decl, tree static_chain, + unsigned &CallingConv, const ParamAttrsList *&PAL) { PATypeHolder RetTy = Type::VoidTy; std::vector ArgTypes; bool isVarArg = false; @@ -1114,12 +1112,12 @@ assert(RetTy && "Return type not specified!"); // Only instantiate the parameter attributes if we got some. - ParamAttrsList *PAL = 0; + PAL = 0; if (!Attrs.empty()) PAL = ParamAttrsList::get(Attrs); // Finally, make the function type - return GetFunctionType(RetTy, ArgTypes, isVarArg, PAL); + return GetFunctionType(RetTy, ArgTypes, isVarArg); } //===----------------------------------------------------------------------===// From asl at math.spbu.ru Tue Nov 27 11:23:52 2007 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Tue, 27 Nov 2007 17:23:52 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r44362 - /llvm-gcc-4.2/trunk/gcc/llvm-types.cpp Message-ID: <200711271723.lARHNq1s008464@zion.cs.uiuc.edu> Author: asl Date: Tue Nov 27 11:23:52 2007 New Revision: 44362 URL: http://llvm.org/viewvc/llvm-project?rev=44362&view=rev Log: Handle sext/zext stuff correctly for K&R-style functions. Unify handling of sext/zext. Modified: llvm-gcc-4.2/trunk/gcc/llvm-types.cpp Modified: llvm-gcc-4.2/trunk/gcc/llvm-types.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-types.cpp?rev=44362&r1=44361&r2=44362&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-types.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-types.cpp Tue Nov 27 11:23:52 2007 @@ -964,6 +964,21 @@ } +static uint16_t HandleArgumentExtension(tree ArgTy) { + if (TREE_CODE(ArgTy) == BOOLEAN_TYPE) { + if (TREE_INT_CST_LOW(TYPE_SIZE(ArgTy)) < INT_TYPE_SIZE) + return ParamAttr::ZExt; + } else if (TREE_CODE(ArgTy) == INTEGER_TYPE && + TREE_INT_CST_LOW(TYPE_SIZE(ArgTy)) < INT_TYPE_SIZE) { + if (TYPE_UNSIGNED(ArgTy)) + return ParamAttr::ZExt; + else + return ParamAttr::SExt; + } + + return ParamAttr::None; +} + /// ConvertParamListToLLVMSignature - This method is used to build the argument /// type list for K&R prototyped functions. In this case, we have to figure out /// the type list (to build a FunctionType) from the actual DECL_ARGUMENTS list @@ -981,18 +996,39 @@ ABIConverter.HandleReturnType(ReturnType); + ParamAttrsVector Attrs; + + // Compute whether the result needs to be zext or sext'd. + uint16_t RAttributes = HandleArgumentExtension(ReturnType); + if (RAttributes != ParamAttr::None) + Attrs.push_back(ParamAttrsWithIndex::get(0, RAttributes)); + // If this is a struct-return function, the dest loc is passed in as a // pointer. Mark that pointer as structret. - ParamAttrsVector Attrs; if (ABIConverter.isStructReturn()) Attrs.push_back(ParamAttrsWithIndex::get(ArgTys.size(), ParamAttr::StructRet)); - if (static_chain) + if (static_chain) { // Pass the static chain as the first parameter. ABIConverter.HandleArgument(TREE_TYPE(static_chain)); + // Mark it as the chain argument. + Attrs.push_back(ParamAttrsWithIndex::get(ArgTys.size(), + ParamAttr::Nest)); + } + + for (; Args && TREE_TYPE(Args) != void_type_node; Args = TREE_CHAIN(Args)) { + tree ArgTy = TREE_TYPE(Args); + ABIConverter.HandleArgument(ArgTy); - for (; Args && TREE_TYPE(Args) != void_type_node; Args = TREE_CHAIN(Args)) - ABIConverter.HandleArgument(TREE_TYPE(Args)); + // Determine if there are any attributes for this param. + uint16_t Attributes = ParamAttr::None; + + // Compute zext/sext attributes. + Attributes |= HandleArgumentExtension(ArgTy); + + if (Attributes != ParamAttr::None) + Attrs.push_back(ParamAttrsWithIndex::get(ArgTys.size(), Attributes)); + } PAL = 0; if (!Attrs.empty()) @@ -1046,15 +1082,7 @@ RAttributes |= ParamAttr::ReadOnly; // Compute whether the result needs to be zext or sext'd. - if (isa(RetTy.get())) { - tree ResultTy = TREE_TYPE(type); - if (TREE_INT_CST_LOW(TYPE_SIZE(ResultTy)) < INT_TYPE_SIZE) { - if (TYPE_UNSIGNED(ResultTy) || TREE_CODE(ResultTy) == BOOLEAN_TYPE) - RAttributes |= ParamAttr::ZExt; - else - RAttributes |= ParamAttr::SExt; - } - } + RAttributes |= HandleArgumentExtension(TREE_TYPE(type)); if (RAttributes != ParamAttr::None) Attrs.push_back(ParamAttrsWithIndex::get(0, RAttributes)); @@ -1103,19 +1131,10 @@ ABIConverter.HandleArgument(ArgTy); // Determine if there are any attributes for this param. + uint16_t Attributes = ParamAttr::None; // Compute zext/sext attributes. - unsigned Attributes = ParamAttr::None; - if (TREE_CODE(ArgTy) == BOOLEAN_TYPE) { - if (TREE_INT_CST_LOW(TYPE_SIZE(ArgTy)) < INT_TYPE_SIZE) - Attributes |= ParamAttr::ZExt; - } else if (TREE_CODE(ArgTy) == INTEGER_TYPE && - TREE_INT_CST_LOW(TYPE_SIZE(ArgTy)) < INT_TYPE_SIZE) { - if (TYPE_UNSIGNED(ArgTy)) - Attributes |= ParamAttr::ZExt; - else - Attributes |= ParamAttr::SExt; - } + Attributes |= HandleArgumentExtension(ArgTy); // Compute noalias attributes. If we have a decl for the function // inspect it for restrict qualifiers, otherwise try the argument From asl at math.spbu.ru Tue Nov 27 11:29:06 2007 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Tue, 27 Nov 2007 17:29:06 -0000 Subject: [llvm-commits] [llvm-gcc-4.0] r44363 - /llvm-gcc-4.0/trunk/gcc/llvm-types.cpp Message-ID: <200711271729.lARHT6xv008729@zion.cs.uiuc.edu> Author: asl Date: Tue Nov 27 11:29:05 2007 New Revision: 44363 URL: http://llvm.org/viewvc/llvm-project?rev=44363&view=rev Log: Propagate r44362 to 4.0 Modified: llvm-gcc-4.0/trunk/gcc/llvm-types.cpp Modified: llvm-gcc-4.0/trunk/gcc/llvm-types.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/gcc/llvm-types.cpp?rev=44363&r1=44362&r2=44363&view=diff ============================================================================== --- llvm-gcc-4.0/trunk/gcc/llvm-types.cpp (original) +++ llvm-gcc-4.0/trunk/gcc/llvm-types.cpp Tue Nov 27 11:29:05 2007 @@ -929,6 +929,21 @@ } +static uint16_t HandleArgumentExtension(tree ArgTy) { + if (TREE_CODE(ArgTy) == BOOLEAN_TYPE) { + if (TREE_INT_CST_LOW(TYPE_SIZE(ArgTy)) < INT_TYPE_SIZE) + return ParamAttr::ZExt; + } else if (TREE_CODE(ArgTy) == INTEGER_TYPE && + TREE_INT_CST_LOW(TYPE_SIZE(ArgTy)) < INT_TYPE_SIZE) { + if (TYPE_UNSIGNED(ArgTy)) + return ParamAttr::ZExt; + else + return ParamAttr::SExt; + } + + return ParamAttr::None; +} + /// ConvertParamListToLLVMSignature - This method is used to build the argument /// type list for K&R prototyped functions. In this case, we have to figure out /// the type list (to build a FunctionType) from the actual DECL_ARGUMENTS list @@ -946,18 +961,39 @@ ABIConverter.HandleReturnType(ReturnType); + ParamAttrsVector Attrs; + + // Compute whether the result needs to be zext or sext'd. + uint16_t RAttributes = HandleArgumentExtension(ReturnType); + if (RAttributes != ParamAttr::None) + Attrs.push_back(ParamAttrsWithIndex::get(0, RAttributes)); + // If this is a struct-return function, the dest loc is passed in as a // pointer. Mark that pointer as structret. - ParamAttrsVector Attrs; if (ABIConverter.isStructReturn()) Attrs.push_back(ParamAttrsWithIndex::get(ArgTys.size(), ParamAttr::StructRet)); - if (static_chain) + if (static_chain) { // Pass the static chain as the first parameter. ABIConverter.HandleArgument(TREE_TYPE(static_chain)); + // Mark it as the chain argument. + Attrs.push_back(ParamAttrsWithIndex::get(ArgTys.size(), + ParamAttr::Nest)); + } + + for (; Args && TREE_TYPE(Args) != void_type_node; Args = TREE_CHAIN(Args)) { + tree ArgTy = TREE_TYPE(Args); + ABIConverter.HandleArgument(ArgTy); - for (; Args && TREE_TYPE(Args) != void_type_node; Args = TREE_CHAIN(Args)) - ABIConverter.HandleArgument(TREE_TYPE(Args)); + // Determine if there are any attributes for this param. + uint16_t Attributes = ParamAttr::None; + + // Compute zext/sext attributes. + Attributes |= HandleArgumentExtension(ArgTy); + + if (Attributes != ParamAttr::None) + Attrs.push_back(ParamAttrsWithIndex::get(ArgTys.size(), Attributes)); + } PAL = 0; if (!Attrs.empty()) @@ -1011,15 +1047,7 @@ RAttributes |= ParamAttr::ReadOnly; // Compute whether the result needs to be zext or sext'd. - if (isa(RetTy.get())) { - tree ResultTy = TREE_TYPE(type); - if (TREE_INT_CST_LOW(TYPE_SIZE(ResultTy)) < INT_TYPE_SIZE) { - if (TYPE_UNSIGNED(ResultTy) || TREE_CODE(ResultTy) == BOOLEAN_TYPE) - RAttributes |= ParamAttr::ZExt; - else - RAttributes |= ParamAttr::SExt; - } - } + RAttributes |= HandleArgumentExtension(TREE_TYPE(type)); if (RAttributes != ParamAttr::None) Attrs.push_back(ParamAttrsWithIndex::get(0, RAttributes)); @@ -1068,19 +1096,10 @@ ABIConverter.HandleArgument(ArgTy); // Determine if there are any attributes for this param. + uint16_t Attributes = ParamAttr::None; // Compute zext/sext attributes. - unsigned Attributes = ParamAttr::None; - if (TREE_CODE(ArgTy) == BOOLEAN_TYPE) { - if (TREE_INT_CST_LOW(TYPE_SIZE(ArgTy)) < INT_TYPE_SIZE) - Attributes |= ParamAttr::ZExt; - } else if (TREE_CODE(ArgTy) == INTEGER_TYPE && - TREE_INT_CST_LOW(TYPE_SIZE(ArgTy)) < INT_TYPE_SIZE) { - if (TYPE_UNSIGNED(ArgTy)) - Attributes |= ParamAttr::ZExt; - else - Attributes |= ParamAttr::SExt; - } + Attributes |= HandleArgumentExtension(ArgTy); // Compute noalias attributes. If we have a decl for the function // inspect it for restrict qualifiers, otherwise try the argument From sabre at nondot.org Tue Nov 27 11:48:06 2007 From: sabre at nondot.org (Chris Lattner) Date: Tue, 27 Nov 2007 17:48:06 -0000 Subject: [llvm-commits] [llvm] r44364 - in /llvm/trunk/lib/Bitcode: Reader/BitcodeReader.cpp Writer/BitcodeWriter.cpp Message-ID: <200711271748.lARHm6n7009934@zion.cs.uiuc.edu> Author: lattner Date: Tue Nov 27 11:48:06 2007 New Revision: 44364 URL: http://llvm.org/viewvc/llvm-project?rev=44364&view=rev Log: Unbreak backwards compatibility with bytecode format. Regression introduced by this patch: http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20071126/055824.html Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp?rev=44364&r1=44363&r2=44364&view=diff ============================================================================== --- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp (original) +++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp Tue Nov 27 11:48:06 2007 @@ -329,14 +329,15 @@ ResultTy = PointerType::get(getTypeByID(Record[0], true)); break; case bitc::TYPE_CODE_FUNCTION: { - // FUNCTION: [vararg, retty, paramty x N] - if (Record.size() < 2) + // FIXME: attrid is dead, remove it in LLVM 3.0 + // FUNCTION: [vararg, attrid, retty, paramty x N] + if (Record.size() < 3) return Error("Invalid FUNCTION type record"); std::vector ArgTys; - for (unsigned i = 2, e = Record.size(); i != e; ++i) + for (unsigned i = 3, e = Record.size(); i != e; ++i) ArgTys.push_back(getTypeByID(Record[i], true)); - ResultTy = FunctionType::get(getTypeByID(Record[1], true), ArgTys, + ResultTy = FunctionType::get(getTypeByID(Record[2], true), ArgTys, Record[0]); break; } Modified: llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=44364&r1=44363&r2=44364&view=diff ============================================================================== --- llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp (original) +++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Tue Nov 27 11:48:06 2007 @@ -147,6 +147,7 @@ Abbv = new BitCodeAbbrev(); Abbv->Add(BitCodeAbbrevOp(bitc::TYPE_CODE_FUNCTION)); Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 1)); // isvararg + Abbv->Add(BitCodeAbbrevOp(0)); // FIXME: DEAD value, remove in LLVM 3.0 Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Array)); Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, Log2_32_Ceil(VE.getTypes().size()+1))); @@ -204,9 +205,10 @@ case Type::FunctionTyID: { const FunctionType *FT = cast(T); - // FUNCTION: [isvararg, retty, paramty x N] + // FUNCTION: [isvararg, attrid, retty, paramty x N] Code = bitc::TYPE_CODE_FUNCTION; TypeVals.push_back(FT->isVarArg()); + TypeVals.push_back(0); // FIXME: DEAD: remove in llvm 3.0 TypeVals.push_back(VE.getTypeID(FT->getReturnType())); for (unsigned i = 0, e = FT->getNumParams(); i != e; ++i) TypeVals.push_back(VE.getTypeID(FT->getParamType(i))); From kremenek at apple.com Tue Nov 27 11:53:55 2007 From: kremenek at apple.com (Ted Kremenek) Date: Tue, 27 Nov 2007 17:53:55 -0000 Subject: [llvm-commits] [llvm] r44365 - /llvm/trunk/tools/llvm-config/Makefile Message-ID: <200711271753.lARHrtIn010224@zion.cs.uiuc.edu> Author: kremenek Date: Tue Nov 27 11:53:54 2007 New Revision: 44365 URL: http://llvm.org/viewvc/llvm-project?rev=44365&view=rev Log: Added quotes around $(NM_PATH) argument to GenLibDeps.pl script so that the "-p" option is actually seen by nm (it was being dropped as it was considered as separate argument to the Perl script). Modified: llvm/trunk/tools/llvm-config/Makefile Modified: llvm/trunk/tools/llvm-config/Makefile URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-config/Makefile?rev=44365&r1=44364&r2=44365&view=diff ============================================================================== --- llvm/trunk/tools/llvm-config/Makefile (original) +++ llvm/trunk/tools/llvm-config/Makefile Tue Nov 27 11:53:54 2007 @@ -36,7 +36,7 @@ $(LibDepsTemp): $(GenLibDeps) $(LibDir) $(wildcard $(LibDir)/*.a $(LibDir)/*.o) $(Echo) "Regenerating LibDeps.txt.tmp" - $(Verb) $(PERL) $(GenLibDeps) -flat $(LibDir) $(NM_PATH) > $(LibDepsTemp) + $(Verb) $(PERL) $(GenLibDeps) -flat $(LibDir) "$(NM_PATH)" > $(LibDepsTemp) $(LibDeps): $(LibDepsTemp) $(Verb) $(CMP) -s $@ $< || ( $(CP) $< $@ && \ From asl at math.spbu.ru Tue Nov 27 12:21:29 2007 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Tue, 27 Nov 2007 18:21:29 -0000 Subject: [llvm-commits] [llvm] r44368 - /llvm/trunk/test/CFrontend/2007-11-27-SExtZExt.c Message-ID: <200711271821.lARILTf7011818@zion.cs.uiuc.edu> Author: asl Date: Tue Nov 27 12:21:29 2007 New Revision: 44368 URL: http://llvm.org/viewvc/llvm-project?rev=44368&view=rev Log: Add testcase for last llvm-gcc tweaks Added: llvm/trunk/test/CFrontend/2007-11-27-SExtZExt.c Added: llvm/trunk/test/CFrontend/2007-11-27-SExtZExt.c URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CFrontend/2007-11-27-SExtZExt.c?rev=44368&view=auto ============================================================================== --- llvm/trunk/test/CFrontend/2007-11-27-SExtZExt.c (added) +++ llvm/trunk/test/CFrontend/2007-11-27-SExtZExt.c Tue Nov 27 12:21:29 2007 @@ -0,0 +1,12 @@ +// RUN: %llvmgcc -S %s -emit-llvm -o - | grep "signext" | count 4 + +signed char foo1() { return 1; } + +void foo2(signed short a) { } + +signed char foo3(void) { return 1; } + +void foo4(a) signed short a; { } + + + From alenhar2 at cs.uiuc.edu Tue Nov 27 12:31:33 2007 From: alenhar2 at cs.uiuc.edu (Andrew Lenharth) Date: Tue, 27 Nov 2007 18:31:33 -0000 Subject: [llvm-commits] [llvm] r44370 - in /llvm/trunk: lib/Target/Alpha/AlphaInstrInfo.td test/CodeGen/Alpha/2007-11-27-mulneg3.ll Message-ID: <200711271831.lARIVXcp012624@zion.cs.uiuc.edu> Author: alenhar2 Date: Tue Nov 27 12:31:30 2007 New Revision: 44370 URL: http://llvm.org/viewvc/llvm-project?rev=44370&view=rev Log: something wrong with this opt Added: llvm/trunk/test/CodeGen/Alpha/2007-11-27-mulneg3.ll Modified: llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.td Modified: llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.td?rev=44370&r1=44369&r2=44370&view=diff ============================================================================== --- llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.td (original) +++ llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.td Tue Nov 27 12:31:30 2007 @@ -1086,16 +1086,18 @@ (ADDQr (SLr GPRC:$RA, (nearP2X immRemP2:$imm)), (SLi GPRC:$RA, (nearP2RemX immRemP2:$imm)))>; //n is below a power of 2 -def : Pat<(mul GPRC:$RA, immRem1n:$imm), - (SUBQr (SLr GPRC:$RA, (nearP2X immRem1n:$imm)), GPRC:$RA)>; -def : Pat<(mul GPRC:$RA, immRem2n:$imm), - (SUBQr (SLr GPRC:$RA, (nearP2X immRem2n:$imm)), (ADDQr GPRC:$RA, GPRC:$RA))>; -def : Pat<(mul GPRC:$RA, immRem3n:$imm), - (SUBQr (SLr GPRC:$RA, (nearP2X immRem3n:$imm)), (S4SUBQr GPRC:$RA, GPRC:$RA))>; -def : Pat<(mul GPRC:$RA, immRem4n:$imm), - (SUBQr (SLr GPRC:$RA, (nearP2X immRem4n:$imm)), (SLi GPRC:$RA, 2))>; -def : Pat<(mul GPRC:$RA, immRem5n:$imm), - (SUBQr (SLr GPRC:$RA, (nearP2X immRem5n:$imm)), (S4ADDQr GPRC:$RA, GPRC:$RA))>; -def : Pat<(mul GPRC:$RA, immRemP2n:$imm), - (SUBQr (SLr GPRC:$RA, (nearP2X immRemP2n:$imm)), (SLi GPRC:$RA, (nearP2RemX immRemP2n:$imm)))>; +//FIXME: figure out why something is truncating the imm to 32bits +// this will fix 2007-11-27-mulneg3 +//def : Pat<(mul GPRC:$RA, immRem1n:$imm), +// (SUBQr (SLr GPRC:$RA, (nearP2X immRem1n:$imm)), GPRC:$RA)>; +//def : Pat<(mul GPRC:$RA, immRem2n:$imm), +// (SUBQr (SLr GPRC:$RA, (nearP2X immRem2n:$imm)), (ADDQr GPRC:$RA, GPRC:$RA))>; +//def : Pat<(mul GPRC:$RA, immRem3n:$imm), +// (SUBQr (SLr GPRC:$RA, (nearP2X immRem3n:$imm)), (S4SUBQr GPRC:$RA, GPRC:$RA))>; +//def : Pat<(mul GPRC:$RA, immRem4n:$imm), +// (SUBQr (SLr GPRC:$RA, (nearP2X immRem4n:$imm)), (SLi GPRC:$RA, 2))>; +//def : Pat<(mul GPRC:$RA, immRem5n:$imm), +// (SUBQr (SLr GPRC:$RA, (nearP2X immRem5n:$imm)), (S4ADDQr GPRC:$RA, GPRC:$RA))>; +//def : Pat<(mul GPRC:$RA, immRemP2n:$imm), +// (SUBQr (SLr GPRC:$RA, (nearP2X immRemP2n:$imm)), (SLi GPRC:$RA, (nearP2RemX immRemP2n:$imm)))>; } //Added complexity Added: llvm/trunk/test/CodeGen/Alpha/2007-11-27-mulneg3.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Alpha/2007-11-27-mulneg3.ll?rev=44370&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Alpha/2007-11-27-mulneg3.ll (added) +++ llvm/trunk/test/CodeGen/Alpha/2007-11-27-mulneg3.ll Tue Nov 27 12:31:30 2007 @@ -0,0 +1,13 @@ +; RUN: llvm-as < %s | llc -march=alpha + +;FIXME: this should produce no mul inst. But not crashing will have to do for now + +; ModuleID = 'Output/bugpoint-train/bugpoint-reduced-simplified.bc' +target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-f128:128:128" +target triple = "alphaev6-unknown-linux-gnu" + +define fastcc i32 @getcount(i32 %s) { +cond_next43: ; preds = %bb27 + %tmp431 = mul i32 %s, -3 + ret i32 %tmp431 +} From natebegeman at mac.com Tue Nov 27 13:28:50 2007 From: natebegeman at mac.com (Nate Begeman) Date: Tue, 27 Nov 2007 19:28:50 -0000 Subject: [llvm-commits] [llvm] r44371 - in /llvm/trunk/lib: CodeGen/SelectionDAG/TargetLowering.cpp Target/X86/X86CallingConv.td Message-ID: <200711271928.lARJSorl016837@zion.cs.uiuc.edu> Author: sampo Date: Tue Nov 27 13:28:48 2007 New Revision: 44371 URL: http://llvm.org/viewvc/llvm-project?rev=44371&view=rev Log: Support returning non-power-of-2 vectors to unblock some work Modified: llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp llvm/trunk/lib/Target/X86/X86CallingConv.td Modified: llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp?rev=44371&r1=44370&r2=44371&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp Tue Nov 27 13:28:48 2007 @@ -364,6 +364,13 @@ unsigned NumVectorRegs = 1; + // FIXME: We don't support non-power-of-2-sized vectors for now. Ideally we + // could break down into LHS/RHS like LegalizeDAG does. + if (!isPowerOf2_32(NumElts)) { + NumVectorRegs = NumElts; + NumElts = 1; + } + // Divide the input until we get to a supported size. This will always // end with a scalar if the target doesn't support vectors. while (NumElts > 1 && Modified: llvm/trunk/lib/Target/X86/X86CallingConv.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86CallingConv.td?rev=44371&r1=44370&r2=44371&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86CallingConv.td (original) +++ llvm/trunk/lib/Target/X86/X86CallingConv.td Tue Nov 27 13:28:48 2007 @@ -52,10 +52,12 @@ // X86-32 FastCC return-value convention. def RetCC_X86_32_Fast : CallingConv<[ - // The X86-32 fastcc returns FP values in XMM0 if the target has SSE2, - // otherwise it is the the C calling conventions. - CCIfType<[f32], CCIfSubtarget<"hasSSE2()", CCAssignToReg<[XMM0]>>>, - CCIfType<[f64], CCIfSubtarget<"hasSSE2()", CCAssignToReg<[XMM0]>>>, + // The X86-32 fastcc returns 1, 2, or 3 FP values in XMM0-2 if the target has + // SSE2, otherwise it is the the C calling conventions. + // This can happen when a float, 2 x float, or 3 x float vector is split by + // target lowering, and is returned in 1-3 sse regs. + CCIfType<[f32], CCIfSubtarget<"hasSSE2()", CCAssignToReg<[XMM0,XMM1,XMM2]>>>, + CCIfType<[f64], CCIfSubtarget<"hasSSE2()", CCAssignToReg<[XMM0,XMM1,XMM2]>>>, CCDelegateTo ]>; From kremenek at apple.com Tue Nov 27 13:31:11 2007 From: kremenek at apple.com (Ted Kremenek) Date: Tue, 27 Nov 2007 19:31:11 -0000 Subject: [llvm-commits] [llvm] r44372 - /llvm/trunk/utils/GenLibDeps.pl Message-ID: <200711271931.lARJVBTL017074@zion.cs.uiuc.edu> Author: kremenek Date: Tue Nov 27 13:31:11 2007 New Revision: 44372 URL: http://llvm.org/viewvc/llvm-project?rev=44372&view=rev Log: Updated GenLibDeps.pl to employ "use strict" to help prevent uses of variables that have not yet been defined. Removed used of grep and sed when parsing the results of "nm". This was originally motivated because if the user has specified options to grep using the environment variable GREP_OPTIONS this could break the script. Piping through grep/sed/sort/uniq is also (to my understanding) not necessary, and the equivalent operations can be done much faster in the Perl script. Using a crude benchmark, these changes resulted in a 3x speedup in the execution of GenLibDeps.pl. Modified: llvm/trunk/utils/GenLibDeps.pl Modified: llvm/trunk/utils/GenLibDeps.pl URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/GenLibDeps.pl?rev=44372&r1=44371&r2=44372&view=diff ============================================================================== --- llvm/trunk/utils/GenLibDeps.pl (original) +++ llvm/trunk/utils/GenLibDeps.pl Tue Nov 27 13:31:11 2007 @@ -8,6 +8,7 @@ # # Syntax: GenLibDeps.pl [-flat] [path_to_nm_binary] # +use strict; # Parse arguments... my $FLAT = 0; @@ -47,8 +48,8 @@ opendir DIR,$Directory; my @files = readdir DIR; closedir DIR; - at libs = grep(/libLLVM.*\.a$/,sort(@files)); - at objs = grep(/LLVM.*\.o$/,sort(@files)); +my @libs = grep(/libLLVM.*\.a$/,sort(@files)); +my @objs = grep(/LLVM.*\.o$/,sort(@files)); # Declare the hashes we will use to keep track of the library and object file # symbol definitions. @@ -56,10 +57,11 @@ my %objdefs; # Gather definitions from the libraries -foreach $lib (@libs ) { - open DEFS, - "$nmPath -g $Directory/$lib | grep ' [ABCDGRST] ' | sed -e 's/^[0-9A-Fa-f]* [ABCDGRST] //' | sort | uniq |"; +foreach my $lib (@libs ) { + open DEFS, "$nmPath -g $Directory/$lib|"; while () { + next if (! / [ABCDGRST] /); + s/^[^ ]* [ABCDGRST] //; chomp($_); $libdefs{$_} = $lib; } @@ -67,10 +69,11 @@ } # Gather definitions from the object files. -foreach $obj (@objs ) { - open DEFS, - "$nmPath -g $Directory/$obj | grep ' [ABCDGRST] ' | sed -e 's/^[0-9A-Fa-f]* [ABCDGRST] //' | sort | uniq |"; +foreach my $obj (@objs ) { + open DEFS, "$nmPath -g $Directory/$obj |"; while () { + next if (! / [ABCDGRST] /); + s/^[^ ]* [ABCDGRST] //; chomp($_); $objdefs{$_} = $obj; } @@ -100,7 +103,7 @@ $DepLibs{$libdefs{$_}} = [] unless exists $DepLibs{$libdefs{$_}}; push(@{$DepLibs{$libdefs{$_}}}, $_); } elsif (defined($objdefs{$_}) && $objdefs{$_} ne $lib) { - $libroot = $lib; + my $libroot = $lib; $libroot =~ s/lib(.*).a/$1/; if ($objdefs{$_} ne "$libroot.o") { $DepLibs{$objdefs{$_}} = [] unless exists $DepLibs{$objdefs{$_}}; @@ -115,14 +118,14 @@ if ($WHY) { print "\n"; my @syms = @{$DepLibs{$key}}; - foreach $sym (@syms) { + foreach my $sym (@syms) { print " $sym\n"; } } } else { print "
  • $key
    • \n"; } - $suffix = substr($key,length($key)-1,1); + my $suffix = substr($key,length($key)-1,1); $key =~ s/(.*)\.[oa]/$1/; if ($suffix eq "a") { if (!$FLAT) { print DOT "$lib_ns -> $key [ weight=0 ];\n" }; @@ -169,7 +172,7 @@ } # Print libraries first -foreach $lib (@libs) { +foreach my $lib (@libs) { gen_one_entry($lib); } @@ -196,7 +199,7 @@ } # Print objects second -foreach $obj (@objs) { +foreach my $obj (@objs) { gen_one_entry($obj); } From sabre at nondot.org Tue Nov 27 14:41:32 2007 From: sabre at nondot.org (Chris Lattner) Date: Tue, 27 Nov 2007 20:41:32 -0000 Subject: [llvm-commits] [llvm] r44373 - /llvm/trunk/lib/ExecutionEngine/JIT/Intercept.cpp Message-ID: <200711272041.lARKfXhX021054@zion.cs.uiuc.edu> Author: lattner Date: Tue Nov 27 14:41:32 2007 New Revision: 44373 URL: http://llvm.org/viewvc/llvm-project?rev=44373&view=rev Log: Unbreak all of the darwin/ppc32 JIT failures having to do with not being able to find printf. Modified: llvm/trunk/lib/ExecutionEngine/JIT/Intercept.cpp Modified: llvm/trunk/lib/ExecutionEngine/JIT/Intercept.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/Intercept.cpp?rev=44373&r1=44372&r2=44373&view=diff ============================================================================== --- llvm/trunk/lib/ExecutionEngine/JIT/Intercept.cpp (original) +++ llvm/trunk/lib/ExecutionEngine/JIT/Intercept.cpp Tue Nov 27 14:41:32 2007 @@ -102,6 +102,16 @@ if (Ptr) return Ptr; } + // darwin/ppc adds $LDBLStub suffixes to various symbols like printf. These + // are references to hidden visibility symbols that dlsym cannot resolve. If + // we have one of these, strip off $LDBLStub and try again. +#if defined(__APPLE__) && defined(__ppc__) + if (Name.size() > 9 && Name[Name.size()-9] == '$' && + memcmp(&Name[Name.size()-8], "LDBLStub", 8) == 0) + return getPointerToNamedFunction(std::string(Name.begin(), + Name.end()-9)); +#endif + /// If a LazyFunctionCreator is installed, use it to get/create the function. if (LazyFunctionCreator) if (void *RP = LazyFunctionCreator(Name)) From sabre at nondot.org Tue Nov 27 14:45:25 2007 From: sabre at nondot.org (Chris Lattner) Date: Tue, 27 Nov 2007 20:45:25 -0000 Subject: [llvm-commits] [llvm] r44374 - /llvm/trunk/lib/ExecutionEngine/JIT/Intercept.cpp Message-ID: <200711272045.lARKjQVi021294@zion.cs.uiuc.edu> Author: lattner Date: Tue Nov 27 14:45:25 2007 New Revision: 44374 URL: http://llvm.org/viewvc/llvm-project?rev=44374&view=rev Log: Make this actually work on systems that support ppc long double. Modified: llvm/trunk/lib/ExecutionEngine/JIT/Intercept.cpp Modified: llvm/trunk/lib/ExecutionEngine/JIT/Intercept.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/Intercept.cpp?rev=44374&r1=44373&r2=44374&view=diff ============================================================================== --- llvm/trunk/lib/ExecutionEngine/JIT/Intercept.cpp (original) +++ llvm/trunk/lib/ExecutionEngine/JIT/Intercept.cpp Tue Nov 27 14:45:25 2007 @@ -107,9 +107,14 @@ // we have one of these, strip off $LDBLStub and try again. #if defined(__APPLE__) && defined(__ppc__) if (Name.size() > 9 && Name[Name.size()-9] == '$' && - memcmp(&Name[Name.size()-8], "LDBLStub", 8) == 0) - return getPointerToNamedFunction(std::string(Name.begin(), - Name.end()-9)); + memcmp(&Name[Name.size()-8], "LDBLStub", 8) == 0) { + // First try turning $LDBLStub into $LDBL128. If that fails, strip it off. + // This mirrors logic in libSystemStubs.a. + std::string Prefix = std::string(Name.begin(), Name.end()-9); + if (void *Ptr = getPointerToNamedFunction(Prefix+"$LDBL128")) + return Ptr; + return getPointerToNamedFunction(Prefix); + } #endif /// If a LazyFunctionCreator is installed, use it to get/create the function. From sabre at nondot.org Tue Nov 27 15:11:30 2007 From: sabre at nondot.org (Chris Lattner) Date: Tue, 27 Nov 2007 15:11:30 -0600 Subject: [llvm-commits] CVS: llvm-www/OpenProjects.html Message-ID: <200711272111.lARLBUJN022859@zion.cs.uiuc.edu> Changes in directory llvm-www: OpenProjects.html updated: 1.30 -> 1.31 --- Log message: Two new codegen improvements. --- Diffs of the changes: (+10 -3) OpenProjects.html | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) Index: llvm-www/OpenProjects.html diff -u llvm-www/OpenProjects.html:1.30 llvm-www/OpenProjects.html:1.31 --- llvm-www/OpenProjects.html:1.30 Fri Nov 16 11:16:15 2007 +++ llvm-www/OpenProjects.html Tue Nov 27 15:10:27 2007 @@ -339,10 +339,17 @@
      -
    1. Improve the instruction selectors.
      2. +
    2. Rename ISD::BIT_CONVERT to ISD::BITCAST to match the llvm ir concept
      3. +
    3. Change the VECTOR_SHUFFLE to be variadic. Right now, a VECTOR_SHUFFLE + takes three operands: two vectors and a shuffle mask. The shuffle mask is + required to be a BUILD_VECTOR node of N indices. It would be much better + (for several reasons) to eliminate the BUILD_VECTOR and make VECTOR_SHUFFLE + take 2+N operands instead.
    4. Implement a way to describe calling conventions abstractly, instead of us having to write C++ code in the lowering phase. Many approaches are - available, a good one is Staged Allocation: A Compositional Technique for Specifying and Implementing Procedure Calling Conventions.
      5. + available, a good one is Staged Allocation: A Compositional Technique for Specifying and Implementing Procedure Calling Conventions. This is already + well underway and used by some targets (see + lib/Target/X86/X86CallingConv.td) but isn't adopted for all targets.
    5. Implement interprocedural register allocation. The CallGraphSCCPass can be used to implement a bottom-up analysis that will determine the *actual* registers clobbered by a function. Use the pass to fine tune register usage @@ -400,7 +407,7 @@ src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"> LLVM Compiler Infrastructure
      - Last modified: $Date: 2007/11/16 17:16:15 $ + Last modified: $Date: 2007/11/27 21:10:27 $ From isanbard at gmail.com Tue Nov 27 15:57:01 2007 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 27 Nov 2007 13:57:01 -0800 Subject: [llvm-commits] [llvm] r44370 - in /llvm/trunk: lib/Target/Alpha/AlphaInstrInfo.td test/CodeGen/Alpha/2007-11-27-mulneg3.ll In-Reply-To: <200711271831.lARIVXcp012624@zion.cs.uiuc.edu> References: <200711271831.lARIVXcp012624@zion.cs.uiuc.edu> Message-ID: <16e5fdf90711271357y565fd898xace737dffcc3c27@mail.gmail.com> Hi Andrew, I'm getting this failure now: FAIL: /Volumes/Gir/devel/llvm/llvm.src/test/CodeGen/Alpha/mul5.ll Failed with exit(1) at line 1 while running: llvm-upgrade < /Volumes/Gir/devel/llvm/llvm.src/test/CodeGen/Alpha/mul5.ll | llvm-as | llc -march=alpha | not grep -i mul mulq $16,$0,$0 mulq $16,252,$0 mulq $16,$0,$0 child process exited abnormally Do you think that it's related to your patch? -bw On Nov 27, 2007 10:31 AM, Andrew Lenharth wrote: > Author: alenhar2 > Date: Tue Nov 27 12:31:30 2007 > New Revision: 44370 > > URL: http://llvm.org/viewvc/llvm-project?rev=44370&view=rev > Log: > something wrong with this opt > > Added: > llvm/trunk/test/CodeGen/Alpha/2007-11-27-mulneg3.ll > Modified: > llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.td > > Modified: llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.td > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.td?rev=44370&r1=44369&r2=44370&view=diff > > ============================================================================== > --- llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.td (original) > +++ llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.td Tue Nov 27 12:31:30 2007 > @@ -1086,16 +1086,18 @@ > (ADDQr (SLr GPRC:$RA, (nearP2X immRemP2:$imm)), (SLi GPRC:$RA, (nearP2RemX immRemP2:$imm)))>; > > //n is below a power of 2 > -def : Pat<(mul GPRC:$RA, immRem1n:$imm), > - (SUBQr (SLr GPRC:$RA, (nearP2X immRem1n:$imm)), GPRC:$RA)>; > -def : Pat<(mul GPRC:$RA, immRem2n:$imm), > - (SUBQr (SLr GPRC:$RA, (nearP2X immRem2n:$imm)), (ADDQr GPRC:$RA, GPRC:$RA))>; > -def : Pat<(mul GPRC:$RA, immRem3n:$imm), > - (SUBQr (SLr GPRC:$RA, (nearP2X immRem3n:$imm)), (S4SUBQr GPRC:$RA, GPRC:$RA))>; > -def : Pat<(mul GPRC:$RA, immRem4n:$imm), > - (SUBQr (SLr GPRC:$RA, (nearP2X immRem4n:$imm)), (SLi GPRC:$RA, 2))>; > -def : Pat<(mul GPRC:$RA, immRem5n:$imm), > - (SUBQr (SLr GPRC:$RA, (nearP2X immRem5n:$imm)), (S4ADDQr GPRC:$RA, GPRC:$RA))>; > -def : Pat<(mul GPRC:$RA, immRemP2n:$imm), > - (SUBQr (SLr GPRC:$RA, (nearP2X immRemP2n:$imm)), (SLi GPRC:$RA, (nearP2RemX immRemP2n:$imm)))>; > +//FIXME: figure out why something is truncating the imm to 32bits > +// this will fix 2007-11-27-mulneg3 > +//def : Pat<(mul GPRC:$RA, immRem1n:$imm), > +// (SUBQr (SLr GPRC:$RA, (nearP2X immRem1n:$imm)), GPRC:$RA)>; > +//def : Pat<(mul GPRC:$RA, immRem2n:$imm), > +// (SUBQr (SLr GPRC:$RA, (nearP2X immRem2n:$imm)), (ADDQr GPRC:$RA, GPRC:$RA))>; > +//def : Pat<(mul GPRC:$RA, immRem3n:$imm), > +// (SUBQr (SLr GPRC:$RA, (nearP2X immRem3n:$imm)), (S4SUBQr GPRC:$RA, GPRC:$RA))>; > +//def : Pat<(mul GPRC:$RA, immRem4n:$imm), > +// (SUBQr (SLr GPRC:$RA, (nearP2X immRem4n:$imm)), (SLi GPRC:$RA, 2))>; > +//def : Pat<(mul GPRC:$RA, immRem5n:$imm), > +// (SUBQr (SLr GPRC:$RA, (nearP2X immRem5n:$imm)), (S4ADDQr GPRC:$RA, GPRC:$RA))>; > +//def : Pat<(mul GPRC:$RA, immRemP2n:$imm), > +// (SUBQr (SLr GPRC:$RA, (nearP2X immRemP2n:$imm)), (SLi GPRC:$RA, (nearP2RemX immRemP2n:$imm)))>; > } //Added complexity > > Added: llvm/trunk/test/CodeGen/Alpha/2007-11-27-mulneg3.ll > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Alpha/2007-11-27-mulneg3.ll?rev=44370&view=auto > > ============================================================================== > --- llvm/trunk/test/CodeGen/Alpha/2007-11-27-mulneg3.ll (added) > +++ llvm/trunk/test/CodeGen/Alpha/2007-11-27-mulneg3.ll Tue Nov 27 12:31:30 2007 > @@ -0,0 +1,13 @@ > +; RUN: llvm-as < %s | llc -march=alpha > + > +;FIXME: this should produce no mul inst. But not crashing will have to do for now > + > +; ModuleID = 'Output/bugpoint-train/bugpoint-reduced-simplified.bc' > +target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-f128:128:128" > +target triple = "alphaev6-unknown-linux-gnu" > + > +define fastcc i32 @getcount(i32 %s) { > +cond_next43: ; preds = %bb27 > + %tmp431 = mul i32 %s, -3 > + ret i32 %tmp431 > +} > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits > From sabre at nondot.org Tue Nov 27 16:14:43 2007 From: sabre at nondot.org (Chris Lattner) Date: Tue, 27 Nov 2007 22:14:43 -0000 Subject: [llvm-commits] [llvm] r44378 - in /llvm/trunk: lib/Target/PowerPC/PPCRegisterInfo.cpp test/CodeGen/Generic/invalid-memcpy.ll test/CodeGen/PowerPC/invalid-memcpy.ll Message-ID: <200711272214.lARMEhFx025942@zion.cs.uiuc.edu> Author: lattner Date: Tue Nov 27 16:14:42 2007 New Revision: 44378 URL: http://llvm.org/viewvc/llvm-project?rev=44378&view=rev Log: Fix a crash on invalid code due to memcpy lowering. Added: llvm/trunk/test/CodeGen/Generic/invalid-memcpy.ll llvm/trunk/test/CodeGen/PowerPC/invalid-memcpy.ll Modified: llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.cpp Modified: llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.cpp?rev=44378&r1=44377&r2=44378&view=diff ============================================================================== --- llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.cpp (original) +++ llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.cpp Tue Nov 27 16:14:42 2007 @@ -779,35 +779,40 @@ // to Offset to get the correct offset. Offset += MFI->getStackSize(); - if (isInt16(Offset)) { - if (isIXAddr) { - assert((Offset & 3) == 0 && "Invalid frame offset!"); + // If we can, encode the offset directly into the instruction. If this is a + // normal PPC "ri" instruction, any 16-bit value can be safely encoded. If + // this is a PPC64 "ix" instruction, only a 16-bit value with the low two bits + // clear can be encoded. This is extremely uncommon, because normally you + // only "std" to a stack slot that is at least 4-byte aligned, but it can + // happen in invalid code. + if (isInt16(Offset) && (!isIXAddr || (isIXAddr & 3) == 0)) { + if (isIXAddr) Offset >>= 2; // The actual encoded value has the low two bits zero. - } MI.getOperand(OffsetOperandNo).ChangeToImmediate(Offset); + return; + } + + // Insert a set of r0 with the full offset value before the ld, st, or add + BuildMI(MBB, II, TII.get(PPC::LIS), PPC::R0).addImm(Offset >> 16); + BuildMI(MBB, II, TII.get(PPC::ORI), PPC::R0).addReg(PPC::R0).addImm(Offset); + + // Convert into indexed form of the instruction + // sth 0:rA, 1:imm 2:(rB) ==> sthx 0:rA, 2:rB, 1:r0 + // addi 0:rA 1:rB, 2, imm ==> add 0:rA, 1:rB, 2:r0 + unsigned OperandBase; + if (OpC != TargetInstrInfo::INLINEASM) { + assert(ImmToIdxMap.count(OpC) && + "No indexed form of load or store available!"); + unsigned NewOpcode = ImmToIdxMap.find(OpC)->second; + MI.setInstrDescriptor(TII.get(NewOpcode)); + OperandBase = 1; } else { - // Insert a set of r0 with the full offset value before the ld, st, or add - BuildMI(MBB, II, TII.get(PPC::LIS), PPC::R0).addImm(Offset >> 16); - BuildMI(MBB, II, TII.get(PPC::ORI), PPC::R0).addReg(PPC::R0).addImm(Offset); - - // Convert into indexed form of the instruction - // sth 0:rA, 1:imm 2:(rB) ==> sthx 0:rA, 2:rB, 1:r0 - // addi 0:rA 1:rB, 2, imm ==> add 0:rA, 1:rB, 2:r0 - unsigned OperandBase; - if (OpC != TargetInstrInfo::INLINEASM) { - assert(ImmToIdxMap.count(OpC) && - "No indexed form of load or store available!"); - unsigned NewOpcode = ImmToIdxMap.find(OpC)->second; - MI.setInstrDescriptor(TII.get(NewOpcode)); - OperandBase = 1; - } else { - OperandBase = OffsetOperandNo; - } - - unsigned StackReg = MI.getOperand(FIOperandNo).getReg(); - MI.getOperand(OperandBase).ChangeToRegister(StackReg, false); - MI.getOperand(OperandBase+1).ChangeToRegister(PPC::R0, false); + OperandBase = OffsetOperandNo; } + + unsigned StackReg = MI.getOperand(FIOperandNo).getReg(); + MI.getOperand(OperandBase).ChangeToRegister(StackReg, false); + MI.getOperand(OperandBase+1).ChangeToRegister(PPC::R0, false); } /// VRRegNo - Map from a numbered VR register to its enum value. Added: llvm/trunk/test/CodeGen/Generic/invalid-memcpy.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Generic/invalid-memcpy.ll?rev=44378&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Generic/invalid-memcpy.ll (added) +++ llvm/trunk/test/CodeGen/Generic/invalid-memcpy.ll Tue Nov 27 16:14:42 2007 @@ -0,0 +1,19 @@ +; RUN: llvm-as < %s | llc + +; This testcase is invalid (the alignment specified for memcpy is +; greater than the alignment guaranteed for Qux or C.0.1173), but it +; should compile, not crash the code generator. + + at C.0.1173 = external constant [33 x i8] ; <[33 x i8]*> [#uses=1] + +define void @Bork() { +entry: + %Qux = alloca [33 x i8] ; <[33 x i8]*> [#uses=1] + %Qux1 = bitcast [33 x i8]* %Qux to i8* ; [#uses=1] + call void @llvm.memcpy.i64( i8* %Qux1, i8* getelementptr ([33 x i8]* @C.0.1173, i32 0, i32 0), i64 33, i32 8 ) + ret void +} + +declare void @llvm.memcpy.i64(i8*, i8*, i64, i32) + + Added: llvm/trunk/test/CodeGen/PowerPC/invalid-memcpy.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/invalid-memcpy.ll?rev=44378&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/PowerPC/invalid-memcpy.ll (added) +++ llvm/trunk/test/CodeGen/PowerPC/invalid-memcpy.ll Tue Nov 27 16:14:42 2007 @@ -0,0 +1,20 @@ +; RUN: llvm-as < %s | llc -march=ppc32 +; RUN: llvm-as < %s | llc -march=ppc64 + +; This testcase is invalid (the alignment specified for memcpy is +; greater than the alignment guaranteed for Qux or C.0.1173, but it +; should compile, not crash the code generator. + + at C.0.1173 = external constant [33 x i8] ; <[33 x i8]*> [#uses=1] + +define void @Bork() { +entry: + %Qux = alloca [33 x i8] ; <[33 x i8]*> [#uses=1] + %Qux1 = bitcast [33 x i8]* %Qux to i8* ; [#uses=1] + call void @llvm.memcpy.i64( i8* %Qux1, i8* getelementptr ([33 x i8]* @C.0.1173, i32 0, i32 0), i64 33, i32 8 ) + ret void +} + +declare void @llvm.memcpy.i64(i8*, i8*, i64, i32) + + From isanbard at gmail.com Tue Nov 27 16:32:59 2007 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 27 Nov 2007 22:32:59 -0000 Subject: [llvm-commits] [llvm] r44379 - /llvm/tags/Apple/llvmCore-2002/ Message-ID: <200711272232.lARMWx0D026868@zion.cs.uiuc.edu> Author: void Date: Tue Nov 27 16:32:59 2007 New Revision: 44379 URL: http://llvm.org/viewvc/llvm-project?rev=44379&view=rev Log: Creating llvmCore-2002 branch Added: llvm/tags/Apple/llvmCore-2002/ - copied from r44378, llvm/trunk/ From sabre at nondot.org Tue Nov 27 16:36:17 2007 From: sabre at nondot.org (Chris Lattner) Date: Tue, 27 Nov 2007 22:36:17 -0000 Subject: [llvm-commits] [llvm] r44380 - in /llvm/trunk/lib/Target/ARM: ARMISelLowering.cpp ARMISelLowering.h README.txt Message-ID: <200711272236.lARMaI4B027261@zion.cs.uiuc.edu> Author: lattner Date: Tue Nov 27 16:36:16 2007 New Revision: 44380 URL: http://llvm.org/viewvc/llvm-project?rev=44380&view=rev Log: implement a trivial readme entry. Modified: llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp llvm/trunk/lib/Target/ARM/ARMISelLowering.h llvm/trunk/lib/Target/ARM/README.txt Modified: llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp?rev=44380&r1=44379&r2=44380&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp (original) +++ llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp Tue Nov 27 16:36:16 2007 @@ -262,6 +262,9 @@ setOperationAction(ISD::FP_TO_UINT, MVT::i32, Custom); setOperationAction(ISD::FP_TO_SINT, MVT::i32, Custom); + // We have target-specific dag combine patterns for the following nodes: + // ARMISD::FMRRD - No need to call setTargetDAGCombine + setStackPointerRegisterToSaveRestore(ARM::SP); setSchedulingPreference(SchedulingForRegPressure); setIfCvtBlockSizeLimit(Subtarget->isThumb() ? 0 : 10); @@ -1510,6 +1513,27 @@ // ARM Optimization Hooks //===----------------------------------------------------------------------===// +/// PerformFMRRDCombine - Target-specific dag combine xforms for ARMISD::FMRRD. +static SDOperand PerformFMRRDCombine(SDNode *N, + TargetLowering::DAGCombinerInfo &DCI) { + // fmrrd(fmdrr x, y) -> x,y + SDOperand InDouble = N->getOperand(0); + if (InDouble.getOpcode() == ARMISD::FMDRR) + return DCI.CombineTo(N, InDouble.getOperand(0), InDouble.getOperand(1)); + return SDOperand(); +} + +SDOperand ARMTargetLowering::PerformDAGCombine(SDNode *N, + DAGCombinerInfo &DCI) const { + switch (N->getOpcode()) { + default: break; + case ARMISD::FMRRD: return PerformFMRRDCombine(N, DCI); + } + + return SDOperand(); +} + + /// isLegalAddressImmediate - Return true if the integer value can be used /// as the offset of the target addressing mode for load / store of the /// given type. Modified: llvm/trunk/lib/Target/ARM/ARMISelLowering.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMISelLowering.h?rev=44380&r1=44379&r2=44380&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/ARMISelLowering.h (original) +++ llvm/trunk/lib/Target/ARM/ARMISelLowering.h Tue Nov 27 16:36:16 2007 @@ -78,6 +78,8 @@ virtual SDOperand LowerOperation(SDOperand Op, SelectionDAG &DAG); virtual SDNode *ExpandOperationResult(SDNode *N, SelectionDAG &DAG); + SDOperand PerformDAGCombine(SDNode *N, DAGCombinerInfo &DCI) const; + virtual const char *getTargetNodeName(unsigned Opcode) const; virtual MachineBasicBlock *InsertAtEndOfBasicBlock(MachineInstr *MI, Modified: llvm/trunk/lib/Target/ARM/README.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/README.txt?rev=44380&r1=44379&r2=44380&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/README.txt (original) +++ llvm/trunk/lib/Target/ARM/README.txt Tue Nov 27 16:36:16 2007 @@ -574,21 +574,3 @@ //===---------------------------------------------------------------------===// -Easy ARM microoptimization (with -mattr=+vfp2): - -define i64 @i(double %X) { - %Y = bitcast double %X to i64 - ret i64 %Y -} - -compiles into: - -_i: - fmdrr d0, r0, r1 - fmrrd r0, r1, d0 - bx lr - -This just needs a target-specific dag combine to merge the two ARMISD nodes. - - -//===---------------------------------------------------------------------===// From isanbard at gmail.com Tue Nov 27 16:37:19 2007 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 27 Nov 2007 22:37:19 -0000 Subject: [llvm-commits] [llvm-gcc-4.0] r44381 - /llvm-gcc-4.0/tags/Apple/llvmgcc40-2003/ Message-ID: <200711272237.lARMbJ7X027358@zion.cs.uiuc.edu> Author: void Date: Tue Nov 27 16:37:18 2007 New Revision: 44381 URL: http://llvm.org/viewvc/llvm-project?rev=44381&view=rev Log: Creating tag llvmgcc40-2003 Added: llvm-gcc-4.0/tags/Apple/llvmgcc40-2003/ - copied from r44380, llvm-gcc-4.0/trunk/ From sabre at nondot.org Tue Nov 27 16:41:52 2007 From: sabre at nondot.org (Chris Lattner) Date: Tue, 27 Nov 2007 22:41:52 -0000 Subject: [llvm-commits] [llvm] r44382 - /llvm/trunk/lib/Target/ARM/README.txt Message-ID: <200711272241.lARMfrmE027693@zion.cs.uiuc.edu> Author: lattner Date: Tue Nov 27 16:41:52 2007 New Revision: 44382 URL: http://llvm.org/viewvc/llvm-project?rev=44382&view=rev Log: several entries got significantly better, though they still aren't done. Modified: llvm/trunk/lib/Target/ARM/README.txt Modified: llvm/trunk/lib/Target/ARM/README.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/README.txt?rev=44382&r1=44381&r2=44382&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/README.txt (original) +++ llvm/trunk/lib/Target/ARM/README.txt Tue Nov 27 16:41:52 2007 @@ -186,24 +186,19 @@ } _bar: - sub sp, sp, #16 - str r4, [sp, #+12] - str r5, [sp, #+8] - str lr, [sp, #+4] - mov r4, r0 - mov r5, r1 - ldr r0, LCPI2_0 - bl _foo - fmsr f0, r0 - fcvtsd d0, f0 - fmdrr d1, r4, r5 - faddd d0, d0, d1 - fmrrd r0, r1, d0 - ldr lr, [sp, #+4] - ldr r5, [sp, #+8] - ldr r4, [sp, #+12] - add sp, sp, #16 - bx lr + stmfd sp!, {r4, r5, r7, lr} + add r7, sp, #8 + mov r4, r0 + mov r5, r1 + fldd d0, LCPI1_0 + fmrrd r0, r1, d0 + bl _foo + fmdrr d0, r4, r5 + fmsr s2, r0 + fsitod d1, s2 + faddd d0, d1, d0 + fmrrd r0, r1, d0 + ldmfd sp!, {r4, r5, r7, pc} Ignore the prologue and epilogue stuff for a second. Note mov r4, r0 @@ -501,32 +496,15 @@ two signed 32-bit values to produce a 64-bit value, and accumulates this with a 64-bit value. -We currently get this with v6: +We currently get this with both v4 and v6: _foo: - mul r12, r1, r0 - smmul r1, r1, r0 - smmul r0, r3, r2 - mul r3, r3, r2 - adds r3, r3, r12 - adc r0, r0, r1 + smull r1, r0, r1, r0 + smull r3, r2, r3, r2 + adds r3, r3, r1 + adc r0, r2, r0 bx lr -and this with v4: - -_foo: - stmfd sp!, {r7, lr} - mov r7, sp - mul r12, r1, r0 - smull r0, r1, r1, r0 - smull lr, r0, r3, r2 - mul r3, r3, r2 - adds r3, r3, r12 - adc r0, r0, r1 - ldmfd sp!, {r7, pc} - -This apparently occurs in real code. - //===---------------------------------------------------------------------===// This: From sabre at nondot.org Tue Nov 27 16:43:37 2007 From: sabre at nondot.org (Chris Lattner) Date: Tue, 27 Nov 2007 22:43:37 -0000 Subject: [llvm-commits] [llvm] r44383 - /llvm/trunk/test/CodeGen/ARM/fmdrr-fmrrd.ll Message-ID: <200711272243.lARMhbtO027810@zion.cs.uiuc.edu> Author: lattner Date: Tue Nov 27 16:43:37 2007 New Revision: 44383 URL: http://llvm.org/viewvc/llvm-project?rev=44383&view=rev Log: commit testcase I forgot to svn add. Added: llvm/trunk/test/CodeGen/ARM/fmdrr-fmrrd.ll Added: llvm/trunk/test/CodeGen/ARM/fmdrr-fmrrd.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/fmdrr-fmrrd.ll?rev=44383&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/ARM/fmdrr-fmrrd.ll (added) +++ llvm/trunk/test/CodeGen/ARM/fmdrr-fmrrd.ll Tue Nov 27 16:43:37 2007 @@ -0,0 +1,13 @@ +; RUN: llvm-as < %s | llc -march=arm -mattr=vfp2 | not grep fmdrr +; RUN: llvm-as < %s | llc -march=arm -mattr=vfp2 | not grep fmrrd + +; naive codegen for this is: +; _i: +; fmdrr d0, r0, r1 +; fmrrd r0, r1, d0 +; bx lr + +define i64 @test(double %X) { + %Y = bitcast double %X to i64 + ret i64 %Y +} From resistor at mac.com Tue Nov 27 16:47:08 2007 From: resistor at mac.com (Owen Anderson) Date: Tue, 27 Nov 2007 22:47:08 -0000 Subject: [llvm-commits] [llvm] r44384 - in /llvm/trunk: include/llvm/Analysis/LoopInfo.h include/llvm/CodeGen/MachineLoopInfo.h lib/CodeGen/MachineLoopInfo.cpp Message-ID: <200711272247.lARMl83c027929@zion.cs.uiuc.edu> Author: resistor Date: Tue Nov 27 16:47:08 2007 New Revision: 44384 URL: http://llvm.org/viewvc/llvm-project?rev=44384&view=rev Log: Add MachineLoopInfo. This is not yet tested. Added: llvm/trunk/include/llvm/CodeGen/MachineLoopInfo.h llvm/trunk/lib/CodeGen/MachineLoopInfo.cpp Modified: llvm/trunk/include/llvm/Analysis/LoopInfo.h Modified: llvm/trunk/include/llvm/Analysis/LoopInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/LoopInfo.h?rev=44384&r1=44383&r2=44384&view=diff ============================================================================== --- llvm/trunk/include/llvm/Analysis/LoopInfo.h (original) +++ llvm/trunk/include/llvm/Analysis/LoopInfo.h Tue Nov 27 16:47:08 2007 @@ -702,7 +702,7 @@ LoopBase *L = new LoopBase(BB); BBMap[BB] = L; - BlockT *EntryBlock = &BB->getParent()->getEntryBlock(); + BlockT *EntryBlock = BB->getParent()->begin(); while (!TodoStack.empty()) { // Process all the nodes in the loop BlockT *X = TodoStack.back(); Added: llvm/trunk/include/llvm/CodeGen/MachineLoopInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineLoopInfo.h?rev=44384&view=auto ============================================================================== --- llvm/trunk/include/llvm/CodeGen/MachineLoopInfo.h (added) +++ llvm/trunk/include/llvm/CodeGen/MachineLoopInfo.h Tue Nov 27 16:47:08 2007 @@ -0,0 +1,203 @@ +//===- llvm/CodeGen/MachineLoopInfo.h - Natural Loop Calculator -*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file was developed by Owen Anderson and is distributed under +// the University of Illinois Open Source License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// This file defines the MachineLoopInfo class that is used to identify natural +// loops and determine the loop depth of various nodes of the CFG. Note that +// natural loops may actually be several loops that share the same header node. +// +// This analysis calculates the nesting structure of loops in a function. For +// each natural loop identified, this analysis identifies natural loops +// contained entirely within the loop and the basic blocks the make up the loop. +// +// It can calculate on the fly various bits of information, for example: +// +// * whether there is a preheader for the loop +// * the number of back edges to the header +// * whether or not a particular block branches out of the loop +// * the successor blocks of the loop +// * the loop depth +// * the trip count +// * etc... +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_CODEGEN_MACHINE_LOOP_INFO_H +#define LLVM_CODEGEN_MACHINE_LOOP_INFO_H + +#include "llvm/CodeGen/MachineFunctionPass.h" +#include "llvm/CodeGen/MachineBasicBlock.h" +#include "llvm/CodeGen/MachineFunction.h" +#include "llvm/CodeGen/MachineInstr.h" +#include "llvm/Analysis/LoopInfo.h" + +namespace llvm { + +// Provide overrides for Loop methods that don't make sense for machine loops. +template<> +PHINode *LoopBase::getCanonicalInductionVariable() const { + assert(0 && "getCanonicalInductionVariable not supported for machine loops!"); + return 0; +} + +template<> +Instruction* +LoopBase::getCanonicalInductionVariableIncrement() const { + assert(0 && + "getCanonicalInductionVariableIncrement not supported for machine loops!"); + return 0; +} + +template<> +bool LoopBase::isLoopInvariant(Value *V) const { + assert(0 && "isLoopInvariant not supported for machine loops!"); + return false; +} + +template<> +Value *LoopBase::getTripCount() const { + assert(0 && "getTripCount not supported for machine loops!"); + return 0; +} + +template<> +bool LoopBase::isLCSSAForm() const { + assert(0 && "isLCSSAForm not supported for machine loops"); + return false; +} + +EXTERN_TEMPLATE_INSTANTIATION(class LoopBase); +EXTERN_TEMPLATE_INSTANTIATION(class LoopInfoBase); + +typedef LoopBase MachineLoop; + +class MachineLoopInfo : public MachineFunctionPass { + LoopInfoBase* LI; + friend class LoopBase; + + LoopInfoBase& getBase() { return *LI; } +public: + static char ID; // Pass identification, replacement for typeid + + MachineLoopInfo() : MachineFunctionPass(intptr_t(&ID)) { + LI = new LoopInfoBase(); + } + + ~MachineLoopInfo() { delete LI; } + + /// iterator/begin/end - The interface to the top-level loops in the current + /// function. + /// + typedef std::vector::const_iterator iterator; + inline iterator begin() const { return LI->begin(); } + inline iterator end() const { return LI->end(); } + + /// getLoopFor - Return the inner most loop that BB lives in. If a basic + /// block is in no loop (for example the entry node), null is returned. + /// + inline MachineLoop *getLoopFor(const MachineBasicBlock *BB) const { + return LI->getLoopFor(BB); + } + + /// operator[] - same as getLoopFor... + /// + inline const MachineLoop *operator[](const MachineBasicBlock *BB) const { + return LI->getLoopFor(BB); + } + + /// getLoopDepth - Return the loop nesting level of the specified block... + /// + inline unsigned getLoopDepth(const MachineBasicBlock *BB) const { + return LI->getLoopDepth(BB); + } + + // isLoopHeader - True if the block is a loop header node + inline bool isLoopHeader(MachineBasicBlock *BB) const { + return LI->isLoopHeader(BB); + } + + /// runOnFunction - Calculate the natural loop information. + /// + virtual bool runOnMachineFunction(MachineFunction &F); + + bool runOnFunction(Function& F) { return false; } + + virtual void releaseMemory() { LI->releaseMemory(); } + + virtual void print(std::ostream &O, const Module* M = 0) const { + if (O) LI->print(O, M); + } + + virtual void getAnalysisUsage(AnalysisUsage &AU) const; + + /// removeLoop - This removes the specified top-level loop from this loop info + /// object. The loop is not deleted, as it will presumably be inserted into + /// another loop. + inline MachineLoop *removeLoop(iterator I) { return LI->removeLoop(I); } + + /// changeLoopFor - Change the top-level loop that contains BB to the + /// specified loop. This should be used by transformations that restructure + /// the loop hierarchy tree. + inline void changeLoopFor(MachineBasicBlock *BB, MachineLoop *L) { + LI->changeLoopFor(BB, L); + } + + /// changeTopLevelLoop - Replace the specified loop in the top-level loops + /// list with the indicated loop. + inline void changeTopLevelLoop(MachineLoop *OldLoop, MachineLoop *NewLoop) { + LI->changeTopLevelLoop(OldLoop, NewLoop); + } + + /// addTopLevelLoop - This adds the specified loop to the collection of + /// top-level loops. + inline void addTopLevelLoop(MachineLoop *New) { + LI->addTopLevelLoop(New); + } + + /// removeBlock - This method completely removes BB from all data structures, + /// including all of the Loop objects it is nested in and our mapping from + /// MachineBasicBlocks to loops. + void removeBlock(MachineBasicBlock *BB) { + LI->removeBlock(BB); + } +}; + + +// Allow clients to walk the list of nested loops... +template <> struct GraphTraits { + typedef const MachineLoop NodeType; + typedef std::vector::const_iterator ChildIteratorType; + + static NodeType *getEntryNode(const MachineLoop *L) { return L; } + static inline ChildIteratorType child_begin(NodeType *N) { + return N->begin(); + } + static inline ChildIteratorType child_end(NodeType *N) { + return N->end(); + } +}; + +template <> struct GraphTraits { + typedef MachineLoop NodeType; + typedef std::vector::const_iterator ChildIteratorType; + + static NodeType *getEntryNode(MachineLoop *L) { return L; } + static inline ChildIteratorType child_begin(NodeType *N) { + return N->begin(); + } + static inline ChildIteratorType child_end(NodeType *N) { + return N->end(); + } +}; + +} // End llvm namespace + +// Make sure that any clients of this file link in LoopInfo.cpp +FORCE_DEFINING_FILE_TO_BE_LINKED(MachineLoopInfo) + +#endif \ No newline at end of file Added: llvm/trunk/lib/CodeGen/MachineLoopInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineLoopInfo.cpp?rev=44384&view=auto ============================================================================== --- llvm/trunk/lib/CodeGen/MachineLoopInfo.cpp (added) +++ llvm/trunk/lib/CodeGen/MachineLoopInfo.cpp Tue Nov 27 16:47:08 2007 @@ -0,0 +1,41 @@ +//===- MachineLoopInfo.cpp - Natural Loop Calculator ----------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file was developed by Owen Anderson and is distributed under +// the University of Illinois Open Source License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// This file defines the MachineLoopInfo class that is used to identify natural +// loops and determine the loop depth of various nodes of the CFG. Note that +// the loops identified may actually be several natural loops that share the +// same header node... not just a single natural loop. +// +//===----------------------------------------------------------------------===// + +#include "llvm/CodeGen/MachineLoopInfo.h" +#include "llvm/CodeGen/MachineDominators.h" + +using namespace llvm; + +TEMPLATE_INSTANTIATION(class LoopBase); +TEMPLATE_INSTANTIATION(class LoopInfoBase); + +char MachineLoopInfo::ID = 0; +static RegisterPass +X("machine-loops", "Machine Natural Loop Construction", true); + +bool MachineLoopInfo::runOnMachineFunction(MachineFunction &) { + releaseMemory(); + LI->Calculate(getAnalysis().getBase()); // Update + return false; +} + +void MachineLoopInfo::getAnalysisUsage(AnalysisUsage &AU) const { + AU.setPreservesAll(); + AU.addRequired(); +} + +// Ensure this file gets linked when MachineLoopInfo.h is used. +DEFINING_FILE_FOR(MachineLoopInfo) \ No newline at end of file From isanbard at gmail.com Tue Nov 27 19:07:53 2007 From: isanbard at gmail.com (Bill Wendling) Date: Wed, 28 Nov 2007 01:07:53 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r44385 - /llvm-gcc-4.2/tags/Apple/llvmgcc42-2001/ Message-ID: <200711280107.lAS17r4O003364@zion.cs.uiuc.edu> Author: void Date: Tue Nov 27 19:07:53 2007 New Revision: 44385 URL: http://llvm.org/viewvc/llvm-project?rev=44385&view=rev Log: Creating llvmgcc42-2001 tag Added: llvm-gcc-4.2/tags/Apple/llvmgcc42-2001/ - copied from r44384, llvm-gcc-4.2/trunk/ From evan.cheng at apple.com Tue Nov 27 19:28:46 2007 From: evan.cheng at apple.com (Evan Cheng) Date: Wed, 28 Nov 2007 01:28:46 -0000 Subject: [llvm-commits] [llvm] r44386 - in /llvm/trunk: include/llvm/CodeGen/LiveIntervalAnalysis.h lib/CodeGen/LiveIntervalAnalysis.cpp lib/CodeGen/VirtRegMap.cpp lib/CodeGen/VirtRegMap.h Message-ID: <200711280128.lAS1Slpr004851@zion.cs.uiuc.edu> Author: evancheng Date: Tue Nov 27 19:28:46 2007 New Revision: 44386 URL: http://llvm.org/viewvc/llvm-project?rev=44386&view=rev Log: Recover compile time regression. Modified: llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp llvm/trunk/lib/CodeGen/VirtRegMap.cpp llvm/trunk/lib/CodeGen/VirtRegMap.h Modified: llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h?rev=44386&r1=44385&r2=44386&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h (original) +++ llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h Tue Nov 27 19:28:46 2007 @@ -292,7 +292,7 @@ VirtRegMap &vrm, SSARegMap *RegMap, const TargetRegisterClass* rc, SmallVector &ReMatIds, unsigned &NewVReg, bool &HasDef, bool &HasUse, const LoopInfo *loopInfo, - std::vector &NewVRegs, + std::map &NewVRegs, std::vector &NewLIs); void rewriteInstructionsForSpills(const LiveInterval &li, bool TrySplit, LiveInterval::Ranges::const_iterator &I, @@ -301,8 +301,8 @@ VirtRegMap &vrm, SSARegMap *RegMap, const TargetRegisterClass* rc, SmallVector &ReMatIds, const LoopInfo *loopInfo, BitVector &SpillMBBs, - std::vector > &SpillIdxes, - std::vector &NewVRegs, + std::map > &SpillIdxes, + std::map &NewVRegs, std::vector &NewLIs); static LiveInterval createInterval(unsigned Reg); Modified: llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp?rev=44386&r1=44385&r2=44386&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp (original) +++ llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Tue Nov 27 19:28:46 2007 @@ -707,7 +707,8 @@ const TargetRegisterClass* rc, SmallVector &ReMatIds, unsigned &NewVReg, bool &HasDef, bool &HasUse, - const LoopInfo *loopInfo, std::vector &NewVRegs, + const LoopInfo *loopInfo, + std::map &NewVRegs, std::vector &NewLIs) { RestartInstruction: for (unsigned i = 0; i != MI->getNumOperands(); ++i) { @@ -731,6 +732,7 @@ // all of its uses are rematerialized, simply delete it. if (MI == ReMatOrigDefMI && CanDelete) { RemoveMachineInstrFromMaps(MI); + vrm.RemoveMachineInstrFromMaps(MI); MI->eraseFromParent(); break; } @@ -823,7 +825,7 @@ LiveInterval &nI = getOrCreateInterval(NewVReg); if (CreatedNewVReg) { NewLIs.push_back(&nI); - NewVRegs[MI->getParent()->getNumber()] = NewVReg; + NewVRegs.insert(std::make_pair(MI->getParent()->getNumber(), NewVReg)); if (TrySplit) vrm.setIsSplitFromReg(NewVReg, li.reg); } @@ -893,8 +895,8 @@ SmallVector &ReMatIds, const LoopInfo *loopInfo, BitVector &SpillMBBs, - std::vector > &SpillIdxes, - std::vector &NewVRegs, + std::map > &SpillIdxes, + std::map &NewVRegs, std::vector &NewLIs) { unsigned NewVReg = 0; unsigned index = getBaseIndex(I->start); @@ -908,7 +910,13 @@ MachineInstr *MI = getInstructionFromIndex(index); MachineBasicBlock *MBB = MI->getParent(); - NewVReg = !TrySplitMI ? 0 : NewVRegs[MBB->getNumber()]; + NewVReg = 0; + if (TrySplitMI) { + std::map::const_iterator NVI = + NewVRegs.find(MBB->getNumber()); + if (NVI != NewVRegs.end()) + NewVReg = NVI->second; + } bool IsNew = NewVReg == 0; bool HasDef = false; bool HasUse = false; @@ -936,9 +944,11 @@ : anyKillInMBBAfterIdx(li, MBB, getDefIndex(index), I->valno); if (!HasKill) { unsigned MBBId = MBB->getNumber(); - if ((int)index > SpillIdxes[MBBId].first) - // High bit specify whether this spill ought to be folded if - // possible. + // High bit specify whether this spill ought to be folded if + // possible. + std::map >::iterator SII = + SpillIdxes.find(MBBId); + if (SII == SpillIdxes.end() || (int)index > SII->second.first) SpillIdxes[MBBId] = std::make_pair(index, NewVReg | (1 << 31)); SpillMBBs.set(MBBId); } @@ -955,8 +965,11 @@ } else if (HasUse) { // Use(s) following the last def, it's not safe to fold the spill. unsigned MBBId = MBB->getNumber(); - if ((SpillIdxes[MBBId].second & ((1<<31)-1)) == NewVReg && - (int)getUseIndex(index) > SpillIdxes[MBBId].first) + std::map >::iterator SII = + SpillIdxes.find(MBBId); + if (SII != SpillIdxes.end() && + (SII->second.second & ((1<<31)-1)) == NewVReg && + (int)getUseIndex(index) > SII->second.first) SpillIdxes[MBBId].second &= (1<<31)-1; } @@ -985,9 +998,8 @@ // Each bit specify whether it a spill is required in the MBB. BitVector SpillMBBs(mf_->getNumBlockIDs()); - std::vector > SpillIdxes(mf_->getNumBlockIDs(), - std::make_pair(-1,0)); - std::vector NewVRegs(mf_->getNumBlockIDs(), 0); + std::map > SpillIdxes; + std::map NewVRegs; std::vector NewLIs; SSARegMap *RegMap = mf_->getSSARegMap(); const TargetRegisterClass* rc = RegMap->getRegClass(li.reg); @@ -1015,7 +1027,6 @@ bool isLoadSS = DefIsReMat && tii_->isLoadFromStackSlot(ReMatDefMI, LdSlot); bool isLoad = isLoadSS || (DefIsReMat && (ReMatDefMI->getInstrDescriptor()->Flags & M_LOAD_FLAG)); - vrm.removeAllSpillPtsForReg(li.reg); bool IsFirstRange = true; for (LiveInterval::Ranges::const_iterator I = li.ranges.begin(), E = li.ranges.end(); I != E; ++I) { @@ -1087,7 +1098,6 @@ if (NeedStackSlot && vrm.getPreSplitReg(li.reg) == 0) Slot = vrm.assignVirt2StackSlot(li.reg); - // Create new intervals and rewrite defs and uses. for (LiveInterval::Ranges::const_iterator I = li.ranges.begin(), E = li.ranges.end(); I != E; ++I) { Modified: llvm/trunk/lib/CodeGen/VirtRegMap.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/VirtRegMap.cpp?rev=44386&r1=44385&r2=44386&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/VirtRegMap.cpp (original) +++ llvm/trunk/lib/CodeGen/VirtRegMap.cpp Tue Nov 27 19:28:46 2007 @@ -74,7 +74,6 @@ Virt2StackSlotMap.grow(LastVirtReg); Virt2ReMatIdMap.grow(LastVirtReg); Virt2SplitMap.grow(LastVirtReg); - Virt2SpillPtsMap.grow(LastVirtReg); ReMatMap.grow(LastVirtReg); } @@ -837,7 +836,7 @@ VRM.assignVirt2Phys(UnfoldVR, UnfoldPR); VRM.virtFolded(VirtReg, FoldedMI, VirtRegMap::isRef); MII = MBB.insert(MII, FoldedMI); - VRM.RemoveFromFoldedVirtMap(&MI); + VRM.RemoveMachineInstrFromMaps(&MI); MBB.erase(&MI); return true; } @@ -886,7 +885,7 @@ if (CheckDef) --PrevMII; MBB.erase(LastStore); - VRM.RemoveFromFoldedVirtMap(LastStore); + VRM.RemoveMachineInstrFromMaps(LastStore); if (CheckDef) { // Look at defs of killed registers on the store. Mark the defs // as dead since the store has been deleted and they aren't @@ -899,7 +898,7 @@ // FIXME: This assumes a remat def does not have side // effects. MBB.erase(DeadDef); - VRM.RemoveFromFoldedVirtMap(DeadDef); + VRM.RemoveMachineInstrFromMaps(DeadDef); ++NumDRM; } } @@ -965,15 +964,19 @@ const TargetInstrDescriptor *TID = MI.getInstrDescriptor(); // Insert spills here if asked to. - std::vector SpillRegs = VRM.getSpillPtSpills(&MI); - for (unsigned i = 0, e = SpillRegs.size(); i != e; ++i) { - unsigned VirtReg = SpillRegs[i]; - const TargetRegisterClass *RC = RegMap->getRegClass(VirtReg); - unsigned Phys = VRM.getPhys(VirtReg); - int StackSlot = VRM.getStackSlot(VirtReg); - MachineInstr *&LastStore = MaybeDeadStores[StackSlot]; - SpillRegToStackSlot(MBB, MII, i, Phys, StackSlot, RC, - LastStore, Spills, ReMatDefs, RegKills, KillOps, VRM); + if (VRM.isSpillPt(&MI)) { + std::vector &SpillRegs = VRM.getSpillPtSpills(&MI); + for (unsigned i = 0, e = SpillRegs.size(); i != e; ++i) { + unsigned VirtReg = SpillRegs[i]; + if (!VRM.getPreSplitReg(VirtReg)) + continue; // Split interval spilled again. + const TargetRegisterClass *RC = RegMap->getRegClass(VirtReg); + unsigned Phys = VRM.getPhys(VirtReg); + int StackSlot = VRM.getStackSlot(VirtReg); + MachineInstr *&LastStore = MaybeDeadStores[StackSlot]; + SpillRegToStackSlot(MBB, MII, i, Phys, StackSlot, RC, + LastStore, Spills, ReMatDefs, RegKills, KillOps, VRM); + } } /// ReusedOperands - Keep track of operand reuse in case we need to undo @@ -1142,7 +1145,7 @@ if (DeadStore) { DOUT << "Removed dead store:\t" << *DeadStore; InvalidateKills(*DeadStore, RegKills, KillOps); - VRM.RemoveFromFoldedVirtMap(DeadStore); + VRM.RemoveMachineInstrFromMaps(DeadStore); MBB.erase(DeadStore); MaybeDeadStores[ReuseSlot] = NULL; ++NumDSE; @@ -1295,7 +1298,7 @@ } else DOUT << "Removing now-noop copy: " << MI; - VRM.RemoveFromFoldedVirtMap(&MI); + VRM.RemoveMachineInstrFromMaps(&MI); MBB.erase(&MI); Erased = true; goto ProcessNextInst; @@ -1306,7 +1309,7 @@ if (PhysReg && MRI->unfoldMemoryOperand(MF, &MI, PhysReg, false, false, NewMIs)) { MBB.insert(MII, NewMIs[0]); - VRM.RemoveFromFoldedVirtMap(&MI); + VRM.RemoveMachineInstrFromMaps(&MI); MBB.erase(&MI); Erased = true; --NextMII; // backtrack to the unfolded instruction. @@ -1331,7 +1334,7 @@ MBB.insert(MII, NewMIs[0]); NewStore = NewMIs[1]; MBB.insert(MII, NewStore); - VRM.RemoveFromFoldedVirtMap(&MI); + VRM.RemoveMachineInstrFromMaps(&MI); MBB.erase(&MI); Erased = true; --NextMII; @@ -1345,7 +1348,7 @@ // If we get here, the store is dead, nuke it now. DOUT << "Removed dead store:\t" << *DeadStore; InvalidateKills(*DeadStore, RegKills, KillOps); - VRM.RemoveFromFoldedVirtMap(DeadStore); + VRM.RemoveMachineInstrFromMaps(DeadStore); MBB.erase(DeadStore); if (!NewStore) ++NumDSE; @@ -1405,7 +1408,7 @@ DOUT << "Removing now-noop copy: " << MI; MBB.erase(&MI); Erased = true; - VRM.RemoveFromFoldedVirtMap(&MI); + VRM.RemoveMachineInstrFromMaps(&MI); Spills.disallowClobberPhysReg(VirtReg); goto ProcessNextInst; } @@ -1480,7 +1483,7 @@ DOUT << "Removing now-noop copy: " << MI; MBB.erase(&MI); Erased = true; - VRM.RemoveFromFoldedVirtMap(&MI); + VRM.RemoveMachineInstrFromMaps(&MI); UpdateKills(*LastStore, RegKills, KillOps); goto ProcessNextInst; } @@ -1495,7 +1498,6 @@ } } - llvm::Spiller* llvm::createSpiller() { switch (SpillerOpt) { default: assert(0 && "Unreachable!"); Modified: llvm/trunk/lib/CodeGen/VirtRegMap.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/VirtRegMap.h?rev=44386&r1=44385&r2=44386&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/VirtRegMap.h (original) +++ llvm/trunk/lib/CodeGen/VirtRegMap.h Tue Nov 27 19:28:46 2007 @@ -80,12 +80,7 @@ /// SpillPt2VirtMap - This records the virtual registers which should /// be spilled right after the MachineInstr due to live interval /// splitting. - DenseMap > SpillPt2VirtMap; - - /// Virt2SplitMap - This records the MachineInstrs where a virtual - /// register should be spilled due to live interval splitting. - IndexedMap, VirtReg2IndexFunctor> - Virt2SpillPtsMap; + std::map > SpillPt2VirtMap; /// ReMatId - Instead of assigning a stack slot to a to be rematerialized /// virtual register, an unique id is being assigned. This keeps track of @@ -209,6 +204,11 @@ ReMatMap[virtReg] = def; } + /// @brief returns true if the specified MachineInstr is a spill point. + bool isSpillPt(MachineInstr *Pt) const { + return SpillPt2VirtMap.find(Pt) != SpillPt2VirtMap.end(); + } + /// @brief returns the virtual registers that should be spilled due to /// splitting right after the specified MachineInstr. std::vector &getSpillPtSpills(MachineInstr *Pt) { @@ -217,52 +217,26 @@ /// @brief records the specified MachineInstr as a spill point for virtReg. void addSpillPoint(unsigned virtReg, MachineInstr *Pt) { - SpillPt2VirtMap[Pt].push_back(virtReg); - Virt2SpillPtsMap[virtReg].push_back(Pt); - } - - /// @brief remove the virtReg from the list of registers that should be - /// spilled (due to splitting) right after the specified MachineInstr. - void removeRegFromSpillPt(MachineInstr *Pt, unsigned virtReg) { - std::vector &Regs = SpillPt2VirtMap[Pt]; - if (Regs.back() == virtReg) // Most common case. - Regs.pop_back(); - for (unsigned i = 0, e = Regs.size(); i != e; ++i) - if (Regs[i] == virtReg) { - Regs.erase(Regs.begin()+i-1); - break; - } - } - - /// @brief specify virtReg is no longer being spilled due to splitting. - void removeAllSpillPtsForReg(unsigned virtReg) { - std::vector &SpillPts = Virt2SpillPtsMap[virtReg]; - for (unsigned i = 0, e = SpillPts.size(); i != e; ++i) - removeRegFromSpillPt(SpillPts[i], virtReg); - Virt2SpillPtsMap[virtReg].clear(); - } - - /// @brief remove the specified MachineInstr as a spill point for the - /// specified register. - void removeRegSpillPt(unsigned virtReg, MachineInstr *Pt) { - std::vector &SpillPts = Virt2SpillPtsMap[virtReg]; - if (SpillPts.back() == Pt) // Most common case. - SpillPts.pop_back(); - for (unsigned i = 0, e = SpillPts.size(); i != e; ++i) - if (SpillPts[i] == Pt) { - SpillPts.erase(SpillPts.begin()+i-1); - break; - } + if (SpillPt2VirtMap.find(Pt) != SpillPt2VirtMap.end()) + SpillPt2VirtMap[Pt].push_back(virtReg); + else { + std::vector Virts; + Virts.push_back(virtReg); + SpillPt2VirtMap.insert(std::make_pair(Pt, Virts)); + } } void transferSpillPts(MachineInstr *Old, MachineInstr *New) { - std::vector &OldRegs = SpillPt2VirtMap[Old]; - while (!OldRegs.empty()) { - unsigned virtReg = OldRegs.back(); - OldRegs.pop_back(); - removeRegSpillPt(virtReg, Old); + std::map >::iterator I = + SpillPt2VirtMap.find(Old); + if (I == SpillPt2VirtMap.end()) + return; + while (!I->second.empty()) { + unsigned virtReg = I->second.back(); + I->second.pop_back(); addSpillPoint(virtReg, New); } + SpillPt2VirtMap.erase(I); } /// @brief Updates information about the specified virtual register's value @@ -282,10 +256,11 @@ return MI2VirtMap.equal_range(MI); } - /// RemoveFromFoldedVirtMap - If the specified machine instruction is in - /// the folded instruction map, remove its entry from the map. - void RemoveFromFoldedVirtMap(MachineInstr *MI) { + /// RemoveMachineInstrFromMaps - MI is being erased, remove it from the + /// the folded instruction map and spill point map. + void RemoveMachineInstrFromMaps(MachineInstr *MI) { MI2VirtMap.erase(MI); + SpillPt2VirtMap.erase(MI); } void print(std::ostream &OS) const; From isanbard at gmail.com Tue Nov 27 19:36:45 2007 From: isanbard at gmail.com (Bill Wendling) Date: Wed, 28 Nov 2007 01:36:45 -0000 Subject: [llvm-commits] [llvm-gcc-4.0] r44387 - /llvm-gcc-4.0/tags/Apple/llvmgcc40-2003/GNUmakefile Message-ID: <200711280136.lAS1aj3H005342@zion.cs.uiuc.edu> Author: void Date: Tue Nov 27 19:36:42 2007 New Revision: 44387 URL: http://llvm.org/viewvc/llvm-project?rev=44387&view=rev Log: Line erroneously commented out Modified: llvm-gcc-4.0/tags/Apple/llvmgcc40-2003/GNUmakefile Modified: llvm-gcc-4.0/tags/Apple/llvmgcc40-2003/GNUmakefile URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/tags/Apple/llvmgcc40-2003/GNUmakefile?rev=44387&r1=44386&r2=44387&view=diff ============================================================================== --- llvm-gcc-4.0/tags/Apple/llvmgcc40-2003/GNUmakefile (original) +++ llvm-gcc-4.0/tags/Apple/llvmgcc40-2003/GNUmakefile Tue Nov 27 19:36:42 2007 @@ -39,7 +39,7 @@ ifndef DISABLE_LLVM ENABLE_LLVM = true # LLVM gets installed into /usr/local, not /usr. -#ifndef DEVELOPER_DIR +ifndef DEVELOPER_DIR PREFIX = /Developer/usr/llvm-gcc-4.0 else PREFIX = ${DEVELOPER_DIR}/usr/lvm-gcc-4.0 From isanbard at gmail.com Tue Nov 27 19:51:47 2007 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 27 Nov 2007 17:51:47 -0800 Subject: [llvm-commits] [llvm] r44384 - in /llvm/trunk: include/llvm/Analysis/LoopInfo.h include/llvm/CodeGen/MachineLoopInfo.h lib/CodeGen/MachineLoopInfo.cpp In-Reply-To: <200711272247.lARMl83c027929@zion.cs.uiuc.edu> References: <200711272247.lARMl83c027929@zion.cs.uiuc.edu> Message-ID: <16e5fdf90711271751t381138abj1828a5ca862a406b@mail.gmail.com> Hi Owen, Thanks! :-) A few comments: > + // isLoopHeader - True if the block is a loop header node You probably want a /// comment here. > + virtual void print(std::ostream &O, const Module* M = 0) const { > + if (O) LI->print(O, M); > + } I think that "if (O)" will always be true here, right? > +// Allow clients to walk the list of nested loops... > +template <> struct GraphTraits { > + typedef const MachineLoop NodeType; > + typedef std::vector::const_iterator ChildIteratorType; Should this be: typedef std::vector::const_iterator ChildIteratorType; ? -bw From resistor at mac.com Tue Nov 27 20:40:01 2007 From: resistor at mac.com (Owen Anderson) Date: Tue, 27 Nov 2007 20:40:01 -0600 Subject: [llvm-commits] [llvm] r44384 - in /llvm/trunk: include/llvm/Analysis/LoopInfo.h include/llvm/CodeGen/MachineLoopInfo.h lib/CodeGen/MachineLoopInfo.cpp In-Reply-To: <16e5fdf90711271751t381138abj1828a5ca862a406b@mail.gmail.com> References: <200711272247.lARMl83c027929@zion.cs.uiuc.edu> <16e5fdf90711271751t381138abj1828a5ca862a406b@mail.gmail.com> Message-ID: <02AA33E3-F01D-4E70-8D62-47B9BF59F884@mac.com> All of these are copy-and-pasted from LoopInfo.h. If they're wrong, it's wrong too. I'll investigate. --Owen On Nov 27, 2007, at 7:51 PM, Bill Wendling wrote: > Hi Owen, > > Thanks! :-) A few comments: > >> + // isLoopHeader - True if the block is a loop header node > > You probably want a /// comment here. > >> + virtual void print(std::ostream &O, const Module* M = 0) const { >> + if (O) LI->print(O, M); >> + } > > I think that "if (O)" will always be true here, right? > >> +// Allow clients to walk the list of nested loops... >> +template <> struct GraphTraits { >> + typedef const MachineLoop NodeType; >> + typedef std::vector::const_iterator >> ChildIteratorType; > > Should this be: > > typedef std::vector::const_iterator > ChildIteratorType; > > ? > > -bw > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits -------------- next part -------------- A non-text attachment was scrubbed... Name: smime.p7s Type: application/pkcs7-signature Size: 2555 bytes Desc: not available Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20071127/75dc0d7c/attachment.bin From tonic at nondot.org Tue Nov 27 22:57:00 2007 From: tonic at nondot.org (Tanya Lattner) Date: Wed, 28 Nov 2007 04:57:00 -0000 Subject: [llvm-commits] [llvm] r44389 - in /llvm/trunk/test: Analysis/BasicAA/ Analysis/ScalarEvolution/ Assembler/ CFrontend/ CodeGen/ARM/ ExecutionEngine/ lib/ Message-ID: <200711280457.lAS4v1Gj015660@zion.cs.uiuc.edu> Author: tbrethou Date: Tue Nov 27 22:57:00 2007 New Revision: 44389 URL: http://llvm.org/viewvc/llvm-project?rev=44389&view=rev Log: Fix bug in regression tests that ignored stderr output in RUN lines. Updated tests and fixed broken run lines. XFAILed 3 arm regressions (will file bugs) Modified: llvm/trunk/test/Analysis/BasicAA/2007-08-01-NoAliasAndCalls.ll llvm/trunk/test/Analysis/BasicAA/2007-08-01-NoAliasAndGEP.ll llvm/trunk/test/Analysis/ScalarEvolution/2007-08-06-Unsigned.ll llvm/trunk/test/Assembler/2002-07-25-ParserAssertionFailure.llx llvm/trunk/test/Assembler/2003-04-15-ConstantInitAssertion.llx llvm/trunk/test/Assembler/2003-05-21-MalformedShiftCrash.llx llvm/trunk/test/Assembler/2003-05-21-MalformedStructCrash.llx llvm/trunk/test/Assembler/2003-11-24-SymbolTableCrash.llx llvm/trunk/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx llvm/trunk/test/Assembler/2004-03-30-UnclosedFunctionCrash.llx llvm/trunk/test/Assembler/2006-05-26-VarargsCallEncode.ll llvm/trunk/test/Assembler/2006-09-28-CrashOnInvalid.ll llvm/trunk/test/Assembler/2007-01-02-Undefined-Arg-Type.ll llvm/trunk/test/Assembler/2007-01-16-CrashOnBadCast.ll llvm/trunk/test/Assembler/2007-01-16-CrashOnBadCast2.ll llvm/trunk/test/Assembler/2007-01-21-UpgradeNoArgs.ll llvm/trunk/test/Assembler/2007-01-22-UpgradeMalformedShift.ll llvm/trunk/test/Assembler/2007-01-22-UpgradeMalformedStruct.ll llvm/trunk/test/Assembler/2007-01-22-UpgradeTypeMapInvalidMemory.ll llvm/trunk/test/Assembler/2007-03-18-InvalidNumberedVar.ll llvm/trunk/test/Assembler/2007-04-15-BadIntrinsic.ll llvm/trunk/test/Assembler/2007-04-20-AlignedStore.ll llvm/trunk/test/Assembler/2007-08-06-AliasInvalid.ll llvm/trunk/test/CFrontend/2006-09-21-IncompleteElementType.c llvm/trunk/test/CFrontend/2007-10-01-BuildArrayRef.c llvm/trunk/test/CodeGen/ARM/2007-03-13-InstrSched.ll llvm/trunk/test/CodeGen/ARM/fp.ll llvm/trunk/test/CodeGen/ARM/lsr-code-insertion.ll llvm/trunk/test/ExecutionEngine/2004-12-04-LazyCompileFuncs.ll llvm/trunk/test/lib/llvm.exp Modified: llvm/trunk/test/Analysis/BasicAA/2007-08-01-NoAliasAndCalls.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/BasicAA/2007-08-01-NoAliasAndCalls.ll?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/Analysis/BasicAA/2007-08-01-NoAliasAndCalls.ll (original) +++ llvm/trunk/test/Analysis/BasicAA/2007-08-01-NoAliasAndCalls.ll Tue Nov 27 22:57:00 2007 @@ -1,4 +1,4 @@ -; RUN: llvm-as %s -o - | opt -basicaa -aa-eval -print-all-alias-modref-info -disable-output &| grep 'MayAlias: i32* %y, i32* %x' +; RUN: llvm-as %s -o - | opt -basicaa -aa-eval -print-all-alias-modref-info -disable-output |& grep {MayAlias:.*i32\\* %y, i32\\* %x} declare i32* @unclear(i32* %a) Modified: llvm/trunk/test/Analysis/BasicAA/2007-08-01-NoAliasAndGEP.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/BasicAA/2007-08-01-NoAliasAndGEP.ll?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/Analysis/BasicAA/2007-08-01-NoAliasAndGEP.ll (original) +++ llvm/trunk/test/Analysis/BasicAA/2007-08-01-NoAliasAndGEP.ll Tue Nov 27 22:57:00 2007 @@ -1,15 +1,15 @@ -; RUN: llvm-as %s -o - | opt -basicaa -aa-eval -print-all-alias-modref-info -disable-output &| grep '9 no alias' -; RUN: llvm-as %s -o - | opt -basicaa -aa-eval -print-all-alias-modref-info -disable-output &| grep '6 may alias' -; RUN: llvm-as %s -o - | opt -basicaa -aa-eval -print-all-alias-modref-info -disable-output &| grep 'MayAlias: i32* %pj, i32* %pi' +; RUN: llvm-as %s -o - | opt -basicaa -aa-eval -print-all-alias-modref-info -disable-output |& grep {9 no alias} +; RUN: llvm-as %s -o - | opt -basicaa -aa-eval -print-all-alias-modref-info -disable-output |& grep {6 may alias} +; RUN: llvm-as %s -o - | opt -basicaa -aa-eval -print-all-alias-modref-info -disable-output |& grep {MayAlias:.*i32\\* %Jpointer, i32\\* %Ipointer} define void @foo(i32* noalias %p, i32* noalias %q, i32 %i, i32 %j) { - %pi = getelementptr i32* %p, i32 %i + %Ipointer = getelementptr i32* %p, i32 %i %qi = getelementptr i32* %q, i32 %i - %pj = getelementptr i32* %p, i32 %j + %Jpointer = getelementptr i32* %p, i32 %j %qj = getelementptr i32* %q, i32 %j store i32 0, i32* %p - store i32 0, i32* %pi - store i32 0, i32* %pj + store i32 0, i32* %Ipointer + store i32 0, i32* %Jpointer store i32 0, i32* %q store i32 0, i32* %qi store i32 0, i32* %qj Modified: llvm/trunk/test/Analysis/ScalarEvolution/2007-08-06-Unsigned.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/2007-08-06-Unsigned.ll?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/Analysis/ScalarEvolution/2007-08-06-Unsigned.ll (original) +++ llvm/trunk/test/Analysis/ScalarEvolution/2007-08-06-Unsigned.ll Tue Nov 27 22:57:00 2007 @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -scalar-evolution -analyze |& grep "Loop bb: ( -1 + ( -1 * %x) + %y) iterations!" +; RUN: llvm-as < %s | opt -scalar-evolution -analyze |& grep {Loop bb: ( -1 + ( -1 \\* %x) + %y) iterations!} ; PR1597 define i32 @f(i32 %x, i32 %y) { Modified: llvm/trunk/test/Assembler/2002-07-25-ParserAssertionFailure.llx URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2002-07-25-ParserAssertionFailure.llx?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/Assembler/2002-07-25-ParserAssertionFailure.llx (original) +++ llvm/trunk/test/Assembler/2002-07-25-ParserAssertionFailure.llx Tue Nov 27 22:57:00 2007 @@ -1,6 +1,6 @@ ; Make sure we don't get an assertion failure, even though this is a parse ; error -; RUN: llvm-as < %s -o /dev/null -f |& grep {No arguments} +; RUN: not llvm-as < %s -o /dev/null -f |& grep {No arguments} %ty = type void (i32) Modified: llvm/trunk/test/Assembler/2003-04-15-ConstantInitAssertion.llx URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2003-04-15-ConstantInitAssertion.llx?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/Assembler/2003-04-15-ConstantInitAssertion.llx (original) +++ llvm/trunk/test/Assembler/2003-04-15-ConstantInitAssertion.llx Tue Nov 27 22:57:00 2007 @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s >/dev/null |& grep {Expected type 'i32' for element #0} +; RUN: not llvm-as < %s >/dev/null |& grep {Expected type 'i32' for element #0} ; Test the case of a misformed constant initializer ; This should cause an assembler error, not an assertion failure! constant { i32 } { float 1.0 } Modified: llvm/trunk/test/Assembler/2003-05-21-MalformedShiftCrash.llx URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2003-05-21-MalformedShiftCrash.llx?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/Assembler/2003-05-21-MalformedShiftCrash.llx (original) +++ llvm/trunk/test/Assembler/2003-05-21-MalformedShiftCrash.llx Tue Nov 27 22:57:00 2007 @@ -1,4 +1,4 @@ ; Found by inspection of the code -; RUN: llvm-as < %s > /dev/null |& grep {Logical operator requires integral} +; RUN: not llvm-as < %s > /dev/null |& grep {Logical operator requires integral} global i32 ashr (float 1.0, float 2.0) Modified: llvm/trunk/test/Assembler/2003-05-21-MalformedStructCrash.llx URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2003-05-21-MalformedStructCrash.llx?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/Assembler/2003-05-21-MalformedStructCrash.llx (original) +++ llvm/trunk/test/Assembler/2003-05-21-MalformedStructCrash.llx Tue Nov 27 22:57:00 2007 @@ -1,4 +1,4 @@ ; Found by inspection of the code -; RUN: llvm-as < %s > /dev/null |& grep {Illegal number of init} +; RUN: not llvm-as < %s > /dev/null |& grep {Illegal number of init} global {} { i32 7, float 1.0, i32 7, i32 8 } Modified: llvm/trunk/test/Assembler/2003-11-24-SymbolTableCrash.llx URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2003-11-24-SymbolTableCrash.llx?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/Assembler/2003-11-24-SymbolTableCrash.llx (original) +++ llvm/trunk/test/Assembler/2003-11-24-SymbolTableCrash.llx Tue Nov 27 22:57:00 2007 @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s |& not grep Asserti -; RUN: llvm-as < %s |& grep Redefinition +; RUN: not llvm-as < %s |& not grep Asserti +; RUN: not llvm-as < %s |& grep Redefinition define void @test() { %tmp.1 = add i32 0, 1 Modified: llvm/trunk/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx (original) +++ llvm/trunk/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx Tue Nov 27 22:57:00 2007 @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s -o /dev/null -f |& grep {Undefined type remains} +; RUN: not llvm-as < %s -o /dev/null -f |& grep {Undefined type remains} ; END. @d_reduction_0_dparser_gram = global { Modified: llvm/trunk/test/Assembler/2004-03-30-UnclosedFunctionCrash.llx URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2004-03-30-UnclosedFunctionCrash.llx?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/Assembler/2004-03-30-UnclosedFunctionCrash.llx (original) +++ llvm/trunk/test/Assembler/2004-03-30-UnclosedFunctionCrash.llx Tue Nov 27 22:57:00 2007 @@ -1,3 +1,3 @@ -; RUN: llvm-as %s |& grep error +; RUN: not llvm-as %s |& grep error void %foo() { Modified: llvm/trunk/test/Assembler/2006-05-26-VarargsCallEncode.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2006-05-26-VarargsCallEncode.ll?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/Assembler/2006-05-26-VarargsCallEncode.ll (original) +++ llvm/trunk/test/Assembler/2006-05-26-VarargsCallEncode.ll Tue Nov 27 22:57:00 2007 @@ -1,9 +1,8 @@ -; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | \ -; RUN: grep {tail call void.*sret null} +; RUN: llvm-as < %s | llvm-dis | grep {tail call void.*sret null} -declare csretcc void %foo({}*, ...) +declare void @foo({ }* sret , ...) -void %bar() { - tail call csretcc void({}*, ...)* %foo({}* null, int 0) - ret void +define void @bar() { + tail call void ({ }* sret , ...)* @foo( { }* null sret , i32 0 ) + ret void } Modified: llvm/trunk/test/Assembler/2006-09-28-CrashOnInvalid.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2006-09-28-CrashOnInvalid.ll?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/Assembler/2006-09-28-CrashOnInvalid.ll (original) +++ llvm/trunk/test/Assembler/2006-09-28-CrashOnInvalid.ll Tue Nov 27 22:57:00 2007 @@ -1,6 +1,6 @@ ; Test for PR902. This program is erroneous, but should not crash llvm-as. ; This tests that a simple error is caught and processed correctly. -; RUN: llvm-as < %s >/dev/null |& grep {FP constant invalid for type} +; RUN: not llvm-as < %s >/dev/null |& grep {FP constant invalid for type} define void @test() { add i32 1, 2.0 Modified: llvm/trunk/test/Assembler/2007-01-02-Undefined-Arg-Type.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2007-01-02-Undefined-Arg-Type.ll?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/Assembler/2007-01-02-Undefined-Arg-Type.ll (original) +++ llvm/trunk/test/Assembler/2007-01-02-Undefined-Arg-Type.ll Tue Nov 27 22:57:00 2007 @@ -1,5 +1,5 @@ ; The assembler should catch an undefined argument type . -; RUN: llvm-as < %s -o /dev/null -f |& grep {Reference to abstract argument} +; RUN: not llvm-as < %s -o /dev/null -f |& grep {Reference to abstract argument} ; %typedef.bc_struct = type opaque Modified: llvm/trunk/test/Assembler/2007-01-16-CrashOnBadCast.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2007-01-16-CrashOnBadCast.ll?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/Assembler/2007-01-16-CrashOnBadCast.ll (original) +++ llvm/trunk/test/Assembler/2007-01-16-CrashOnBadCast.ll Tue Nov 27 22:57:00 2007 @@ -1,5 +1,5 @@ ; PR1117 -; RUN: llvm-as < %s -o /dev/null -f |& grep {invalid cast opcode for cast from} +; RUN: not llvm-as < %s -o /dev/null -f |& grep {invalid cast opcode for cast from} define i8* @nada(i64 %X) { %result = trunc i64 %X to i8* Modified: llvm/trunk/test/Assembler/2007-01-16-CrashOnBadCast2.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2007-01-16-CrashOnBadCast2.ll?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/Assembler/2007-01-16-CrashOnBadCast2.ll (original) +++ llvm/trunk/test/Assembler/2007-01-16-CrashOnBadCast2.ll Tue Nov 27 22:57:00 2007 @@ -1,4 +1,4 @@ ; PR1117 -; RUN: llvm-as < %s -o /dev/null -f |& grep {invalid cast opcode for cast from} +; RUN: not llvm-as < %s -o /dev/null -f |& grep {invalid cast opcode for cast from} @X = constant i8* trunc (i64 0 to i8*) Modified: llvm/trunk/test/Assembler/2007-01-21-UpgradeNoArgs.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2007-01-21-UpgradeNoArgs.ll?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/Assembler/2007-01-21-UpgradeNoArgs.ll (original) +++ llvm/trunk/test/Assembler/2007-01-21-UpgradeNoArgs.ll Tue Nov 27 22:57:00 2007 @@ -1,6 +1,6 @@ ; Make sure we don't get an assertion failure, even though this is a parse ; error -; RUN: llvm-upgrade < %s > /dev/null |& grep {No arguments passed to a } +; RUN: not llvm-upgrade < %s > /dev/null |& grep {No arguments passed to a } %ty = type void (int) Modified: llvm/trunk/test/Assembler/2007-01-22-UpgradeMalformedShift.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2007-01-22-UpgradeMalformedShift.ll?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/Assembler/2007-01-22-UpgradeMalformedShift.ll (original) +++ llvm/trunk/test/Assembler/2007-01-22-UpgradeMalformedShift.ll Tue Nov 27 22:57:00 2007 @@ -1,4 +1,4 @@ ; Found by inspection of the code -; RUN: llvm-upgrade < %s > /dev/null |& grep {Shift constant expression} +; RUN: not llvm-upgrade < %s > /dev/null |& grep {Shift constant expression} global int shr (float 1.0, ubyte 2) Modified: llvm/trunk/test/Assembler/2007-01-22-UpgradeMalformedStruct.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2007-01-22-UpgradeMalformedStruct.ll?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/Assembler/2007-01-22-UpgradeMalformedStruct.ll (original) +++ llvm/trunk/test/Assembler/2007-01-22-UpgradeMalformedStruct.ll Tue Nov 27 22:57:00 2007 @@ -1,4 +1,4 @@ ; Found by inspection of the code -; RUN: llvm-upgrade < %s > /dev/null |& grep {Illegal number of init} +; RUN: not llvm-upgrade < %s > /dev/null |& grep {Illegal number of init} global {} { int 7, float 1.0, int 7, int 8 } Modified: llvm/trunk/test/Assembler/2007-01-22-UpgradeTypeMapInvalidMemory.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2007-01-22-UpgradeTypeMapInvalidMemory.ll?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/Assembler/2007-01-22-UpgradeTypeMapInvalidMemory.ll (original) +++ llvm/trunk/test/Assembler/2007-01-22-UpgradeTypeMapInvalidMemory.ll Tue Nov 27 22:57:00 2007 @@ -1,4 +1,4 @@ -; RUN: llvm-upgrade < %s -o /dev/null -f |& grep {Reference to an undef} +; RUN: not llvm-upgrade < %s -o /dev/null -f |& grep {Reference to an undef} ; END. %d_reduction_0_dparser_gram = global { int (sbyte*, sbyte**, int, int, { %struct.Grammar*, void (\4, %struct.d_loc_t*, sbyte**)*, %struct.D_Scope*, void (\4)*, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, int, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, int, int, int, int, int, int, int, int, int, int, int, int }*)*, int (sbyte*, sbyte**, int, int, { %struct.Grammar*, void (\4, %struct.d_loc_t*, sbyte**)*, %struct.D_Scope*, void (\4)*, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, int, { int, %struct.d_loc_t, sbyt! e*, sbyte*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, int, int, int, int, int, int, int, int, int, int, int, int }*)** } { int (sbyte*, sbyte**, int, int, { %struct.Grammar*, void (\4, %struct.d_loc_t*, sbyte**)*, %struct.D_Scope*, void (\4)*, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, int, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, int, int, int, int, int, int, int, int, int, int, i! nt, int }*)* null, int (sbyte*, sbyte**, int, int, { %struct.G! rammar*, void (\4, %struct.d_loc_t*, sbyte**)*, %struct.D_Scope*, void (\4)*, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, int, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, int, int, int, int, int, int, int, int, int, int, int, int }*)** null } Modified: llvm/trunk/test/Assembler/2007-03-18-InvalidNumberedVar.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2007-03-18-InvalidNumberedVar.ll?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/Assembler/2007-03-18-InvalidNumberedVar.ll (original) +++ llvm/trunk/test/Assembler/2007-03-18-InvalidNumberedVar.ll Tue Nov 27 22:57:00 2007 @@ -1,5 +1,5 @@ ; PR 1258 -; RUN: llvm-as < %s >/dev/null -f |& grep {Numbered.*does not match} +; RUN: not llvm-as < %s >/dev/null -f |& grep {Numbered.*does not match} define i32 @test1(i32 %a, i32 %b) { entry: Modified: llvm/trunk/test/Assembler/2007-04-15-BadIntrinsic.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2007-04-15-BadIntrinsic.ll?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/Assembler/2007-04-15-BadIntrinsic.ll (original) +++ llvm/trunk/test/Assembler/2007-04-15-BadIntrinsic.ll Tue Nov 27 22:57:00 2007 @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s -o /dev/null -f |& grep {Call to invalid LLVM intrinsic} +; RUN: not llvm-as < %s -o /dev/null -f |& grep {Call to invalid LLVM intrinsic} declare i32 @llvm.foobar(i32 %foo) Modified: llvm/trunk/test/Assembler/2007-04-20-AlignedStore.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2007-04-20-AlignedStore.ll?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/Assembler/2007-04-20-AlignedStore.ll (original) +++ llvm/trunk/test/Assembler/2007-04-20-AlignedStore.ll Tue Nov 27 22:57:00 2007 @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s |& llvm-dis | grep 'align 1024' +; RUN: llvm-as < %s |& llvm-dis | grep {align 1024} define void @test(i32* %arg) { entry: Modified: llvm/trunk/test/Assembler/2007-08-06-AliasInvalid.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2007-08-06-AliasInvalid.ll?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/Assembler/2007-08-06-AliasInvalid.ll (original) +++ llvm/trunk/test/Assembler/2007-08-06-AliasInvalid.ll Tue Nov 27 22:57:00 2007 @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s > /dev/null |& grep {Invalid type for reference to global} +; RUN: not llvm-as < %s > /dev/null |& grep {Invalid type for reference to global} ; PR1577 @anInt = global i32 1 alias i32 @anAlias Modified: llvm/trunk/test/CFrontend/2006-09-21-IncompleteElementType.c URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CFrontend/2006-09-21-IncompleteElementType.c?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/CFrontend/2006-09-21-IncompleteElementType.c (original) +++ llvm/trunk/test/CFrontend/2006-09-21-IncompleteElementType.c Tue Nov 27 22:57:00 2007 @@ -1,3 +1,3 @@ -// RUN: %llvmgcc %s -S -o /dev/null |& not grep {internal compiler error} +// RUN: not %llvmgcc %s -S -o /dev/null |& not grep {internal compiler error} struct A X[(927 - 37) / sizeof(struct A)]; Modified: llvm/trunk/test/CFrontend/2007-10-01-BuildArrayRef.c URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CFrontend/2007-10-01-BuildArrayRef.c?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/CFrontend/2007-10-01-BuildArrayRef.c (original) +++ llvm/trunk/test/CFrontend/2007-10-01-BuildArrayRef.c Tue Nov 27 22:57:00 2007 @@ -1,4 +1,4 @@ -// RUN: %llvmgcc -S %s -o /dev/null |& grep "error: assignment of read-only location" +// RUN: not %llvmgcc -S %s -o /dev/null |& grep "error: assignment of read-only location" // PR 1603 int func() { Modified: llvm/trunk/test/CodeGen/ARM/2007-03-13-InstrSched.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2007-03-13-InstrSched.ll?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/ARM/2007-03-13-InstrSched.ll (original) +++ llvm/trunk/test/CodeGen/ARM/2007-03-13-InstrSched.ll Tue Nov 27 22:57:00 2007 @@ -1,5 +1,6 @@ ; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin -relocation-model=pic \ ; RUN: -mattr=+v6 -stats |& grep asm-printer | grep 41 +; XFAIL: * define void @test(i32 %tmp56222, i32 %tmp36224, i32 %tmp46223, i32 %i.0196.0.ph, i32 %tmp8, i32* %tmp1011, i32** %tmp1, i32* %d2.1.out, i32* %d3.1.out, i32* %d0.1.out, i32* %d1.1.out) { newFuncRoot: Modified: llvm/trunk/test/CodeGen/ARM/fp.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/fp.ll?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/ARM/fp.ll (original) +++ llvm/trunk/test/CodeGen/ARM/fp.ll Tue Nov 27 22:57:00 2007 @@ -9,6 +9,7 @@ ; RUN: grep fuitod %t ; RUN: grep fuitos %t ; RUN: grep 1065353216 %t +; XFAIL: * float %f(int %a) { entry: Modified: llvm/trunk/test/CodeGen/ARM/lsr-code-insertion.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/lsr-code-insertion.ll?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/ARM/lsr-code-insertion.ll (original) +++ llvm/trunk/test/CodeGen/ARM/lsr-code-insertion.ll Tue Nov 27 22:57:00 2007 @@ -7,7 +7,7 @@ ; add r8, r0, r6 ; str r10, [r8, #+4] ; - +; XFAIL: * target triple = "arm-apple-darwin8" define void @foo(i32* %mc, i32* %mpp, i32* %ip, i32* %dpp, i32* %tpmm, i32 %M, i32* %tpim, i32* %tpdm, i32* %bp, i32* %ms, i32 %xmb) { Modified: llvm/trunk/test/ExecutionEngine/2004-12-04-LazyCompileFuncs.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2004-12-04-LazyCompileFuncs.ll?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/ExecutionEngine/2004-12-04-LazyCompileFuncs.ll (original) +++ llvm/trunk/test/ExecutionEngine/2004-12-04-LazyCompileFuncs.ll Tue Nov 27 22:57:00 2007 @@ -1,33 +1,29 @@ -; RUN: llvm-upgrade %s | llvm-as -f -o %t.bc -; RUN: lli -debug-only=jit %t.bc |& not grep {Finished CodeGen of .*Function: F} +; RUN: llvm-as < %s -f -o %t.bc +; RUN: not lli -debug-only=jit %t.bc |& not grep {Finished CodeGen of .*Function: F} + at .str_1 = internal constant [7 x i8] c"IN F!\0A\00" ; <[7 x i8]*> [#uses=1] + at .str_2 = internal constant [7 x i8] c"IN G!\0A\00" ; <[7 x i8]*> [#uses=1] + at Ptrs = internal constant [2 x void (...)*] [ void (...)* bitcast (void ()* @F to void (...)*), void (...)* bitcast (void ()* @G to void (...)*) ] ; <[2 x void (...)*]*> [#uses=1] -%.str_1 = internal constant [7 x sbyte] c"IN F!\0A\00" ; <[7 x sbyte]*> [#uses=1] -%.str_2 = internal constant [7 x sbyte] c"IN G!\0A\00" ; <[7 x sbyte]*> [#uses=1] -%Ptrs = internal constant [2 x void (...)*] [ void (...)* cast (void ()* %F to void (...)*), void (...)* cast (void ()* %G to void (...)*) ] ; <[2 x void (...)*]*> [#uses=1] +declare i32 @printf(i8*, ...) -implementation ; Functions: - -declare int %printf(sbyte*, ...) - -internal void %F() { +define internal void @F() { entry: - %tmp.0 = call int (sbyte*, ...)* %printf( sbyte* getelementptr ([7 x sbyte]* %.str_1, int 0, int 0) ) ; [#uses=0] - ret void + %tmp.0 = call i32 (i8*, ...)* @printf( i8* getelementptr ([7 x i8]* @.str_1, i32 0, i32 0) ) ; [#uses=0] + ret void } -internal void %G() { +define internal void @G() { entry: - %tmp.0 = call int (sbyte*, ...)* %printf( sbyte* getelementptr ([7 x sbyte]* %.str_2, int 0, int 0) ) ; [#uses=0] - ret void + %tmp.0 = call i32 (i8*, ...)* @printf( i8* getelementptr ([7 x i8]* @.str_2, i32 0, i32 0) ) ; [#uses=0] + ret void } -int %main(int %argc, sbyte** %argv) { +define i32 @main(i32 %argc, i8** %argv) { entry: - %tmp.3 = and int %argc, 1 ; [#uses=1] - %tmp.4 = getelementptr [2 x void (...)*]* %Ptrs, int 0, int %tmp.3 ; [#uses=1] - %tmp.5 = load void (...)** %tmp.4 ; [#uses=1] - %tmp.5_c = cast void (...)* %tmp.5 to void ()* ; [#uses=1] - call void %tmp.5_c( ) - ret int undef + %tmp.3 = and i32 %argc, 1 ; [#uses=1] + %tmp.4 = getelementptr [2 x void (...)*]* @Ptrs, i32 0, i32 %tmp.3 ; [#uses=1] + %tmp.5 = load void (...)** %tmp.4 ; [#uses=1] + %tmp.5_c = bitcast void (...)* %tmp.5 to void ()* ; [#uses=1] + call void %tmp.5_c( ) + ret i32 undef } - Modified: llvm/trunk/test/lib/llvm.exp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/lib/llvm.exp?rev=44389&r1=44388&r2=44389&view=diff ============================================================================== --- llvm/trunk/test/lib/llvm.exp (original) +++ llvm/trunk/test/lib/llvm.exp Tue Nov 27 22:57:00 2007 @@ -126,8 +126,8 @@ set runline "$runline$oneline " # if its a terminating RUN: line then do substitution on the whole line - # and then save the line. - } elseif {[regexp {RUN: *([^&]+)(&&)?} $line match oneline suffix]} { + # and then save the line. + } elseif {[regexp {RUN: *(.+)$} $line match oneline suffix]} { set runline "$runline$oneline" set runline [ substitute $runline $test $tmpFile ] set lines($numLines) $runline From tonic at nondot.org Tue Nov 27 23:13:45 2007 From: tonic at nondot.org (Tanya Lattner) Date: Wed, 28 Nov 2007 05:13:45 -0000 Subject: [llvm-commits] [llvm] r44390 - /llvm/trunk/docs/TestingGuide.html Message-ID: <200711280513.lAS5Djmo016344@zion.cs.uiuc.edu> Author: tbrethou Date: Tue Nov 27 23:13:45 2007 New Revision: 44390 URL: http://llvm.org/viewvc/llvm-project?rev=44390&view=rev Log: Modified instructions to configure llvm-test by configure llvm with the Path --with-llvmgccdir set. Modified: llvm/trunk/docs/TestingGuide.html Modified: llvm/trunk/docs/TestingGuide.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/TestingGuide.html?rev=44390&r1=44389&r2=44390&view=diff ============================================================================== --- llvm/trunk/docs/TestingGuide.html (original) +++ llvm/trunk/docs/TestingGuide.html Tue Nov 27 23:13:45 2007 @@ -152,8 +152,9 @@ 
       % cd llvm/projects
 % svn co http://llvm.org/svn/llvm-project/test-suite/trunk llvm-test
-% cd llvm-test
-% ./configure --with-llvmsrc=$LLVM_SRC_ROOT --with-llvmobj=$LLVM_OBJ_ROOT
+% cd ..
+% ./configure --with-llvmgccdir=$LLVM_GCC_DIR
+% cd projects/llvm-test
 % gmake
    @@ -694,37 +695,20 @@

    This will get the test suite into llvm/projects/llvm-test

    -

  • Configure the test suite. You can do this one of two ways:

    - -
      -
    1. Use the regular llvm configure:

      - -
      -
      -% cd $LLVM_OBJ_ROOT ; $LLVM_SRC_ROOT/configure
-
      -
      - -

      This will ensure that the projects/llvm-test directory is - also properly configured.

      2. - -

    2. Use the configure script found in the llvm-test - source directory:

      - +

    3. Configure the test suite using llvm configure. This will automatically configure llvm-test. + You must do it from the top level otherwise llvm-gcc will not be set which is required to + run llvm-test.:

      -% $LLVM_SRC_ROOT/projects/llvm-test/configure \
-  --with-llvmsrc=$LLVM_SRC_ROOT               \
-  --with-llvmobj=$LLVM_OBJ_ROOT
+% cd $LLVM_OBJ_ROOT ; $LLVM_SRC_ROOT/configure --with-llvmgccdir=$LLVM_GCC_DIR
      -
      4. -
  • gmake

    • Note that the second and third steps only need to be done once. After you have the suite checked out and configured, you don't need to do it again (unless -the test code or configure script changes).

    +the test code or configure script changes). $LLVM_GCC_DIR is the path to the LLVM +C/C++ FrontEnd

    To make a specialized test (use one of the llvm-test/TEST.<type>.Makefiles), just run:

    From tonic at nondot.org Tue Nov 27 23:14:49 2007 From: tonic at nondot.org (Tanya Lattner) Date: Wed, 28 Nov 2007 05:14:49 -0000 Subject: [llvm-commits] [llvm] r44391 - /llvm/trunk/docs/TestingGuide.html Message-ID: <200711280514.lAS5EnfH016414@zion.cs.uiuc.edu> Author: tbrethou Date: Tue Nov 27 23:14:49 2007 New Revision: 44391 URL: http://llvm.org/viewvc/llvm-project?rev=44391&view=rev Log: Fix typo Modified: llvm/trunk/docs/TestingGuide.html Modified: llvm/trunk/docs/TestingGuide.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/TestingGuide.html?rev=44391&r1=44390&r2=44391&view=diff ============================================================================== --- llvm/trunk/docs/TestingGuide.html (original) +++ llvm/trunk/docs/TestingGuide.html Tue Nov 27 23:14:49 2007 @@ -697,7 +697,7 @@

  • Configure the test suite using llvm configure. This will automatically configure llvm-test. You must do it from the top level otherwise llvm-gcc will not be set which is required to - run llvm-test.:

    + run llvm-test:

     % cd $LLVM_OBJ_ROOT ; $LLVM_SRC_ROOT/configure --with-llvmgccdir=$LLVM_GCC_DIR




From sabre at nondot.org  Tue Nov 27 23:27:08 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 28 Nov 2007 05:27:08 -0000
Subject: [llvm-commits] [llvm] r44393 - /llvm/trunk/test/CodeGen/ARM/fp.ll
Message-ID: <200711280527.lAS5R8LU017078@zion.cs.uiuc.edu>

Author: lattner
Date: Tue Nov 27 23:27:07 2007
New Revision: 44393

URL: http://llvm.org/viewvc/llvm-project?rev=44393&view=rev
Log:
update this test after the fmrrd fix

Modified:
    llvm/trunk/test/CodeGen/ARM/fp.ll

Modified: llvm/trunk/test/CodeGen/ARM/fp.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/fp.ll?rev=44393&r1=44392&r2=44393&view=diff

==============================================================================
--- llvm/trunk/test/CodeGen/ARM/fp.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/fp.ll Tue Nov 27 23:27:07 2007
@@ -3,13 +3,12 @@
 ; RUN: grep fsitos %t
 ; RUN: grep fmrs %t | count 2
 ; RUN: grep fsitod %t
-; RUN: grep fmrrd %t | count 5
-; RUN: grep fmdrr %t | count 2
+; RUN: grep fmrrd %t | count 3
+; RUN: not grep fmdrr %t 
 ; RUN: grep fldd %t
 ; RUN: grep fuitod %t
 ; RUN: grep fuitos %t
 ; RUN: grep 1065353216 %t
-; XFAIL: *
 
 float %f(int %a) {
 entry:




From sabre at nondot.org  Tue Nov 27 23:37:13 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 28 Nov 2007 05:37:13 -0000
Subject: [llvm-commits] [llvm] r44395 -
	/llvm/trunk/test/CodeGen/Alpha/mul5.ll
Message-ID: <200711280537.lAS5bDuA017581@zion.cs.uiuc.edu>

Author: lattner
Date: Tue Nov 27 23:37:13 2007
New Revision: 44395

URL: http://llvm.org/viewvc/llvm-project?rev=44395&view=rev
Log:
xfail a test

Modified:
    llvm/trunk/test/CodeGen/Alpha/mul5.ll

Modified: llvm/trunk/test/CodeGen/Alpha/mul5.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Alpha/mul5.ll?rev=44395&r1=44394&r2=44395&view=diff

==============================================================================
--- llvm/trunk/test/CodeGen/Alpha/mul5.ll (original)
+++ llvm/trunk/test/CodeGen/Alpha/mul5.ll Tue Nov 27 23:37:13 2007
@@ -1,6 +1,7 @@
 ; Make sure this testcase does not use mulq
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | \
 ; RUN:   not grep -i mul
+; XFAIL: *
 
 implementation   ; Functions:
 




From clattner at apple.com  Tue Nov 27 23:37:38 2007
From: clattner at apple.com (Chris Lattner)
Date: Tue, 27 Nov 2007 21:37:38 -0800
Subject: [llvm-commits] [llvm] r44370 - in /llvm/trunk:
	lib/Target/Alpha/AlphaInstrInfo.td	test/CodeGen/Alpha/2007-11-27-mulneg3.ll
In-Reply-To: <16e5fdf90711271357y565fd898xace737dffcc3c27@mail.gmail.com>
References: <200711271831.lARIVXcp012624@zion.cs.uiuc.edu>
	<16e5fdf90711271357y565fd898xace737dffcc3c27@mail.gmail.com>
Message-ID: <9F767159-326D-44F8-9E9A-67B387A02989@apple.com>

Andrew, I xfailed your test.  If you prefer to remove it, please do,  
otherwise please fix :)

-Chris

On Nov 27, 2007, at 1:57 PM, Bill Wendling wrote:

> Hi Andrew,
>
> I'm getting this failure now:
>
> FAIL: /Volumes/Gir/devel/llvm/llvm.src/test/CodeGen/Alpha/mul5.ll
> Failed with exit(1) at line 1
> while running: llvm-upgrade <
> /Volumes/Gir/devel/llvm/llvm.src/test/CodeGen/Alpha/mul5.ll | llvm-as
> | llc -march=alpha |  not grep -i mul
> 	mulq $16,$0,$0
> 	mulq $16,252,$0
> 	mulq $16,$0,$0
> child process exited abnormally
>
> Do you think that it's related to your patch?
>
> -bw
>
> On Nov 27, 2007 10:31 AM, Andrew Lenharth   
> wrote:
>> Author: alenhar2
>> Date: Tue Nov 27 12:31:30 2007
>> New Revision: 44370
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=44370&view=rev
>> Log:
>> something wrong with this opt
>>
>> Added:
>>    llvm/trunk/test/CodeGen/Alpha/2007-11-27-mulneg3.ll
>> Modified:
>>    llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.td
>>
>> Modified: llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.td
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.td?rev=44370&r1=44369&r2=44370&view=diff
>>
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.td (original)
>> +++ llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.td Tue Nov 27  
>> 12:31:30 2007
>> @@ -1086,16 +1086,18 @@
>>           (ADDQr (SLr GPRC:$RA, (nearP2X immRemP2:$imm)), (SLi GPRC: 
>> $RA, (nearP2RemX immRemP2:$imm)))>;
>>
>> //n is below a power of 2
>> -def : Pat<(mul GPRC:$RA, immRem1n:$imm),
>> -          (SUBQr (SLr GPRC:$RA, (nearP2X immRem1n:$imm)), GPRC: 
>> $RA)>;
>> -def : Pat<(mul GPRC:$RA, immRem2n:$imm),
>> -          (SUBQr (SLr GPRC:$RA, (nearP2X immRem2n:$imm)), (ADDQr  
>> GPRC:$RA, GPRC:$RA))>;
>> -def : Pat<(mul GPRC:$RA, immRem3n:$imm),
>> -          (SUBQr (SLr GPRC:$RA, (nearP2X immRem3n:$imm)), (S4SUBQr  
>> GPRC:$RA, GPRC:$RA))>;
>> -def : Pat<(mul GPRC:$RA, immRem4n:$imm),
>> -          (SUBQr (SLr GPRC:$RA, (nearP2X immRem4n:$imm)), (SLi  
>> GPRC:$RA, 2))>;
>> -def : Pat<(mul GPRC:$RA, immRem5n:$imm),
>> -          (SUBQr (SLr GPRC:$RA, (nearP2X immRem5n:$imm)), (S4ADDQr  
>> GPRC:$RA, GPRC:$RA))>;
>> -def : Pat<(mul GPRC:$RA, immRemP2n:$imm),
>> -          (SUBQr (SLr GPRC:$RA, (nearP2X immRemP2n:$imm)), (SLi  
>> GPRC:$RA, (nearP2RemX immRemP2n:$imm)))>;
>> +//FIXME: figure out why something is truncating the imm to 32bits
>> +// this will fix 2007-11-27-mulneg3
>> +//def : Pat<(mul GPRC:$RA, immRem1n:$imm),
>> +//          (SUBQr (SLr GPRC:$RA, (nearP2X immRem1n:$imm)), GPRC: 
>> $RA)>;
>> +//def : Pat<(mul GPRC:$RA, immRem2n:$imm),
>> +//          (SUBQr (SLr GPRC:$RA, (nearP2X immRem2n:$imm)), (ADDQr  
>> GPRC:$RA, GPRC:$RA))>;
>> +//def : Pat<(mul GPRC:$RA, immRem3n:$imm),
>> +//          (SUBQr (SLr GPRC:$RA, (nearP2X immRem3n:$imm)),  
>> (S4SUBQr GPRC:$RA, GPRC:$RA))>;
>> +//def : Pat<(mul GPRC:$RA, immRem4n:$imm),
>> +//          (SUBQr (SLr GPRC:$RA, (nearP2X immRem4n:$imm)), (SLi  
>> GPRC:$RA, 2))>;
>> +//def : Pat<(mul GPRC:$RA, immRem5n:$imm),
>> +//          (SUBQr (SLr GPRC:$RA, (nearP2X immRem5n:$imm)),  
>> (S4ADDQr GPRC:$RA, GPRC:$RA))>;
>> +//def : Pat<(mul GPRC:$RA, immRemP2n:$imm),
>> +//          (SUBQr (SLr GPRC:$RA, (nearP2X immRemP2n:$imm)), (SLi  
>> GPRC:$RA, (nearP2RemX immRemP2n:$imm)))>;
>> } //Added complexity
>>
>> Added: llvm/trunk/test/CodeGen/Alpha/2007-11-27-mulneg3.ll
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Alpha/2007-11-27-mulneg3.ll?rev=44370&view=auto
>>
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> =====================================================================
>> --- llvm/trunk/test/CodeGen/Alpha/2007-11-27-mulneg3.ll (added)
>> +++ llvm/trunk/test/CodeGen/Alpha/2007-11-27-mulneg3.ll Tue Nov 27  
>> 12:31:30 2007
>> @@ -0,0 +1,13 @@
>> +; RUN: llvm-as < %s | llc -march=alpha
>> +
>> +;FIXME: this should produce no mul inst.  But not crashing will  
>> have to do for now
>> +
>> +; ModuleID = 'Output/bugpoint-train/bugpoint-reduced-simplified.bc'
>> +target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16- 
>> i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128- 
>> a0:0:64-f128:128:128"
>> +target triple = "alphaev6-unknown-linux-gnu"
>> +
>> +define fastcc i32 @getcount(i32 %s) {
>> +cond_next43:           ; preds = %bb27
>> +       %tmp431 = mul i32 %s, -3
>> +       ret i32 %tmp431
>> +}
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From baldrick at free.fr  Wed Nov 28 04:13:40 2007
From: baldrick at free.fr (Duncan Sands)
Date: Wed, 28 Nov 2007 10:13:40 -0000
Subject: [llvm-commits] [llvm] r44399 - in /llvm/trunk:
 include/llvm/CodeGen/MachineLoopInfo.h lib/CodeGen/MachineLoopInfo.cpp
Message-ID: <200711281013.lASADePe005529@zion.cs.uiuc.edu>

Author: baldrick
Date: Wed Nov 28 04:13:38 2007
New Revision: 44399

URL: http://llvm.org/viewvc/llvm-project?rev=44399&view=rev
Log:
Add missing newlines at EOF.

Modified:
    llvm/trunk/include/llvm/CodeGen/MachineLoopInfo.h
    llvm/trunk/lib/CodeGen/MachineLoopInfo.cpp

Modified: llvm/trunk/include/llvm/CodeGen/MachineLoopInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineLoopInfo.h?rev=44399&r1=44398&r2=44399&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/MachineLoopInfo.h (original)
+++ llvm/trunk/include/llvm/CodeGen/MachineLoopInfo.h Wed Nov 28 04:13:38 2007
@@ -200,4 +200,4 @@
 // Make sure that any clients of this file link in LoopInfo.cpp
 FORCE_DEFINING_FILE_TO_BE_LINKED(MachineLoopInfo)
 
-#endif
\ No newline at end of file
+#endif

Modified: llvm/trunk/lib/CodeGen/MachineLoopInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineLoopInfo.cpp?rev=44399&r1=44398&r2=44399&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/MachineLoopInfo.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachineLoopInfo.cpp Wed Nov 28 04:13:38 2007
@@ -38,4 +38,4 @@
 }
 
 // Ensure this file gets linked when MachineLoopInfo.h is used.
-DEFINING_FILE_FOR(MachineLoopInfo)
\ No newline at end of file
+DEFINING_FILE_FOR(MachineLoopInfo)




From baldrick at free.fr  Wed Nov 28 04:36:21 2007
From: baldrick at free.fr (Duncan Sands)
Date: Wed, 28 Nov 2007 10:36:21 -0000
Subject: [llvm-commits] [llvm] r44400 -
	/llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp
Message-ID: <200711281036.lASAaMM0006642@zion.cs.uiuc.edu>

Author: baldrick
Date: Wed Nov 28 04:36:19 2007
New Revision: 44400

URL: http://llvm.org/viewvc/llvm-project?rev=44400&view=rev
Log:
My compiler complains that "x always evaluates to true"
in this call:

	Result.IntVal = APInt(80, 2, x);

What is x?

	uint16_t x[8];

I deduce that the APInt constructor being used is this one:

  APInt(uint32_t numBits, uint64_t val, bool isSigned = false);

rather than this one:

  APInt(uint32_t numBits, uint32_t numWords, const uint64_t bigVal[]);

That doesn't seem right!  This fix compiles but is otherwise completely
untested.

Modified:
    llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp

Modified: llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp?rev=44400&r1=44399&r2=44400&view=diff

==============================================================================
--- llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp Wed Nov 28 04:36:19 2007
@@ -712,13 +712,17 @@
     break;
   case Type::X86_FP80TyID: {
     // This is endian dependent, but it will only work on x86 anyway.
-    uint16_t x[8], *p = (uint16_t*)Ptr;
+    uint16_t *p = (uint16_t*)Ptr;
+    union {
+      uint16_t x[8];
+      uint64_t y[2];
+    };
     x[0] = p[1];
     x[1] = p[2];
     x[2] = p[3];
     x[3] = p[4];
     x[4] = p[0];
-    Result.IntVal = APInt(80, 2, x);
+    Result.IntVal = APInt(80, 2, y);
     break;
   }
   default:




From baldrick at free.fr  Wed Nov 28 09:36:28 2007
From: baldrick at free.fr (Duncan Sands)
Date: Wed, 28 Nov 2007 15:36:28 -0000
Subject: [llvm-commits] [llvm] r44401 -
 /llvm/trunk/test/ExecutionEngine/2004-12-04-LazyCompileFuncs.ll
Message-ID: <200711281536.lASFaSsr019895@zion.cs.uiuc.edu>

Author: baldrick
Date: Wed Nov 28 09:36:27 2007
New Revision: 44401

URL: http://llvm.org/viewvc/llvm-project?rev=44401&view=rev
Log:
This test somehow got an extra "not" during the
recent stderr updates.

Modified:
    llvm/trunk/test/ExecutionEngine/2004-12-04-LazyCompileFuncs.ll

Modified: llvm/trunk/test/ExecutionEngine/2004-12-04-LazyCompileFuncs.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2004-12-04-LazyCompileFuncs.ll?rev=44401&r1=44400&r2=44401&view=diff

==============================================================================
--- llvm/trunk/test/ExecutionEngine/2004-12-04-LazyCompileFuncs.ll (original)
+++ llvm/trunk/test/ExecutionEngine/2004-12-04-LazyCompileFuncs.ll Wed Nov 28 09:36:27 2007
@@ -1,5 +1,5 @@
-; RUN:  llvm-as < %s -f -o %t.bc
-; RUN: not lli -debug-only=jit %t.bc |& not grep {Finished CodeGen of .*Function: F}
+; RUN: llvm-as < %s -f -o %t.bc
+; RUN: lli -debug-only=jit %t.bc |& not grep {Finished CodeGen of .*Function: F}
 @.str_1 = internal constant [7 x i8] c"IN F!\0A\00"             ; <[7 x i8]*> [#uses=1]
 @.str_2 = internal constant [7 x i8] c"IN G!\0A\00"             ; <[7 x i8]*> [#uses=1]
 @Ptrs = internal constant [2 x void (...)*] [ void (...)* bitcast (void ()* @F to void (...)*), void (...)* bitcast (void ()* @G to void (...)*) ]           ; <[2 x void (...)*]*> [#uses=1]




From andrewl at lenharth.org  Wed Nov 28 10:37:53 2007
From: andrewl at lenharth.org (Andrew Lenharth)
Date: Wed, 28 Nov 2007 10:37:53 -0600
Subject: [llvm-commits] [llvm] r44370 - in /llvm/trunk:
	lib/Target/Alpha/AlphaInstrInfo.td
	test/CodeGen/Alpha/2007-11-27-mulneg3.ll
In-Reply-To: <9F767159-326D-44F8-9E9A-67B387A02989@apple.com>
References: <200711271831.lARIVXcp012624@zion.cs.uiuc.edu>
	<16e5fdf90711271357y565fd898xace737dffcc3c27@mail.gmail.com>
	<9F767159-326D-44F8-9E9A-67B387A02989@apple.com>
Message-ID: <85dfcd7f0711280837wd09cbafvd5669fce4d677560@mail.gmail.com>

Yea, I'll remove the offending lines soon.

On 11/27/07, Chris Lattner  wrote:
> Andrew, I xfailed your test.  If you prefer to remove it, please do,
> otherwise please fix :)
>
> -Chris
>
> On Nov 27, 2007, at 1:57 PM, Bill Wendling wrote:
>
> > Hi Andrew,
> >
> > I'm getting this failure now:
> >
> > FAIL: /Volumes/Gir/devel/llvm/llvm.src/test/CodeGen/Alpha/mul5.ll
> > Failed with exit(1) at line 1
> > while running: llvm-upgrade <
> > /Volumes/Gir/devel/llvm/llvm.src/test/CodeGen/Alpha/mul5.ll | llvm-as
> > | llc -march=alpha |  not grep -i mul
> >       mulq $16,$0,$0
> >       mulq $16,252,$0
> >       mulq $16,$0,$0
> > child process exited abnormally
> >
> > Do you think that it's related to your patch?
> >
> > -bw
> >
> > On Nov 27, 2007 10:31 AM, Andrew Lenharth 
> > wrote:
> >> Author: alenhar2
> >> Date: Tue Nov 27 12:31:30 2007
> >> New Revision: 44370
> >>
> >> URL: http://llvm.org/viewvc/llvm-project?rev=44370&view=rev
> >> Log:
> >> something wrong with this opt
> >>
> >> Added:
> >>    llvm/trunk/test/CodeGen/Alpha/2007-11-27-mulneg3.ll
> >> Modified:
> >>    llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.td
> >>
> >> Modified: llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.td
> >> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.td?rev=44370&r1=44369&r2=44370&view=diff
> >>
> >> =
> >> =
> >> =
> >> =
> >> =
> >> =
> >> =
> >> =
> >> =
> >> =====================================================================
> >> --- llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.td (original)
> >> +++ llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.td Tue Nov 27
> >> 12:31:30 2007
> >> @@ -1086,16 +1086,18 @@
> >>           (ADDQr (SLr GPRC:$RA, (nearP2X immRemP2:$imm)), (SLi GPRC:
> >> $RA, (nearP2RemX immRemP2:$imm)))>;
> >>
> >> //n is below a power of 2
> >> -def : Pat<(mul GPRC:$RA, immRem1n:$imm),
> >> -          (SUBQr (SLr GPRC:$RA, (nearP2X immRem1n:$imm)), GPRC:
> >> $RA)>;
> >> -def : Pat<(mul GPRC:$RA, immRem2n:$imm),
> >> -          (SUBQr (SLr GPRC:$RA, (nearP2X immRem2n:$imm)), (ADDQr
> >> GPRC:$RA, GPRC:$RA))>;
> >> -def : Pat<(mul GPRC:$RA, immRem3n:$imm),
> >> -          (SUBQr (SLr GPRC:$RA, (nearP2X immRem3n:$imm)), (S4SUBQr
> >> GPRC:$RA, GPRC:$RA))>;
> >> -def : Pat<(mul GPRC:$RA, immRem4n:$imm),
> >> -          (SUBQr (SLr GPRC:$RA, (nearP2X immRem4n:$imm)), (SLi
> >> GPRC:$RA, 2))>;
> >> -def : Pat<(mul GPRC:$RA, immRem5n:$imm),
> >> -          (SUBQr (SLr GPRC:$RA, (nearP2X immRem5n:$imm)), (S4ADDQr
> >> GPRC:$RA, GPRC:$RA))>;
> >> -def : Pat<(mul GPRC:$RA, immRemP2n:$imm),
> >> -          (SUBQr (SLr GPRC:$RA, (nearP2X immRemP2n:$imm)), (SLi
> >> GPRC:$RA, (nearP2RemX immRemP2n:$imm)))>;
> >> +//FIXME: figure out why something is truncating the imm to 32bits
> >> +// this will fix 2007-11-27-mulneg3
> >> +//def : Pat<(mul GPRC:$RA, immRem1n:$imm),
> >> +//          (SUBQr (SLr GPRC:$RA, (nearP2X immRem1n:$imm)), GPRC:
> >> $RA)>;
> >> +//def : Pat<(mul GPRC:$RA, immRem2n:$imm),
> >> +//          (SUBQr (SLr GPRC:$RA, (nearP2X immRem2n:$imm)), (ADDQr
> >> GPRC:$RA, GPRC:$RA))>;
> >> +//def : Pat<(mul GPRC:$RA, immRem3n:$imm),
> >> +//          (SUBQr (SLr GPRC:$RA, (nearP2X immRem3n:$imm)),
> >> (S4SUBQr GPRC:$RA, GPRC:$RA))>;
> >> +//def : Pat<(mul GPRC:$RA, immRem4n:$imm),
> >> +//          (SUBQr (SLr GPRC:$RA, (nearP2X immRem4n:$imm)), (SLi
> >> GPRC:$RA, 2))>;
> >> +//def : Pat<(mul GPRC:$RA, immRem5n:$imm),
> >> +//          (SUBQr (SLr GPRC:$RA, (nearP2X immRem5n:$imm)),
> >> (S4ADDQr GPRC:$RA, GPRC:$RA))>;
> >> +//def : Pat<(mul GPRC:$RA, immRemP2n:$imm),
> >> +//          (SUBQr (SLr GPRC:$RA, (nearP2X immRemP2n:$imm)), (SLi
> >> GPRC:$RA, (nearP2RemX immRemP2n:$imm)))>;
> >> } //Added complexity
> >>
> >> Added: llvm/trunk/test/CodeGen/Alpha/2007-11-27-mulneg3.ll
> >> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Alpha/2007-11-27-mulneg3.ll?rev=44370&view=auto
> >>
> >> =
> >> =
> >> =
> >> =
> >> =
> >> =
> >> =
> >> =
> >> =
> >> =====================================================================
> >> --- llvm/trunk/test/CodeGen/Alpha/2007-11-27-mulneg3.ll (added)
> >> +++ llvm/trunk/test/CodeGen/Alpha/2007-11-27-mulneg3.ll Tue Nov 27
> >> 12:31:30 2007
> >> @@ -0,0 +1,13 @@
> >> +; RUN: llvm-as < %s | llc -march=alpha
> >> +
> >> +;FIXME: this should produce no mul inst.  But not crashing will
> >> have to do for now
> >> +
> >> +; ModuleID = 'Output/bugpoint-train/bugpoint-reduced-simplified.bc'
> >> +target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-
> >> i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-
> >> a0:0:64-f128:128:128"
> >> +target triple = "alphaev6-unknown-linux-gnu"
> >> +
> >> +define fastcc i32 @getcount(i32 %s) {
> >> +cond_next43:           ; preds = %bb27
> >> +       %tmp431 = mul i32 %s, -3
> >> +       ret i32 %tmp431
> >> +}
> >>
> >>
> >> _______________________________________________
> >> llvm-commits mailing list
> >> llvm-commits at cs.uiuc.edu
> >> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
> >>
> > _______________________________________________
> > llvm-commits mailing list
> > llvm-commits at cs.uiuc.edu
> > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
>


From baldrick at free.fr  Wed Nov 28 10:50:29 2007
From: baldrick at free.fr (Duncan Sands)
Date: Wed, 28 Nov 2007 16:50:29 -0000
Subject: [llvm-commits] [llvm] r44402 -
 /llvm/trunk/test/ExecutionEngine/2004-12-04-LazyCompileFuncs.ll
Message-ID: <200711281650.lASGoTLC023142@zion.cs.uiuc.edu>

Author: baldrick
Date: Wed Nov 28 10:50:29 2007
New Revision: 44402

URL: http://llvm.org/viewvc/llvm-project?rev=44402&view=rev
Log:
Revert previous "fix" - the breakage was due to some
local changes, not the "not".

Modified:
    llvm/trunk/test/ExecutionEngine/2004-12-04-LazyCompileFuncs.ll

Modified: llvm/trunk/test/ExecutionEngine/2004-12-04-LazyCompileFuncs.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2004-12-04-LazyCompileFuncs.ll?rev=44402&r1=44401&r2=44402&view=diff

==============================================================================
--- llvm/trunk/test/ExecutionEngine/2004-12-04-LazyCompileFuncs.ll (original)
+++ llvm/trunk/test/ExecutionEngine/2004-12-04-LazyCompileFuncs.ll Wed Nov 28 10:50:29 2007
@@ -1,5 +1,5 @@
 ; RUN: llvm-as < %s -f -o %t.bc
-; RUN: lli -debug-only=jit %t.bc |& not grep {Finished CodeGen of .*Function: F}
+; RUN: not lli -debug-only=jit %t.bc |& not grep {Finished CodeGen of .*Function: F}
 @.str_1 = internal constant [7 x i8] c"IN F!\0A\00"             ; <[7 x i8]*> [#uses=1]
 @.str_2 = internal constant [7 x i8] c"IN G!\0A\00"             ; <[7 x i8]*> [#uses=1]
 @Ptrs = internal constant [2 x void (...)*] [ void (...)* bitcast (void ()* @F to void (...)*), void (...)* bitcast (void ()* @G to void (...)*) ]           ; <[2 x void (...)*]*> [#uses=1]




From baldrick at free.fr  Wed Nov 28 11:07:05 2007
From: baldrick at free.fr (Duncan Sands)
Date: Wed, 28 Nov 2007 17:07:05 -0000
Subject: [llvm-commits] [llvm] r44403 - in /llvm/trunk: include/llvm/
 include/llvm/Support/ lib/Analysis/ lib/AsmParser/
 lib/CodeGen/SelectionDAG/ lib/ExecutionEngine/Interpreter/ lib/Target/MSIL/
 lib/Transforms/Scalar/ lib/VMCore/ test/Transforms/SimplifyCFG/
 tools/llvm-upgrade/
Message-ID: <200711281707.lASH76qM024097@zion.cs.uiuc.edu>

Author: baldrick
Date: Wed Nov 28 11:07:01 2007
New Revision: 44403

URL: http://llvm.org/viewvc/llvm-project?rev=44403&view=rev
Log:
Add some convenience methods for querying attributes, and
use them.

Modified:
    llvm/trunk/include/llvm/Function.h
    llvm/trunk/include/llvm/Instructions.h
    llvm/trunk/include/llvm/Support/CallSite.h
    llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp
    llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs
    llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
    llvm/trunk/lib/ExecutionEngine/Interpreter/Execution.cpp
    llvm/trunk/lib/Target/MSIL/MSILWriter.cpp
    llvm/trunk/lib/Transforms/Scalar/SimplifyCFG.cpp
    llvm/trunk/lib/VMCore/Function.cpp
    llvm/trunk/lib/VMCore/Instructions.cpp
    llvm/trunk/test/Transforms/SimplifyCFG/2007-11-22-InvokeNoUnwind.ll
    llvm/trunk/tools/llvm-upgrade/UpgradeParser.cpp.cvs
    llvm/trunk/tools/llvm-upgrade/UpgradeParser.y.cvs

Modified: llvm/trunk/include/llvm/Function.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Function.h?rev=44403&r1=44402&r2=44403&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Function.h (original)
+++ llvm/trunk/include/llvm/Function.h Wed Nov 28 11:07:01 2007
@@ -21,6 +21,7 @@
 #include "llvm/GlobalValue.h"
 #include "llvm/BasicBlock.h"
 #include "llvm/Argument.h"
+#include "llvm/ParameterAttributes.h"
 #include "llvm/Support/Annotation.h"
 
 namespace llvm {
@@ -152,8 +153,15 @@
   /// @brief Set the parameter attributes.
   void setParamAttrs(const ParamAttrsList *attrs);
 
+  /// @brief Determine whether the function has the given attribute.
+  bool paramHasAttr(uint16_t i, ParameterAttributes attr) const {
+    return ParamAttrs && ParamAttrs->paramHasAttr(i, attr);
+  }
+
   /// @brief Determine if the function returns a structure.
-  bool isStructReturn() const;
+  bool isStructReturn() const {
+    return paramHasAttr(1, ParamAttr::StructRet);
+  }
 
   /// deleteBody - This method deletes the body of the function, and converts
   /// the linkage to external.

Modified: llvm/trunk/include/llvm/Instructions.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Instructions.h?rev=44403&r1=44402&r2=44403&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Instructions.h (original)
+++ llvm/trunk/include/llvm/Instructions.h Wed Nov 28 11:07:01 2007
@@ -20,6 +20,7 @@
 
 #include "llvm/InstrTypes.h"
 #include "llvm/DerivedTypes.h"
+#include "llvm/ParameterAttributes.h"
 
 namespace llvm {
 
@@ -923,8 +924,14 @@
   /// @brief Set the parameter attributes.
   void setParamAttrs(const ParamAttrsList *attrs);
 
+  /// @brief Determine whether the call or the callee has the given attribute.
+  bool paramHasAttr(uint16_t i, ParameterAttributes attr) const;
+
   /// @brief Determine if the call returns a structure.
-  bool isStructReturn() const;
+  bool isStructReturn() const {
+    // Be friendly and also check the callee.
+    return paramHasAttr(1, ParamAttr::StructRet);
+  }
 
   /// getCalledFunction - Return the function being called by this instruction
   /// if it is a direct call.  If it is a call through a function pointer,
@@ -1701,8 +1708,14 @@
   /// @brief Set the parameter attributes.
   void setParamAttrs(const ParamAttrsList *attrs);
 
+  /// @brief Determine whether the call or the callee has the given attribute.
+  bool paramHasAttr(uint16_t i, ParameterAttributes attr) const;
+
   /// @brief Determine if the call returns a structure.
-  bool isStructReturn() const;
+  bool isStructReturn() const {
+    // Be friendly and also check the callee.
+    return paramHasAttr(1, ParamAttr::StructRet);
+  }
 
   /// getCalledFunction - Return the function called, or null if this is an
   /// indirect function invocation.

Modified: llvm/trunk/include/llvm/Support/CallSite.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/CallSite.h?rev=44403&r1=44402&r2=44403&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Support/CallSite.h (original)
+++ llvm/trunk/include/llvm/Support/CallSite.h Wed Nov 28 11:07:01 2007
@@ -22,6 +22,7 @@
 
 #include "llvm/Instruction.h"
 #include "llvm/BasicBlock.h"
+#include "llvm/ParameterAttributes.h"
 
 namespace llvm {
 
@@ -63,6 +64,9 @@
   const ParamAttrsList *getParamAttrs() const;
   void setParamAttrs(const ParamAttrsList *PAL);
 
+  /// paramHasAttr - whether the call or the callee has the given attribute.
+  bool paramHasAttr(uint16_t i, ParameterAttributes attr) const;
+
   /// getType - Return the type of the instruction that generated this call site
   ///
   const Type *getType() const { return I->getType(); }

Modified: llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp?rev=44403&r1=44402&r2=44403&view=diff

==============================================================================
--- llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp (original)
+++ llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp Wed Nov 28 11:07:01 2007
@@ -839,10 +839,9 @@
     return UnknownModRefBehavior;
   }
 
-  const ParamAttrsList *Attrs = F->getParamAttrs();
-  if (Attrs && Attrs->paramHasAttr(0, ParamAttr::ReadNone))
+  if (F->paramHasAttr(0, ParamAttr::ReadNone))
     return DoesNotAccessMemory;
-  if (Attrs && Attrs->paramHasAttr(0, ParamAttr::ReadOnly))
+  if (F->paramHasAttr(0, ParamAttr::ReadOnly))
     return OnlyReadsMemory;
 
   return UnknownModRefBehavior;

Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs?rev=44403&r1=44402&r2=44403&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs Wed Nov 28 11:07:01 2007
@@ -5161,7 +5161,7 @@
   bool isVarArg = ParamTypeList.size() && ParamTypeList.back() == Type::VoidTy;
   if (isVarArg) ParamTypeList.pop_back();
 
-  ParamAttrsList *PAL = 0;
+  const ParamAttrsList *PAL = 0;
   if (!Attrs.empty())
     PAL = ParamAttrsList::get(Attrs);
 
@@ -5664,7 +5664,7 @@
         GEN_ERROR("Invalid number of parameters detected");
     }
 
-    ParamAttrsList *PAL = 0;
+    const ParamAttrsList *PAL = 0;
     if (!Attrs.empty())
       PAL = ParamAttrsList::get(Attrs);
 
@@ -6094,7 +6094,7 @@
     }
 
     // Finish off the ParamAttrs and check them
-    ParamAttrsList *PAL = 0;
+    const ParamAttrsList *PAL = 0;
     if (!Attrs.empty())
       PAL = ParamAttrsList::get(Attrs);
 

Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs?rev=44403&r1=44402&r2=44403&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs Wed Nov 28 11:07:01 2007
@@ -2243,7 +2243,7 @@
   bool isVarArg = ParamTypeList.size() && ParamTypeList.back() == Type::VoidTy;
   if (isVarArg) ParamTypeList.pop_back();
 
-  ParamAttrsList *PAL = 0;
+  const ParamAttrsList *PAL = 0;
   if (!Attrs.empty())
     PAL = ParamAttrsList::get(Attrs);
 
@@ -2645,7 +2645,7 @@
         GEN_ERROR("Invalid number of parameters detected");
     }
 
-    ParamAttrsList *PAL = 0;
+    const ParamAttrsList *PAL = 0;
     if (!Attrs.empty())
       PAL = ParamAttrsList::get(Attrs);
 
@@ -2977,7 +2977,7 @@
     }
 
     // Finish off the ParamAttrs and check them
-    ParamAttrsList *PAL = 0;
+    const ParamAttrsList *PAL = 0;
     if (!Attrs.empty())
       PAL = ParamAttrsList::get(Attrs);
 

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp?rev=44403&r1=44402&r2=44403&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Wed Nov 28 11:07:01 2007
@@ -934,11 +934,11 @@
         TmpVT = TLI.getTypeToTransformTo(MVT::i32);
       else
         TmpVT = MVT::i32;
-      const ParamAttrsList *PAL = I.getParent()->getParent()->getParamAttrs();
+      const Function *F = I.getParent()->getParent();
       ISD::NodeType ExtendKind = ISD::ANY_EXTEND;
-      if (PAL && PAL->paramHasAttr(0, ParamAttr::SExt))
+      if (F->paramHasAttr(0, ParamAttr::SExt))
         ExtendKind = ISD::SIGN_EXTEND;
-      if (PAL && PAL->paramHasAttr(0, ParamAttr::ZExt))
+      if (F->paramHasAttr(0, ParamAttr::ZExt))
         ExtendKind = ISD::ZERO_EXTEND;
       RetOp = DAG.getNode(ExtendKind, TmpVT, RetOp);
       NewValues.push_back(RetOp);
@@ -3892,7 +3892,6 @@
 /// integrated into SDISel.
 std::vector 
 TargetLowering::LowerArguments(Function &F, SelectionDAG &DAG) {
-  const ParamAttrsList *Attrs = F.getParamAttrs();
   // Add CC# and isVararg as operands to the FORMAL_ARGUMENTS node.
   std::vector Ops;
   Ops.push_back(DAG.getRoot());
@@ -3911,15 +3910,15 @@
 
     // FIXME: Distinguish between a formal with no [sz]ext attribute from one
     // that is zero extended!
-    if (Attrs && Attrs->paramHasAttr(j, ParamAttr::ZExt))
+    if (F.paramHasAttr(j, ParamAttr::ZExt))
       Flags &= ~(ISD::ParamFlags::SExt);
-    if (Attrs && Attrs->paramHasAttr(j, ParamAttr::SExt))
+    if (F.paramHasAttr(j, ParamAttr::SExt))
       Flags |= ISD::ParamFlags::SExt;
-    if (Attrs && Attrs->paramHasAttr(j, ParamAttr::InReg))
+    if (F.paramHasAttr(j, ParamAttr::InReg))
       Flags |= ISD::ParamFlags::InReg;
-    if (Attrs && Attrs->paramHasAttr(j, ParamAttr::StructRet))
+    if (F.paramHasAttr(j, ParamAttr::StructRet))
       Flags |= ISD::ParamFlags::StructReturn;
-    if (Attrs && Attrs->paramHasAttr(j, ParamAttr::ByVal)) {
+    if (F.paramHasAttr(j, ParamAttr::ByVal)) {
       Flags |= ISD::ParamFlags::ByVal;
       const PointerType *Ty = cast(I->getType());
       const StructType *STy = cast(Ty->getElementType());
@@ -3929,7 +3928,7 @@
       Flags |= (StructAlign << ISD::ParamFlags::ByValAlignOffs);
       Flags |= (StructSize  << ISD::ParamFlags::ByValSizeOffs);
     }
-    if (Attrs && Attrs->paramHasAttr(j, ParamAttr::Nest))
+    if (F.paramHasAttr(j, ParamAttr::Nest))
       Flags |= ISD::ParamFlags::Nest;
     Flags |= (OriginalAlignment << ISD::ParamFlags::OrigAlignmentOffs);
     
@@ -3986,10 +3985,10 @@
     case Promote: {
       SDOperand Op(Result, i++);
       if (MVT::isInteger(VT)) {
-        if (Attrs && Attrs->paramHasAttr(Idx, ParamAttr::SExt))
+        if (F.paramHasAttr(Idx, ParamAttr::SExt))
           Op = DAG.getNode(ISD::AssertSext, Op.getValueType(), Op,
                            DAG.getValueType(VT));
-        else if (Attrs && Attrs->paramHasAttr(Idx, ParamAttr::ZExt))
+        else if (F.paramHasAttr(Idx, ParamAttr::ZExt))
           Op = DAG.getNode(ISD::AssertZext, Op.getValueType(), Op,
                            DAG.getValueType(VT));
         Op = DAG.getNode(ISD::TRUNCATE, VT, Op);

Modified: llvm/trunk/lib/ExecutionEngine/Interpreter/Execution.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Interpreter/Execution.cpp?rev=44403&r1=44402&r2=44403&view=diff

==============================================================================
--- llvm/trunk/lib/ExecutionEngine/Interpreter/Execution.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/Interpreter/Execution.cpp Wed Nov 28 11:07:01 2007
@@ -896,18 +896,15 @@
          e = SF.Caller.arg_end(); i != e; ++i, ++pNum) {
     Value *V = *i;
     ArgVals.push_back(getOperandValue(V, SF));
-    if (F) {
-     // Promote all integral types whose size is < sizeof(i32) into i32.  
-     // We do this by zero or sign extending the value as appropriate 
-     // according to the parameter attributes
-      const Type *Ty = V->getType();
-      if (Ty->isInteger() && (ArgVals.back().IntVal.getBitWidth() < 32))
-        if (const ParamAttrsList *PA = F->getParamAttrs())
-          if (PA->paramHasAttr(pNum, ParamAttr::ZExt))
-            ArgVals.back().IntVal = ArgVals.back().IntVal.zext(32);
-          else if (PA->paramHasAttr(pNum, ParamAttr::SExt))
-            ArgVals.back().IntVal = ArgVals.back().IntVal.sext(32);
-     }
+    // Promote all integral types whose size is < sizeof(i32) into i32.
+    // We do this by zero or sign extending the value as appropriate
+    // according to the parameter attributes
+    const Type *Ty = V->getType();
+    if (Ty->isInteger() && (ArgVals.back().IntVal.getBitWidth() < 32))
+      if (CS.paramHasAttr(pNum, ParamAttr::ZExt))
+        ArgVals.back().IntVal = ArgVals.back().IntVal.zext(32);
+      else if (CS.paramHasAttr(pNum, ParamAttr::SExt))
+        ArgVals.back().IntVal = ArgVals.back().IntVal.sext(32);
   }
 
   // To handle indirect calls, we must get the pointer value from the argument

Modified: llvm/trunk/lib/Target/MSIL/MSILWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/MSIL/MSILWriter.cpp?rev=44403&r1=44402&r2=44403&view=diff

==============================================================================
--- llvm/trunk/lib/Target/MSIL/MSILWriter.cpp (original)
+++ llvm/trunk/lib/Target/MSIL/MSILWriter.cpp Wed Nov 28 11:07:01 2007
@@ -1387,8 +1387,7 @@
 
 
 void MSILWriter::printFunction(const Function& F) {
-  const ParamAttrsList *Attrs = F.getParamAttrs();
-  bool isSigned = Attrs && Attrs->paramHasAttr(0, ParamAttr::SExt);
+  bool isSigned = F.paramHasAttr(0, ParamAttr::SExt);
   Out << "\n.method static ";
   Out << (F.hasInternalLinkage() ? "private " : "public ");
   if (F.isVarArg()) Out << "vararg ";
@@ -1399,7 +1398,7 @@
   unsigned ArgIdx = 1;
   for (Function::const_arg_iterator I = F.arg_begin(), E = F.arg_end(); I!=E;
        ++I, ++ArgIdx) {
-    isSigned = Attrs && Attrs->paramHasAttr(ArgIdx, ParamAttr::SExt);
+    isSigned = F.paramHasAttr(ArgIdx, ParamAttr::SExt);
     if (I!=F.arg_begin()) Out << ", ";
     Out << getTypeName(I->getType(),isSigned) << getValueName(I);
   }

Modified: llvm/trunk/lib/Transforms/Scalar/SimplifyCFG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/SimplifyCFG.cpp?rev=44403&r1=44402&r2=44403&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/SimplifyCFG.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/SimplifyCFG.cpp Wed Nov 28 11:07:01 2007
@@ -90,35 +90,6 @@
   BB->getInstList().erase(II);
 }
 
-/// IsNoReturn - Return true if the specified call is to a no-return function.
-static bool IsNoReturn(const CallInst *CI) {
-  if (const ParamAttrsList *Attrs = CI->getParamAttrs())
-    if (Attrs->paramHasAttr(0, ParamAttr::NoReturn))
-      return true;
-  
-  if (const Function *Callee = CI->getCalledFunction())
-    if (const ParamAttrsList *Attrs = Callee->getParamAttrs())
-      if (Attrs->paramHasAttr(0, ParamAttr::NoReturn))
-        return true;
-
-  return false;
-}
-
-/// IsNoUnwind - Return true if the specified invoke is to a no-unwind function.
-static bool IsNoUnwind(const InvokeInst *II) {
-  if (const ParamAttrsList *Attrs = II->getParamAttrs())
-    if (Attrs->paramHasAttr(0, ParamAttr::NoUnwind))
-      return true;
-  
-  if (const Function *Callee = II->getCalledFunction())
-    if (const ParamAttrsList *Attrs = Callee->getParamAttrs())
-      if (Attrs->paramHasAttr(0, ParamAttr::NoUnwind))
-        return true;
-
-  return false;
-}
-
-
 static bool MarkAliveBlocks(BasicBlock *BB,
                             SmallPtrSet &Reachable) {
   
@@ -137,7 +108,7 @@
     // canonicalizes unreachable insts into stores to null or undef.
     for (BasicBlock::iterator BBI = BB->begin(), E = BB->end(); BBI != E;++BBI){
       if (CallInst *CI = dyn_cast(BBI)) {
-        if (IsNoReturn(CI)) {
+        if (CI->paramHasAttr(0, ParamAttr::NoReturn)) {
           // If we found a call to a no-return function, insert an unreachable
           // instruction after it.  Make sure there isn't *already* one there
           // though.
@@ -161,7 +132,7 @@
 
     // Turn invokes that call 'nounwind' functions into ordinary calls.
     if (InvokeInst *II = dyn_cast(BB->getTerminator()))
-      if (IsNoUnwind(II)) {
+      if (II->paramHasAttr(0, ParamAttr::NoUnwind)) {
         ChangeToCall(II);
         Changed = true;
       }

Modified: llvm/trunk/lib/VMCore/Function.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Function.cpp?rev=44403&r1=44402&r2=44403&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/Function.cpp (original)
+++ llvm/trunk/lib/VMCore/Function.cpp Wed Nov 28 11:07:01 2007
@@ -13,7 +13,6 @@
 
 #include "llvm/Module.h"
 #include "llvm/DerivedTypes.h"
-#include "llvm/ParameterAttributes.h"
 #include "llvm/IntrinsicInst.h"
 #include "llvm/CodeGen/ValueTypes.h"
 #include "llvm/Support/LeakDetector.h"
@@ -287,12 +286,6 @@
   ParamAttrs = attrs; 
 }
 
-bool Function::isStructReturn() const {
-  if (ParamAttrs)
-    return ParamAttrs->paramHasAttr(1, ParamAttr::StructRet);
-  return false;
-}
-
 const FunctionType *Function::getFunctionType() const {
   return cast(getType()->getElementType());
 }

Modified: llvm/trunk/lib/VMCore/Instructions.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Instructions.cpp?rev=44403&r1=44402&r2=44403&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/Instructions.cpp (original)
+++ llvm/trunk/lib/VMCore/Instructions.cpp Wed Nov 28 11:07:01 2007
@@ -47,6 +47,12 @@
   else
     cast(I)->setParamAttrs(PAL);
 }
+bool CallSite::paramHasAttr(uint16_t i, ParameterAttributes attr) const {
+  if (CallInst *CI = dyn_cast(I))
+    return CI->paramHasAttr(i, attr);
+  else
+    return cast(I)->paramHasAttr(i, attr);
+}
 
 
 
@@ -376,12 +382,14 @@
   ParamAttrs = newAttrs; 
 }
 
-bool CallInst::isStructReturn() const {
-  if (ParamAttrs)
-    return ParamAttrs->paramHasAttr(1, ParamAttr::StructRet);
-  return false;
+bool CallInst::paramHasAttr(uint16_t i, ParameterAttributes attr) const {
+  if (ParamAttrs && ParamAttrs->paramHasAttr(i, attr))
+    return true;
+  const Function *F = getCalledFunction();
+  return F && F->getParamAttrs() && F->getParamAttrs()->paramHasAttr(i, attr);
 }
 
+
 //===----------------------------------------------------------------------===//
 //                        InvokeInst Implementation
 //===----------------------------------------------------------------------===//
@@ -451,12 +459,14 @@
   ParamAttrs = newAttrs; 
 }
 
-bool InvokeInst::isStructReturn() const {
-  if (ParamAttrs)
-    return ParamAttrs->paramHasAttr(1, ParamAttr::StructRet);
-  return false;
+bool InvokeInst::paramHasAttr(uint16_t i, ParameterAttributes attr) const {
+  if (ParamAttrs && ParamAttrs->paramHasAttr(i, attr))
+    return true;
+  const Function *F = getCalledFunction();
+  return F && F->getParamAttrs() && F->getParamAttrs()->paramHasAttr(i, attr);
 }
 
+
 //===----------------------------------------------------------------------===//
 //                        ReturnInst Implementation
 //===----------------------------------------------------------------------===//

Modified: llvm/trunk/test/Transforms/SimplifyCFG/2007-11-22-InvokeNoUnwind.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/2007-11-22-InvokeNoUnwind.ll?rev=44403&r1=44402&r2=44403&view=diff

==============================================================================
--- llvm/trunk/test/Transforms/SimplifyCFG/2007-11-22-InvokeNoUnwind.ll (original)
+++ llvm/trunk/test/Transforms/SimplifyCFG/2007-11-22-InvokeNoUnwind.ll Wed Nov 28 11:07:01 2007
@@ -3,7 +3,7 @@
 declare i32 @func(i8*) nounwind
 
 define i32 @test() {
-	invoke i32 @func( i8* null ) nounwind
+	invoke i32 @func( i8* null )
 			to label %Cont unwind label %Other		; :1 [#uses=0]
 
 Cont:		; preds = %0

Modified: llvm/trunk/tools/llvm-upgrade/UpgradeParser.cpp.cvs
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-upgrade/UpgradeParser.cpp.cvs?rev=44403&r1=44402&r2=44403&view=diff

==============================================================================
--- llvm/trunk/tools/llvm-upgrade/UpgradeParser.cpp.cvs (original)
+++ llvm/trunk/tools/llvm-upgrade/UpgradeParser.cpp.cvs Wed Nov 28 11:07:01 2007
@@ -4510,7 +4510,7 @@
     bool isVarArg = Params.size() && Params.back() == Type::VoidTy;
     if (isVarArg) Params.pop_back();
 
-    ParamAttrsList *PAL = 0;
+    const ParamAttrsList *PAL = 0;
     if (lastCallingConv == OldCallingConv::CSRet) {
       ParamAttrsVector Attrs;
       ParamAttrsWithIndex PAWI;

Modified: llvm/trunk/tools/llvm-upgrade/UpgradeParser.y.cvs
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-upgrade/UpgradeParser.y.cvs?rev=44403&r1=44402&r2=44403&view=diff

==============================================================================
--- llvm/trunk/tools/llvm-upgrade/UpgradeParser.y.cvs (original)
+++ llvm/trunk/tools/llvm-upgrade/UpgradeParser.y.cvs Wed Nov 28 11:07:01 2007
@@ -2055,7 +2055,7 @@
     bool isVarArg = Params.size() && Params.back() == Type::VoidTy;
     if (isVarArg) Params.pop_back();
 
-    ParamAttrsList *PAL = 0;
+    const ParamAttrsList *PAL = 0;
     if (lastCallingConv == OldCallingConv::CSRet) {
       ParamAttrsVector Attrs;
       ParamAttrsWithIndex PAWI;




From sabre at nondot.org  Wed Nov 28 12:20:49 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 28 Nov 2007 18:20:49 -0000
Subject: [llvm-commits] [llvm] r44404 -
 /llvm/trunk/test/ExecutionEngine/2004-12-04-LazyCompileFuncs.ll
Message-ID: <200711281820.lASIKn6r027376@zion.cs.uiuc.edu>

Author: lattner
Date: Wed Nov 28 12:20:49 2007
New Revision: 44404

URL: http://llvm.org/viewvc/llvm-project?rev=44404&view=rev
Log:
make this test have a deterministic result.

Modified:
    llvm/trunk/test/ExecutionEngine/2004-12-04-LazyCompileFuncs.ll

Modified: llvm/trunk/test/ExecutionEngine/2004-12-04-LazyCompileFuncs.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2004-12-04-LazyCompileFuncs.ll?rev=44404&r1=44403&r2=44404&view=diff

==============================================================================
--- llvm/trunk/test/ExecutionEngine/2004-12-04-LazyCompileFuncs.ll (original)
+++ llvm/trunk/test/ExecutionEngine/2004-12-04-LazyCompileFuncs.ll Wed Nov 28 12:20:49 2007
@@ -1,5 +1,5 @@
 ; RUN: llvm-as < %s -f -o %t.bc
-; RUN: not lli -debug-only=jit %t.bc |& not grep {Finished CodeGen of .*Function: F}
+; RUN: lli -debug-only=jit %t.bc |& not grep {Finished CodeGen of .*Function: F}
 @.str_1 = internal constant [7 x i8] c"IN F!\0A\00"             ; <[7 x i8]*> [#uses=1]
 @.str_2 = internal constant [7 x i8] c"IN G!\0A\00"             ; <[7 x i8]*> [#uses=1]
 @Ptrs = internal constant [2 x void (...)*] [ void (...)* bitcast (void ()* @F to void (...)*), void (...)* bitcast (void ()* @G to void (...)*) ]           ; <[2 x void (...)*]*> [#uses=1]
@@ -25,5 +25,5 @@
         %tmp.5 = load void (...)** %tmp.4               ;  [#uses=1]
         %tmp.5_c = bitcast void (...)* %tmp.5 to void ()*               ;  [#uses=1]
         call void %tmp.5_c( )
-        ret i32 undef
+        ret i32 0
 }




From sabre at nondot.org  Wed Nov 28 12:22:12 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 28 Nov 2007 18:22:12 -0000
Subject: [llvm-commits] [llvm] r44405 -
	/llvm/trunk/test/CodeGen/Generic/fp_to_int.ll
Message-ID: <200711281822.lASIMCKN027461@zion.cs.uiuc.edu>

Author: lattner
Date: Wed Nov 28 12:22:12 2007
New Revision: 44405

URL: http://llvm.org/viewvc/llvm-project?rev=44405&view=rev
Log:
upgrade this test

Modified:
    llvm/trunk/test/CodeGen/Generic/fp_to_int.ll

Modified: llvm/trunk/test/CodeGen/Generic/fp_to_int.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Generic/fp_to_int.ll?rev=44405&r1=44404&r2=44405&view=diff

==============================================================================
--- llvm/trunk/test/CodeGen/Generic/fp_to_int.ll (original)
+++ llvm/trunk/test/CodeGen/Generic/fp_to_int.ll Wed Nov 28 12:22:12 2007
@@ -1,67 +1,81 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc
+; RUN: llvm-as < %s | llc
 
-sbyte %test1(double %X) {
-	%tmp.1 = cast double %X to sbyte
-	ret sbyte %tmp.1
+define i8 @test1(double %X) {
+	%tmp.1 = fptosi double %X to i8		;  [#uses=1]
+	ret i8 %tmp.1
 }
-short %test2(double %X) {
-	%tmp.1 = cast double %X to short
-	ret short %tmp.1
+
+define i16 @test2(double %X) {
+	%tmp.1 = fptosi double %X to i16		;  [#uses=1]
+	ret i16 %tmp.1
 }
-int %test3(double %X) {
-	%tmp.1 = cast double %X to int
-	ret int %tmp.1
+
+define i32 @test3(double %X) {
+	%tmp.1 = fptosi double %X to i32		;  [#uses=1]
+	ret i32 %tmp.1
 }
-long %test4(double %X) {
-	%tmp.1 = cast double %X to long
-	ret long %tmp.1
+
+define i64 @test4(double %X) {
+	%tmp.1 = fptosi double %X to i64		;  [#uses=1]
+	ret i64 %tmp.1
 }
-ubyte %test1u(double %X) {
-	%tmp.1 = cast double %X to ubyte
-	ret ubyte %tmp.1
+
+define i8 @test1u(double %X) {
+	%tmp.1 = fptoui double %X to i8		;  [#uses=1]
+	ret i8 %tmp.1
 }
-ushort %test2u(double %X) {
-	%tmp.1 = cast double %X to ushort
-	ret ushort %tmp.1
+
+define i16 @test2u(double %X) {
+	%tmp.1 = fptoui double %X to i16		;  [#uses=1]
+	ret i16 %tmp.1
 }
-uint %test3u(double %X) {
-	%tmp.1 = cast double %X to uint
-	ret uint %tmp.1
+
+define i32 @test3u(double %X) {
+	%tmp.1 = fptoui double %X to i32		;  [#uses=1]
+	ret i32 %tmp.1
 }
-ulong %test4u(double %X) {
-	%tmp.1 = cast double %X to ulong
-	ret ulong %tmp.1
+
+define i64 @test4u(double %X) {
+	%tmp.1 = fptoui double %X to i64		;  [#uses=1]
+	ret i64 %tmp.1
 }
 
-sbyte %test1f(float %X) {
-	%tmp.1 = cast float %X to sbyte
-	ret sbyte %tmp.1
+define i8 @test1f(float %X) {
+	%tmp.1 = fptosi float %X to i8		;  [#uses=1]
+	ret i8 %tmp.1
 }
-short %test2f(float %X) {
-	%tmp.1 = cast float %X to short
-	ret short %tmp.1
+
+define i16 @test2f(float %X) {
+	%tmp.1 = fptosi float %X to i16		;  [#uses=1]
+	ret i16 %tmp.1
 }
-int %test3f(float %X) {
-	%tmp.1 = cast float %X to int
-	ret int %tmp.1
+
+define i32 @test3f(float %X) {
+	%tmp.1 = fptosi float %X to i32		;  [#uses=1]
+	ret i32 %tmp.1
 }
-long %test4f(float %X) {
-	%tmp.1 = cast float %X to long
-	ret long %tmp.1
+
+define i64 @test4f(float %X) {
+	%tmp.1 = fptosi float %X to i64		;  [#uses=1]
+	ret i64 %tmp.1
 }
-ubyte %test1uf(float %X) {
-	%tmp.1 = cast float %X to ubyte
-	ret ubyte %tmp.1
+
+define i8 @test1uf(float %X) {
+	%tmp.1 = fptoui float %X to i8		;  [#uses=1]
+	ret i8 %tmp.1
 }
-ushort %test2uf(float %X) {
-	%tmp.1 = cast float %X to ushort
-	ret ushort %tmp.1
+
+define i16 @test2uf(float %X) {
+	%tmp.1 = fptoui float %X to i16		;  [#uses=1]
+	ret i16 %tmp.1
 }
-uint %test3uf(float %X) {
-	%tmp.1 = cast float %X to uint
-	ret uint %tmp.1
+
+define i32 @test3uf(float %X) {
+	%tmp.1 = fptoui float %X to i32		;  [#uses=1]
+	ret i32 %tmp.1
 }
-ulong %test4uf(float %X) {
-	%tmp.1 = cast float %X to ulong
-	ret ulong %tmp.1
+
+define i64 @test4uf(float %X) {
+	%tmp.1 = fptoui float %X to i64		;  [#uses=1]
+	ret i64 %tmp.1
 }




From sabre at nondot.org  Wed Nov 28 12:30:18 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 28 Nov 2007 18:30:18 -0000
Subject: [llvm-commits] [llvm] r44406 -
	/llvm/trunk/lib/ExecutionEngine/JIT/Intercept.cpp
Message-ID: <200711281830.lASIUIFg027890@zion.cs.uiuc.edu>

Author: lattner
Date: Wed Nov 28 12:30:18 2007
New Revision: 44406

URL: http://llvm.org/viewvc/llvm-project?rev=44406&view=rev
Log:
for consistency, allow a fallthrough if the final check returns null.

Modified:
    llvm/trunk/lib/ExecutionEngine/JIT/Intercept.cpp

Modified: llvm/trunk/lib/ExecutionEngine/JIT/Intercept.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/Intercept.cpp?rev=44406&r1=44405&r2=44406&view=diff

==============================================================================
--- llvm/trunk/lib/ExecutionEngine/JIT/Intercept.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/JIT/Intercept.cpp Wed Nov 28 12:30:18 2007
@@ -113,7 +113,8 @@
     std::string Prefix = std::string(Name.begin(), Name.end()-9);
     if (void *Ptr = getPointerToNamedFunction(Prefix+"$LDBL128"))
       return Ptr;
-    return getPointerToNamedFunction(Prefix);
+    if (void *Ptr = getPointerToNamedFunction(Prefix))
+      return Ptr;
   }
 #endif
   




From sabre at nondot.org  Wed Nov 28 12:44:51 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 28 Nov 2007 18:44:51 -0000
Subject: [llvm-commits] [llvm] r44407 - in /llvm/trunk/lib/Target/PowerPC:
 PPCISelLowering.cpp PPCISelLowering.h
Message-ID: <200711281844.lASIip2j029168@zion.cs.uiuc.edu>

Author: lattner
Date: Wed Nov 28 12:44:47 2007
New Revision: 44407

URL: http://llvm.org/viewvc/llvm-project?rev=44407&view=rev
Log:
Implement ExpandOperationResult for ppc i64 fp->int, which fixes
CodeGen/Generic/fp_to_int.ll among others.  Its unclear why this 
just started failing...

Modified:
    llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp
    llvm/trunk/lib/Target/PowerPC/PPCISelLowering.h

Modified: llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp?rev=44407&r1=44406&r2=44407&view=diff

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp Wed Nov 28 12:44:47 2007
@@ -2076,6 +2076,7 @@
   return SDOperand();
 }
 
+// FIXME: Split this code up when LegalizeDAGTypes lands.
 static SDOperand LowerFP_TO_SINT(SDOperand Op, SelectionDAG &DAG) {
   assert(MVT::isFloatingPoint(Op.getOperand(0).getValueType()));
   SDOperand Src = Op.getOperand(0);
@@ -3042,6 +3043,14 @@
   return SDOperand();
 }
 
+SDNode *PPCTargetLowering::ExpandOperationResult(SDNode *N, SelectionDAG &DAG) {
+  switch (N->getOpcode()) {
+  default: assert(0 && "Wasn't expecting to be able to lower this!");
+  case ISD::FP_TO_SINT: return LowerFP_TO_SINT(SDOperand(N, 0), DAG).Val;
+  }
+}
+
+
 //===----------------------------------------------------------------------===//
 //  Other Lowering Code
 //===----------------------------------------------------------------------===//

Modified: llvm/trunk/lib/Target/PowerPC/PPCISelLowering.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCISelLowering.h?rev=44407&r1=44406&r2=44407&view=diff

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCISelLowering.h (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCISelLowering.h Wed Nov 28 12:44:47 2007
@@ -248,6 +248,8 @@
     /// LowerOperation - Provide custom lowering hooks for some operations.
     ///
     virtual SDOperand LowerOperation(SDOperand Op, SelectionDAG &DAG);
+
+    virtual SDNode *ExpandOperationResult(SDNode *N, SelectionDAG &DAG);
     
     virtual SDOperand PerformDAGCombine(SDNode *N, DAGCombinerInfo &DCI) const;
     




From sabre at nondot.org  Wed Nov 28 13:26:42 2007
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 28 Nov 2007 19:26:42 -0000
Subject: [llvm-commits] [llvm] r44414 -
	/llvm/trunk/docs/tutorial/LangImpl3.html
Message-ID: <200711281926.lASJQgm6031480@zion.cs.uiuc.edu>

Author: lattner
Date: Wed Nov 28 13:26:42 2007
New Revision: 44414

URL: http://llvm.org/viewvc/llvm-project?rev=44414&view=rev
Log:
Add a note

Modified:
    llvm/trunk/docs/tutorial/LangImpl3.html

Modified: llvm/trunk/docs/tutorial/LangImpl3.html
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/tutorial/LangImpl3.html?rev=44414&r1=44413&r2=44414&view=diff

==============================================================================
--- llvm/trunk/docs/tutorial/LangImpl3.html (original)
+++ llvm/trunk/docs/tutorial/LangImpl3.html Wed Nov 28 13:26:42 2007
@@ -47,6 +47,9 @@
 parser than it is to generate LLVM IR code. :)
 
    
 
+
    Please note: the code in this chapter and later require LLVM 2.2 or
+LLVM SVN to work.  LLVM 2.1 and before will not work with it.
    
+
    From pawel.kunio at gmail.com Wed Nov 28 14:55:33 2007 From: pawel.kunio at gmail.com (pawel kunio) Date: Wed, 28 Nov 2007 21:55:33 +0100 Subject: [llvm-commits] updated patch for PR889 Message-ID: Hello, Here comes updated patch for PR889 with all the changes suggested by Chris applied to the source. I was just wondering whether the dynamic casts wont impose too much of burden performance-wise compared to checking the SubClassID, possible open thing for checking the types in Value destructor (applies to Instruction inherited classes only). Best regards, pawel -------------- next part -------------- A non-text attachment was scrubbed... Name: llvm PR889-try2.patch Type: application/octet-stream Size: 58281 bytes Desc: not available Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20071128/55c67c25/attachment.obj From clattner at apple.com Wed Nov 28 15:05:07 2007 From: clattner at apple.com (Chris Lattner) Date: Wed, 28 Nov 2007 13:05:07 -0800 Subject: [llvm-commits] [llvm-testresults] sabre-ppc32 Power Macintosh nightly tester results In-Reply-To: <200711281303.lASD3SZw012734@zion.cs.uiuc.edu> References: <200711281303.lASD3SZw012734@zion.cs.uiuc.edu> Message-ID: <623A7532-50D4-4000-80F5-E94A083C2C9F@apple.com> FYI, All of these errors are now fixed, except crafty and spiff, which are GVN miscompilations. Owen is investigating, -Chris On Nov 28, 2007, at 5:03 AM, Apache wrote: > http://llvm.org/nightlytest/test.php?machine=153&night=4148 > Name: clattner.apple.com > Nickname: sabre-ppc32 > Buildstatus: OK > > New Test Passes: > None > > New Test Failures: > test/CodeGen/Generic/fp_to_int.ll [DEJAGNU] > Applications/SIBsim4/SIBsim4 [LLC compile, LLC-BETA compile, JIT > codegen, LLC, LLC-BETA, JIT] > Applications/siod/siod [LLC compile, LLC-BETA compile, LLC, LLC-BETA] > Applications/SPASS/SPASS [LLC compile, LLC-BETA compile, , LLC] > Applications/spiff/spiff [LLC compile, LLC-BETA compile, JIT > codegen, CBE, LLC, LLC-BETA, JIT] > Benchmarks/MallocBench/cfrac/cfrac [LLC compile, LLC-BETA compile, > JIT codegen, LLC, LLC-BETA, JIT] > Benchmarks/MiBench/consumer-lame/consumer-lame [LLC compile, LLC- > BETA compile, JIT codegen, LLC, LLC-BETA, JIT] > Povray/povray [LLC compile, LLC-BETA compile, JIT codegen, LLC, LLC- > BETA, JIT] > Regression/C/casts [LLC compile, LLC-BETA compile, JIT codegen, > LLC, LLC-BETA, JIT] > SPEC/CFP2000/177.mesa/177.mesa [LLC compile, LLC-BETA compile, LLC, > LLC-BETA] > SPEC/CFP2006/447.dealII/447.dealII [LLC compile, LLC-BETA compile, > JIT codegen, , LLC, LLC-BETA] > SPEC/CINT2000/176.gcc/176.gcc [LLC compile, LLC-BETA compile, JIT > codegen, LLC, LLC-BETA, JIT] > SPEC/CINT2000/186.crafty/186.crafty [LLC compile, LLC-BETA compile, > JIT codegen, CBE, LLC, LLC-BETA, JIT] > SPEC/CINT2000/253.perlbmk/253.perlbmk [LLC compile, LLC-BETA > compile, JIT codegen, LLC, LLC-BETA, JIT] > SPEC/CINT2006/400.perlbench/400.perlbench [LLC compile, LLC-BETA > compile, JIT codegen, , LLC, LLC-BETA] > SPEC/CINT2006/464.h264ref/464.h264ref [LLC compile, LLC-BETA > compile, JIT codegen, LLC, LLC-BETA, JIT] > > > Added Tests: > test/Analysis/BasicAA/pure-const-dce.ll > test/Analysis/ScalarEvolution/do-loop.ll for PR1614 > test/Analysis/ScalarEvolution/smax.ll for PR1614 > test/Assembler/2007-02-07-UpgradeCSRETCC.ll for PR1187 > test/Assembler/2007-11-26-AttributeOverload.ll > test/Assembler/2007-11-27-AutoUpgradeAttributes.ll > test/CFrontend/2007-11-27-SExtZExt.c > test/CodeGen/Alpha/2007-11-27-mulneg3.ll > test/CodeGen/ARM/fmdrr-fmrrd.ll > test/CodeGen/Generic/invalid-memcpy.ll > test/CodeGen/PowerPC/invalid-memcpy.ll > test/CodeGen/X86/urem-i8-constant.ll > test/CodeGen/X86/vec_zero_cse.ll > test/Transforms/ConstProp/2007-11-23-cttz.ll for PR1816 > test/Transforms/IndVarsSimplify/2007-11-23-BitcastCrash.ll for PR1814 > test/Transforms/InstCombine/2007-11-22-IcmpCrash.ll for PR1817 > test/Transforms/InstCombine/2007-11-25-CompatibleAttributes.ll for > PR1716 > test/Transforms/InstCombine/select.ll for PR1822 > test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll > test/Transforms/SimplifyCFG/2007-11-22-InvokeNoUnwind.ll > > > Removed Tests: > test/Assembler/2007-02-07-UpgradeCSRETCC.ll for PR1187,1146 > test/Transforms/InstCombine/select.ll > test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll for PR1146 > > > Significant changes in test results: > Bytecode: > singlesource/Benchmarks/CoyoteBench/almabench: 7.77% (11424 => 10536) > singlesource/Benchmarks/CoyoteBench/fftbench: 7.99% (23024 => 21184) > singlesource/Benchmarks/CoyoteBench/lpbench: -6.41% (4804 => 5112) > singlesource/Benchmarks/Dhrystone/dry: -36.53% (1336 => 1824) > singlesource/Benchmarks/Dhrystone/fldry: -34.22% (1508 => 2024) > singlesource/Benchmarks/McGill/exptree: -5.44% (5368 => 5660) > singlesource/Benchmarks/Misc-C++/bigfib: 18.25% (40232 => 32888) > singlesource/Benchmarks/Shootout-C++/ary: 27.08% (4816 => 3512) > singlesource/Benchmarks/Shootout-C++/ary2: 29.17% (6144 => 4352) > singlesource/Benchmarks/Shootout-C++/ary3: 25.85% (5076 => 3764) > singlesource/Benchmarks/Shootout-C++/hash: 28.16% (17488 => 12564) > singlesource/Benchmarks/Shootout-C++/hash2: 23.38% (21316 => 16332) > singlesource/Benchmarks/Shootout-C++/lists1: -7.71% (9128 => 9832) > singlesource/Benchmarks/Shootout-C++/moments: 19.58% (9992 => 8036) > singlesource/Benchmarks/Shootout-C++/reversefile: 21.18% (14808 => > 11672) > singlesource/Benchmarks/Shootout-C++/sieve: 25.05% (8560 => 6416) > singlesource/Benchmarks/Shootout-C++/wordfreq: 5.24% (23876 => 22624) > singlesource/Benchmarks/Shootout/ary3: -10.00% (1040 => 1144) > singlesource/Benchmarks/Shootout/methcall: -5.42% (1772 => 1868) > singlesource/Regression/C++/2003-09-29-NonPODsByValue: 20.09% (856 > => 684) > singlesource/Regression/C/badidx: -7.00% (800 => 856) > singlesource/UnitTests/2002-12-13-MishaTest: -68.94% (528 => 892) > singlesource/UnitTests/2006-12-04-DynAllocAndRestore: -47.90% (476 > => 704) > singlesource/UnitTests/2007-01-04-KNR-Args: -35.76% (604 => 820) > singlesource/UnitTests/Vector/Altivec/alti.isamax: -11.51% (3856 > => 4300) > singlesource/UnitTests/Vector/Altivec/alti.sdot: -7.60% (3104 => > 3340) > singlesource/UnitTests/printargs: -8.28% (676 => 732) > multisource/Benchmarks/FreeBench/distray/distray: -15.07% (12372 > => 14236) > multisource/Benchmarks/McCat/04-bisect/bisect: 6.45% (5456 => 5104) > multisource/Benchmarks/McCat/09-vor/vor: 11.73% (39000 => 34424) > multisource/Benchmarks/Prolangs-C++/garage/garage: 8.02% (8176 => > 7520) > multisource/Benchmarks/Prolangs-C++/trees/trees: 9.10% (20928 => > 19024) > multisource/Benchmarks/SciMark2-C/scimark2: -6.86% (22968 => 24544) > multisource/Benchmarks/llubenchmark/llu: -9.22% (4120 => 4500) > JIT: > singlesource/Benchmarks/CoyoteBench/almabench: 20.92% (16.54 => > 13.08) > singlesource/Benchmarks/Dhrystone/dry: -25.93% (5.09 => 6.41) > singlesource/Benchmarks/Dhrystone/fldry: -29.19% (7.64 => 9.87) > singlesource/Benchmarks/Shootout-C++/hash2: 5.93% (7.59 => 7.14) > singlesource/Benchmarks/Shootout-C++/nestedloop: 97.63% (15.63 => > 0.37) > singlesource/Benchmarks/Shootout/methcall: -73.17% (11.78 => 20.40) > singlesource/Benchmarks/Shootout/nestedloop: 96.80% (13.45 => 0.43) > multisource/Applications/kimwitu++/kc: -5.69% (9.84 => 10.40) > multisource/Applications/siod/siod: 9.58% (11.38 => 10.29) > multisource/Benchmarks/ASCI_Purple/SMG2000/smg2000: -5.44% (19.12 > => 20.16) > multisource/Benchmarks/Fhourstones-3.1/fhourstones3.1: -5.57% > (4.13 => 4.36) > multisource/Benchmarks/Fhourstones/fhourstones: -5.65% (6.55 => 6.92) > multisource/Benchmarks/MiBench/consumer-typeset/consumer-typeset: > 5.33% (8.81 => 8.34) > multisource/Benchmarks/OptimizerEval/optimizer-eval: -6.38% > (109.58 => 116.57) > multisource/Benchmarks/SciMark2-C/scimark2: -9.15% (28.41 => 31.01) > multisource/Benchmarks/sim/sim: 19.17% (10.12 => 8.18) > external/SPEC/CFP2000/177.mesa/177.mesa: 9.43% (8.70 => 7.88) > external/SPEC/CFP2000/183.equake/183.equake: 5.95% (19.99 => 18.80) > external/SPEC/CINT2006/462.libquantum/462.libquantum: 6.58% (8.82 > => 8.24) > LLC: > singlesource/Benchmarks/CoyoteBench/almabench: 22.08% (14.90 => > 11.61) > singlesource/Benchmarks/Dhrystone/fldry: -150.63% (4.78 => 11.98) > singlesource/Benchmarks/Shootout-C++/methcall: 33.00% (17.00 => > 11.39) > singlesource/Benchmarks/Shootout-C++/nestedloop: 97.82% (15.58 => > 0.34) > singlesource/Benchmarks/Shootout-C++/objinst: -7.50% (24.39 => 26.22) > singlesource/Benchmarks/Shootout/methcall: -82.42% (10.41 => 18.99) > singlesource/Benchmarks/Shootout/nestedloop: 97.76% (15.62 => 0.35) > multisource/Benchmarks/OptimizerEval/optimizer-eval: -25.88% > (106.60 => 134.19) > multisource/Benchmarks/SciMark2-C/scimark2: 6.55% (31.89 => 29.80) > external/SPEC/CINT2006/462.libquantum/462.libquantum: -5.40% (7.96 > => 8.39) > LLC-BETA: > singlesource/Benchmarks/CoyoteBench/almabench: 22.13% (14.91 => > 11.61) > singlesource/Benchmarks/Dhrystone/fldry: -99.37% (4.78 => 9.53) > singlesource/Benchmarks/Shootout-C++/hash2: 7.02% (6.84 => 6.36) > singlesource/Benchmarks/Shootout-C++/methcall: 34.23% (17.03 => > 11.20) > singlesource/Benchmarks/Shootout-C++/nestedloop: 97.82% (15.60 => > 0.34) > singlesource/Benchmarks/Shootout-C++/objinst: -7.90% (24.30 => 26.22) > singlesource/Benchmarks/Shootout/methcall: -82.40% (10.40 => 18.97) > singlesource/Benchmarks/Shootout/nestedloop: 97.75% (15.56 => 0.35) > multisource/Benchmarks/Ptrdist/ft/ft: -102.55% (1.96 => 3.97) > multisource/Benchmarks/SciMark2-C/scimark2: -13.65% (28.13 => 31.97) > external/SPEC/CINT2000/175.vpr/175.vpr: -7.25% (6.48 => 6.95) > CBE: > singlesource/Benchmarks/Dhrystone/dry: 20.93% (1.29 => 1.02) > singlesource/Benchmarks/Dhrystone/fldry: -32.55% (2.98 => 3.95) > singlesource/Benchmarks/Shootout-C++/hash: 15.66% (1.66 => 1.40) > singlesource/Benchmarks/Shootout-C++/methcall: -22.97% (12.93 => > 15.90) > singlesource/Benchmarks/Shootout-C++/nestedloop: 96.99% (16.97 => > 0.51) > singlesource/Benchmarks/Shootout/matrix: -7.23% (4.70 => 5.04) > singlesource/Benchmarks/Shootout/methcall: 45.28% (19.59 => 10.72) > singlesource/Benchmarks/Shootout/nestedloop: 97.00% (16.98 => 0.51) > multisource/Benchmarks/Olden/bh/bh: -11.55% (4.33 => 4.83) > multisource/Benchmarks/Olden/em3d/em3d: -12.97% (10.79 => 12.19) > external/SPEC/CFP2006/444.namd/444.namd: -7.30% (28.20 => 30.26) > external/SPEC/CINT2000/300.twolf/300.twolf: -10.25% (9.76 => 10.76) > external/SPEC/CINT2006/462.libquantum/462.libquantum: 5.70% (7.90 > => 7.45) > LLC-BETA compile: > multisource/Applications/JM/ldecod/ldecod: 5.25% (6.4892 => 6.1483) > multisource/Benchmarks/ASCI_Purple/SMG2000/smg2000: -19.51% > (5.1884 => 6.2007) > multisource/Benchmarks/Prolangs-C/TimberWolfMC/timberwolfmc: 5.37% > (4.8463 => 4.5859) > multisource/Benchmarks/tramp3d-v4/tramp3d-v4: 7.35% (10.1621 => > 9.4153) > LLC compile: > multisource/Benchmarks/ASCI_Purple/SMG2000/smg2000: -19.40% > (5.2629 => 6.2840) > multisource/Benchmarks/MiBench/consumer-typeset/consumer-typeset: > 5.65% (10.9693 => 10.3497) > multisource/Benchmarks/Prolangs-C/TimberWolfMC/timberwolfmc: 6.79% > (4.6136 => 4.3004) > multisource/Benchmarks/tramp3d-v4/tramp3d-v4: 8.22% (10.0677 => > 9.2406) > GCCAS: > external/SPEC/CFP2006/447.dealII/447.dealII: -6.27% (60.0424 => > 63.8063) > > _______________________________________________ > llvm-testresults mailing list > llvm-testresults at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-testresults From sabre at nondot.org Wed Nov 28 15:26:18 2007 From: sabre at nondot.org (Chris Lattner) Date: Wed, 28 Nov 2007 21:26:18 -0000 Subject: [llvm-commits] [llvm] r44415 - /llvm/trunk/lib/Target/CBackend/CBackend.cpp Message-ID: <200711282126.lASLQIBn005687@zion.cs.uiuc.edu> Author: lattner Date: Wed Nov 28 15:26:17 2007 New Revision: 44415 URL: http://llvm.org/viewvc/llvm-project?rev=44415&view=rev Log: Work around a GCC bug, producing this code: unsigned char *llvm_cbe_X; .. llvm_cbe_X = 0; *((void**)&llvm_cbe_X) = __builtin_stack_save(); instead of: llvm_cbe_X = __builtin_stack_save(); See PR1809 for details. Modified: llvm/trunk/lib/Target/CBackend/CBackend.cpp Modified: llvm/trunk/lib/Target/CBackend/CBackend.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CBackend/CBackend.cpp?rev=44415&r1=44414&r2=44415&view=diff ============================================================================== --- llvm/trunk/lib/Target/CBackend/CBackend.cpp (original) +++ llvm/trunk/lib/Target/CBackend/CBackend.cpp Wed Nov 28 15:26:17 2007 @@ -2573,6 +2573,12 @@ writeOperand(I.getOperand(3)); Out << ")"; return; + case Intrinsic::stacksave: + // Emit this as: Val = 0; *((void**)&Val) = __builtin_stack_save() + // to work around GCC bugs (see PR1809). + Out << "0; *((void**)&" << GetValueName(&I) + << ") = __builtin_stack_save()"; + return; case Intrinsic::dbg_stoppoint: { // If we use writeOperand directly we get a "u" suffix which is rejected // by gcc. From sabre at nondot.org Wed Nov 28 16:43:35 2007 From: sabre at nondot.org (Chris Lattner) Date: Wed, 28 Nov 2007 22:43:35 -0000 Subject: [llvm-commits] [llvm] r44418 - /llvm/trunk/test/CFrontend/2007-11-28-GlobalInitializer.c Message-ID: <200711282243.lASMhZkY009879@zion.cs.uiuc.edu> Author: lattner Date: Wed Nov 28 16:43:34 2007 New Revision: 44418 URL: http://llvm.org/viewvc/llvm-project?rev=44418&view=rev Log: New testcase for PR1744 Added: llvm/trunk/test/CFrontend/2007-11-28-GlobalInitializer.c Added: llvm/trunk/test/CFrontend/2007-11-28-GlobalInitializer.c URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CFrontend/2007-11-28-GlobalInitializer.c?rev=44418&view=auto ============================================================================== --- llvm/trunk/test/CFrontend/2007-11-28-GlobalInitializer.c (added) +++ llvm/trunk/test/CFrontend/2007-11-28-GlobalInitializer.c Wed Nov 28 16:43:34 2007 @@ -0,0 +1,8 @@ +// RUN: %llvmgcc -S %s -o - +// PR1744 +typedef struct foo { int x; char *p; } FOO; +extern FOO yy[]; + +int *y = &((yy + 1)->x); +void *z = &((yy + 1)->x); + From sabre at nondot.org Wed Nov 28 16:44:02 2007 From: sabre at nondot.org (Chris Lattner) Date: Wed, 28 Nov 2007 22:44:02 -0000 Subject: [llvm-commits] [llvm-gcc-4.0] r44419 - /llvm-gcc-4.0/trunk/gcc/tree.c Message-ID: <200711282244.lASMi2iQ009909@zion.cs.uiuc.edu> Author: lattner Date: Wed Nov 28 16:44:01 2007 New Revision: 44419 URL: http://llvm.org/viewvc/llvm-project?rev=44419&view=rev Log: Fix PR1744 and test/CFrontend/2007-11-28-GlobalInitializer.c Modified: llvm-gcc-4.0/trunk/gcc/tree.c Modified: llvm-gcc-4.0/trunk/gcc/tree.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/gcc/tree.c?rev=44419&r1=44418&r2=44419&view=diff ============================================================================== --- llvm-gcc-4.0/trunk/gcc/tree.c (original) +++ llvm-gcc-4.0/trunk/gcc/tree.c Wed Nov 28 16:44:01 2007 @@ -2492,6 +2492,22 @@ } else if (CONSTANT_CLASS_P (node)) ; +/* APPLE LOCAL begin LLVM */ +#ifdef ENABLE_LLVM + /* Support the "array ref with pointer base" extension. If we have &p[i], + treat this like we do a binop. + */ + else if (TREE_CODE(node) == ARRAY_REF && + POINTER_TYPE_P(TREE_TYPE(TREE_OPERAND(node, 0)))) { + ti &= TREE_INVARIANT(TREE_OPERAND(node, 0)) & + TREE_INVARIANT(TREE_OPERAND(node, 1)); + tc &= TREE_CONSTANT(TREE_OPERAND(node, 0)) & + TREE_CONSTANT(TREE_OPERAND(node, 1)); + se |= TREE_SIDE_EFFECTS(TREE_OPERAND(node, 0)) | + TREE_SIDE_EFFECTS(TREE_OPERAND(node, 1)); + } +#endif +/* APPLE LOCAL end LLVM */ else { ti = tc = false; From sabre at nondot.org Wed Nov 28 16:45:08 2007 From: sabre at nondot.org (Chris Lattner) Date: Wed, 28 Nov 2007 22:45:08 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r44420 - /llvm-gcc-4.2/trunk/gcc/tree.c Message-ID: <200711282245.lASMj8Lc009951@zion.cs.uiuc.edu> Author: lattner Date: Wed Nov 28 16:45:08 2007 New Revision: 44420 URL: http://llvm.org/viewvc/llvm-project?rev=44420&view=rev Log: Fix test/CFrontend/2007-11-28-GlobalInitializer.c for PR1744 Modified: llvm-gcc-4.2/trunk/gcc/tree.c Modified: llvm-gcc-4.2/trunk/gcc/tree.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/tree.c?rev=44420&r1=44419&r2=44420&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/tree.c (original) +++ llvm-gcc-4.2/trunk/gcc/tree.c Wed Nov 28 16:45:08 2007 @@ -2887,6 +2887,22 @@ } else if (CONSTANT_CLASS_P (node)) ; +/* APPLE LOCAL begin LLVM */ +#ifdef ENABLE_LLVM + /* Support the "array ref with pointer base" extension. If we have &p[i], + treat this like we do a binop. + */ + else if (TREE_CODE(node) == ARRAY_REF && + POINTER_TYPE_P(TREE_TYPE(TREE_OPERAND(node, 0)))) { + ti &= TREE_INVARIANT(TREE_OPERAND(node, 0)) & + TREE_INVARIANT(TREE_OPERAND(node, 1)); + tc &= TREE_CONSTANT(TREE_OPERAND(node, 0)) & + TREE_CONSTANT(TREE_OPERAND(node, 1)); + se |= TREE_SIDE_EFFECTS(TREE_OPERAND(node, 0)) | + TREE_SIDE_EFFECTS(TREE_OPERAND(node, 1)); + } +#endif +/* APPLE LOCAL end LLVM */ else { ti = tc = false; From evan.cheng at apple.com Wed Nov 28 19:05:50 2007 From: evan.cheng at apple.com (Evan Cheng) Date: Thu, 29 Nov 2007 01:05:50 -0000 Subject: [llvm-commits] [llvm] r44427 - /llvm/trunk/lib/CodeGen/LiveInterval.cpp Message-ID: <200711290105.lAT15org016299@zion.cs.uiuc.edu> Author: evancheng Date: Wed Nov 28 19:05:47 2007 New Revision: 44427 URL: http://llvm.org/viewvc/llvm-project?rev=44427&view=rev Log: Kill info update bug. Modified: llvm/trunk/lib/CodeGen/LiveInterval.cpp Modified: llvm/trunk/lib/CodeGen/LiveInterval.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveInterval.cpp?rev=44427&r1=44426&r2=44427&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/LiveInterval.cpp (original) +++ llvm/trunk/lib/CodeGen/LiveInterval.cpp Wed Nov 28 19:05:47 2007 @@ -206,6 +206,9 @@ // endpoint as well. if (End > it->end) extendIntervalEndTo(it, End); + else + // Overlapping intervals, there might have been a kill here. + removeKill(it->valno, End); return it; } } else { From evan.cheng at apple.com Wed Nov 28 19:06:25 2007 From: evan.cheng at apple.com (Evan Cheng) Date: Thu, 29 Nov 2007 01:06:25 -0000 Subject: [llvm-commits] [llvm] r44428 - in /llvm/trunk: include/llvm/CodeGen/LiveIntervalAnalysis.h lib/CodeGen/LiveIntervalAnalysis.cpp lib/CodeGen/VirtRegMap.cpp lib/CodeGen/VirtRegMap.h Message-ID: <200711290106.lAT16PeP016333@zion.cs.uiuc.edu> Author: evancheng Date: Wed Nov 28 19:06:25 2007 New Revision: 44428 URL: http://llvm.org/viewvc/llvm-project?rev=44428&view=rev Log: Fixed various live interval splitting bugs / compile time issues. Modified: llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp llvm/trunk/lib/CodeGen/VirtRegMap.cpp llvm/trunk/lib/CodeGen/VirtRegMap.h Modified: llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h?rev=44428&r1=44427&r2=44428&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h (original) +++ llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h Wed Nov 28 19:06:25 2007 @@ -277,10 +277,13 @@ MachineInstr *DefMI, unsigned index, unsigned i, bool isSS, int slot, unsigned reg); - bool anyKillInMBBAfterIdx(const LiveInterval &li, - MachineBasicBlock *MBB, unsigned Idx, - const VNInfo *VNI = NULL) const; + /// anyKillInMBBAfterIdx - Returns true if there is a kill of the specified + /// VNInfo that's after the specified index but is within the basic block. + bool anyKillInMBBAfterIdx(const LiveInterval &li, const VNInfo *VNI, + MachineBasicBlock *MBB, unsigned Idx) const; + /// intervalIsInOneMBB - Returns true if the specified interval is entirely + /// within a single basic block. bool intervalIsInOneMBB(const LiveInterval &li) const; /// rewriteInstructionForSpills, rewriteInstructionsForSpills - Helper functions @@ -301,7 +304,9 @@ VirtRegMap &vrm, SSARegMap *RegMap, const TargetRegisterClass* rc, SmallVector &ReMatIds, const LoopInfo *loopInfo, BitVector &SpillMBBs, - std::map > &SpillIdxes, + std::map > &SpillIdxes, + BitVector &RestoreMBBs, + std::map > &RestoreIdxes, std::map &NewVRegs, std::vector &NewLIs); Modified: llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp?rev=44428&r1=44427&r2=44428&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp (original) +++ llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Wed Nov 28 19:06:25 2007 @@ -42,12 +42,15 @@ cl::init(false), cl::Hidden); cl::opt SplitAtBB("split-intervals-at-bb", - cl::init(false), cl::Hidden); + cl::init(false), cl::Hidden); + cl::opt SplitLimit("split-limit", + cl::init(-1), cl::Hidden); } STATISTIC(numIntervals, "Number of original intervals"); STATISTIC(numIntervalsAfter, "Number of intervals after coalescing"); -STATISTIC(numFolded , "Number of loads/stores folded into instructions"); +STATISTIC(numFolds , "Number of loads/stores folded into instructions"); +STATISTIC(numSplits , "Number of intervals split"); char LiveIntervals::ID = 0; namespace { @@ -389,7 +392,7 @@ unsigned killIndex = getInstructionIndex(&mbb->back()) + InstrSlots::NUM; LiveRange LR(defIndex, killIndex, ValNo); interval.addRange(LR); - interval.addKill(ValNo, killIndex-1); // odd # means phi node + interval.addKill(ValNo, killIndex+1); // odd # means phi node DOUT << " +" << LR; } } @@ -652,13 +655,17 @@ else LiveVariables::transferKillDeadInfo(MI, fmi, mri_); MachineBasicBlock &MBB = *MI->getParent(); - vrm.virtFolded(reg, MI, i, fmi); + if (isSS) { + if (!mf_->getFrameInfo()->isFixedObjectIndex(slot)) + vrm.virtFolded(reg, MI, i, fmi); + } vrm.transferSpillPts(MI, fmi); + vrm.transferRestorePts(MI, fmi); mi2iMap_.erase(MI); i2miMap_[index/InstrSlots::NUM] = fmi; mi2iMap_[fmi] = index; MI = MBB.insert(MBB.erase(MI), fmi); - ++numFolded; + ++numFolds; return true; } return false; @@ -681,20 +688,6 @@ return true; } -static -bool hasALaterUse(MachineBasicBlock *MBB, MachineInstr *MI, unsigned Reg) { - MachineBasicBlock::iterator I = MI; - if (I == MBB->end()) - return false; - ++I; - while (I != MBB->end()) { - if (I->findRegisterUseOperandIdx(Reg) != -1) - return true; - ++I; - } - return false; -} - /// rewriteInstructionForSpills, rewriteInstructionsForSpills - Helper functions /// for addIntervalsForSpills to rewrite uses / defs for the given live range. void LiveIntervals:: @@ -738,6 +731,7 @@ } // If def for this use can't be rematerialized, then try folding. + // If def is rematerializable and it's a load, also try folding. TryFold = !ReMatOrigDefMI || (ReMatOrigDefMI && (MI == ReMatOrigDefMI || isLoad)); if (isLoad) { @@ -747,15 +741,10 @@ } } - // If we are splitting live intervals, only fold if it's 1) the first - // use and it's a kill or 2) there isn't another use later in this MBB. - TryFold &= NewVReg == 0; - if (TryFold && TrySplit) - // Do not fold store into def here if we are splitting. We'll find an - // optimal point to insert a store later. - if (HasDef || mop.isDef() || - (!mop.isKill() && hasALaterUse(MI->getParent(), MI, li.reg))) - TryFold = false; + // Do not fold load / store here if we are splitting. We'll find an + // optimal point to insert a load / store later. + if (TryFold) + TryFold = !TrySplit && NewVReg == 0; // FIXME: fold subreg use if (!isSubReg && TryFold && @@ -859,27 +848,13 @@ } bool LiveIntervals::anyKillInMBBAfterIdx(const LiveInterval &li, - MachineBasicBlock *MBB, unsigned Idx, - const VNInfo *VNI) const { + const VNInfo *VNI, + MachineBasicBlock *MBB, unsigned Idx) const { unsigned End = getMBBEndIdx(MBB); - if (VNI) { - for (unsigned j = 0, ee = VNI->kills.size(); j != ee; ++j) { - unsigned KillIdx = VNI->kills[j]; - if (KillIdx > Idx && KillIdx < End) - return true; - } - return false; - } - - // Look at all the VNInfo's. - for (LiveInterval::const_vni_iterator i = li.vni_begin(), e = li.vni_end(); - i != e; ++i) { - const VNInfo *VNI = *i; - for (unsigned j = 0, ee = VNI->kills.size(); j != ee; ++j) { - unsigned KillIdx = VNI->kills[j]; - if (KillIdx > Idx && KillIdx < End) - return true; - } + for (unsigned j = 0, ee = VNI->kills.size(); j != ee; ++j) { + unsigned KillIdx = VNI->kills[j]; + if (KillIdx > Idx && KillIdx < End) + return true; } return false; } @@ -895,7 +870,9 @@ SmallVector &ReMatIds, const LoopInfo *loopInfo, BitVector &SpillMBBs, - std::map > &SpillIdxes, + std::map > &SpillIdxes, + BitVector &RestoreMBBs, + std::map > &RestoreIdxes, std::map &NewVRegs, std::vector &NewLIs) { unsigned NewVReg = 0; @@ -930,53 +907,79 @@ // Update weight of spill interval. LiveInterval &nI = getOrCreateInterval(NewVReg); - if (!TrySplitMI) + if (!TrySplitMI) { // The spill weight is now infinity as it cannot be spilled again. nI.weight = HUGE_VALF; - else { - // Keep track of the last def in each MBB. - if (HasDef) { - if (MI != ReMatOrigDefMI || !CanDelete) { - // If this is a two-address code, then this index probably starts a - // VNInfo so we should examine all the VNInfo's. - bool HasKill = HasUse - ? anyKillInMBBAfterIdx(li, MBB, getDefIndex(index)) - : anyKillInMBBAfterIdx(li, MBB, getDefIndex(index), I->valno); - if (!HasKill) { - unsigned MBBId = MBB->getNumber(); - // High bit specify whether this spill ought to be folded if - // possible. - std::map >::iterator SII = - SpillIdxes.find(MBBId); - if (SII == SpillIdxes.end() || (int)index > SII->second.first) - SpillIdxes[MBBId] = std::make_pair(index, NewVReg | (1 << 31)); - SpillMBBs.set(MBBId); - } + continue; + } + + // Keep track of the last def and first use in each MBB. + unsigned MBBId = MBB->getNumber(); + if (HasDef) { + if (MI != ReMatOrigDefMI || !CanDelete) { + // If this is a two-address code, then this index probably starts a + // VNInfo so we should examine all the VNInfo's. + bool HasKill = false; + if (!HasUse) + HasKill = anyKillInMBBAfterIdx(li, I->valno, MBB, getDefIndex(index)); + else { + const VNInfo *VNI = NULL; + for (LiveInterval::const_vni_iterator i = li.vni_begin(), + e = li.vni_end(); i != e; ++i) + if ((*i)->def == getDefIndex(index)) { + VNI = *i; + break; + } + if (VNI) + HasKill = anyKillInMBBAfterIdx(li, VNI, MBB, getDefIndex(index)); } - if (!IsNew) { - // It this interval hasn't been assigned a stack slot - // (because earlier def is remat), do it now. - int SS = vrm.getStackSlot(NewVReg); - if (SS != (int)Slot) { - assert(SS == VirtRegMap::NO_STACK_SLOT); - vrm.assignVirt2StackSlot(NewVReg, Slot); + if (!HasKill) { + std::map >::iterator SII = + SpillIdxes.find(MBBId); + if (SII == SpillIdxes.end()) + SpillIdxes[MBBId] = std::make_pair(index, true); + else if ((int)index > SII->second.first) { + // If there is an earlier def and this is a two-address + // instruction, then it's not possible to fold the store (which + // would also fold the load). + SpillIdxes[MBBId] = std::make_pair(index, !HasUse); } + SpillMBBs.set(MBBId); } - } else if (HasUse) { - // Use(s) following the last def, it's not safe to fold the spill. - unsigned MBBId = MBB->getNumber(); - std::map >::iterator SII = - SpillIdxes.find(MBBId); - if (SII != SpillIdxes.end() && - (SII->second.second & ((1<<31)-1)) == NewVReg && - (int)getUseIndex(index) > SII->second.first) - SpillIdxes[MBBId].second &= (1<<31)-1; } + if (!IsNew) { + // It this interval hasn't been assigned a stack slot + // (because earlier def is remat), do it now. + int SS = vrm.getStackSlot(NewVReg); + if (SS != (int)Slot) { + assert(SS == VirtRegMap::NO_STACK_SLOT); + vrm.assignVirt2StackSlot(NewVReg, Slot); + } + } + } - // Update spill weight. - unsigned loopDepth = loopInfo->getLoopDepth(MBB->getBasicBlock()); - nI.weight += getSpillWeight(HasDef, HasUse, loopDepth); + if (HasUse) { + std::map >::iterator SII = + SpillIdxes.find(MBBId); + if (SII != SpillIdxes.end() && (int)index > SII->second.first) + // Use(s) following the last def, it's not safe to fold the spill. + SII->second.second = false; + std::map >::iterator RII = + RestoreIdxes.find(MBBId); + if (RII != RestoreIdxes.end()) + // If we are splitting live intervals, only fold if it's the first + // use and there isn't another use later in the MBB. + RII->second.second = false; + else if (IsNew) { + // Only need a reload if there isn't an earlier def / use. + RestoreIdxes[MBBId] = std::make_pair(index, true); + RestoreMBBs.set(MBBId); + } } + + // Update spill weight. + unsigned loopDepth = loopInfo->getLoopDepth(MBB->getBasicBlock()); + nI.weight += getSpillWeight(HasDef, HasUse, loopDepth); } } @@ -998,7 +1001,9 @@ // Each bit specify whether it a spill is required in the MBB. BitVector SpillMBBs(mf_->getNumBlockIDs()); - std::map > SpillIdxes; + std::map > SpillIdxes; + BitVector RestoreMBBs(mf_->getNumBlockIDs()); + std::map > RestoreIdxes; std::map NewVRegs; std::vector NewLIs; SSARegMap *RegMap = mf_->getSSARegMap(); @@ -1036,13 +1041,15 @@ if (IsFirstRange) { rewriteInstructionsForSpills(li, false, I, NULL, ReMatDefMI, Slot, LdSlot, isLoad, isLoadSS, DefIsReMat, - false, vrm, RegMap, rc, ReMatIds, - loopInfo, SpillMBBs, SpillIdxes, NewVRegs, NewLIs); + false, vrm, RegMap, rc, ReMatIds, loopInfo, + SpillMBBs, SpillIdxes, RestoreMBBs, RestoreIdxes, + NewVRegs, NewLIs); } else { rewriteInstructionsForSpills(li, false, I, NULL, 0, Slot, 0, false, false, false, - false, vrm, RegMap, rc, ReMatIds, - loopInfo, SpillMBBs, SpillIdxes, NewVRegs, NewLIs); + false, vrm, RegMap, rc, ReMatIds, loopInfo, + SpillMBBs, SpillIdxes, RestoreMBBs, RestoreIdxes, + NewVRegs, NewLIs); } IsFirstRange = false; } @@ -1050,6 +1057,10 @@ } bool TrySplit = SplitAtBB && !intervalIsInOneMBB(li); + if (SplitLimit != -1 && (int)numSplits >= SplitLimit) + TrySplit = false; + if (TrySplit) + ++numSplits; bool NeedStackSlot = false; for (LiveInterval::const_vni_iterator i = li.vni_begin(), e = li.vni_end(); i != e; ++i) { @@ -1110,39 +1121,118 @@ bool isLoad = isLoadSS || (DefIsReMat && (ReMatDefMI->getInstrDescriptor()->Flags & M_LOAD_FLAG)); rewriteInstructionsForSpills(li, TrySplit, I, ReMatOrigDefMI, ReMatDefMI, - Slot, LdSlot, isLoad, isLoadSS, DefIsReMat, - CanDelete, vrm, RegMap, rc, ReMatIds, - loopInfo, SpillMBBs, SpillIdxes, NewVRegs, NewLIs); - } + Slot, LdSlot, isLoad, isLoadSS, DefIsReMat, + CanDelete, vrm, RegMap, rc, ReMatIds, loopInfo, + SpillMBBs, SpillIdxes, RestoreMBBs, RestoreIdxes, + NewVRegs, NewLIs); + } + + // Insert spills / restores if we are splitting. + if (TrySplit) { + if (NeedStackSlot) { + int Id = SpillMBBs.find_first(); + while (Id != -1) { + unsigned VReg = NewVRegs[Id]; + int index = SpillIdxes[Id].first; + bool DoFold = SpillIdxes[Id].second; + bool isReMat = vrm.isReMaterialized(VReg); + MachineInstr *MI = getInstructionFromIndex(index); + int OpIdx = -1; + bool FoldedLoad = false; + if (DoFold) { + for (unsigned j = 0, ee = MI->getNumOperands(); j != ee; ++j) { + MachineOperand &MO = MI->getOperand(j); + if (!MO.isRegister() || MO.getReg() != VReg) + continue; + if (MO.isUse()) { + // Can't fold if it's two-address code and the use isn't the + // first and only use. + // If there are more than one uses, a load is still needed. + if (!isReMat && !FoldedLoad && + RestoreMBBs[Id] && RestoreIdxes[Id].first == index && + RestoreIdxes[Id].second) { + FoldedLoad = true; + continue; + } else { + OpIdx = -1; + break; + } + } + OpIdx = (int)j; + } + } + // Fold the store into the def if possible. + if (OpIdx == -1) + DoFold = false; + if (DoFold) { + if (tryFoldMemoryOperand(MI, vrm, NULL, index, OpIdx, true, Slot, + VReg)) { + if (FoldedLoad) { + // Folded a two-address instruction, do not issue a load. + RestoreMBBs.reset(Id); + RestoreIdxes.erase(Id); + } + } else + DoFold = false; + } + + // Else tell the spiller to issue a store for us. + if (!DoFold) + vrm.addSpillPoint(VReg, MI); + Id = SpillMBBs.find_next(Id); + } + } - // Insert spills if we are splitting. - if (TrySplit && NeedStackSlot) { - int Id = SpillMBBs.find_first(); + int Id = RestoreMBBs.find_first(); while (Id != -1) { - unsigned index = SpillIdxes[Id].first; - unsigned VReg = SpillIdxes[Id].second & ((1 << 31)-1); - bool TryFold = SpillIdxes[Id].second & (1 << 31); + unsigned VReg = NewVRegs[Id]; + int index = RestoreIdxes[Id].first; + bool DoFold = RestoreIdxes[Id].second; MachineInstr *MI = getInstructionFromIndex(index); int OpIdx = -1; - if (TryFold) { + if (DoFold) { for (unsigned j = 0, ee = MI->getNumOperands(); j != ee; ++j) { MachineOperand &MO = MI->getOperand(j); if (!MO.isRegister() || MO.getReg() != VReg) continue; - if (MO.isUse()) { + if (MO.isDef()) { // Can't fold if it's two-address code. OpIdx = -1; break; } + if (OpIdx != -1) { + // Multiple uses, do not fold! + OpIdx = -1; + break; + } OpIdx = (int)j; } } - // Fold the store into the def if possible. - if (OpIdx == -1 || - !tryFoldMemoryOperand(MI, vrm, NULL, index, OpIdx, true, Slot, VReg)) - // Else tell the spiller to issue a store for us. - vrm.addSpillPoint(VReg, MI); - Id = SpillMBBs.find_next(Id); + + // Fold the load into the use if possible. + if (OpIdx == -1) + DoFold = false; + if (DoFold) { + if (vrm.isReMaterialized(VReg)) { + MachineInstr *ReMatDefMI = vrm.getReMaterializedMI(VReg); + int LdSlot = 0; + bool isLoadSS = tii_->isLoadFromStackSlot(ReMatDefMI, LdSlot); + // If the rematerializable def is a load, also try to fold it. + if (isLoadSS || + (ReMatDefMI->getInstrDescriptor()->Flags & M_LOAD_FLAG)) + DoFold = tryFoldMemoryOperand(MI, vrm, ReMatDefMI, index, OpIdx, + isLoadSS, LdSlot, VReg); + else + DoFold = false; + } else + DoFold = tryFoldMemoryOperand(MI, vrm, NULL, index, OpIdx, + true, Slot, VReg); + } + // If folding is not possible / failed, then tell the spiller to issue a + // load / rematerialization for us. + if (!DoFold) + vrm.addRestorePoint(VReg, MI); + Id = RestoreMBBs.find_next(Id); } } Modified: llvm/trunk/lib/CodeGen/VirtRegMap.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/VirtRegMap.cpp?rev=44428&r1=44427&r2=44428&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/VirtRegMap.cpp (original) +++ llvm/trunk/lib/CodeGen/VirtRegMap.cpp Wed Nov 28 19:06:25 2007 @@ -940,10 +940,6 @@ // ReMatDefs - These are rematerializable def MIs which are not deleted. SmallSet ReMatDefs; - // ReloadedSplits - Splits must be reloaded once per MBB. This keeps track - // which have been reloaded. - SmallSet ReloadedSplits; - // Keep track of kill information. BitVector RegKills(MRI->getNumRegs()); std::vector KillOps; @@ -963,6 +959,31 @@ MachineInstr &MI = *MII; const TargetInstrDescriptor *TID = MI.getInstrDescriptor(); + // Insert restores here if asked to. + if (VRM.isRestorePt(&MI)) { + std::vector &RestoreRegs = VRM.getRestorePtRestores(&MI); + for (unsigned i = 0, e = RestoreRegs.size(); i != e; ++i) { + unsigned VirtReg = RestoreRegs[i]; + if (!VRM.getPreSplitReg(VirtReg)) + continue; // Split interval spilled again. + unsigned Phys = VRM.getPhys(VirtReg); + MF.setPhysRegUsed(Phys); + if (VRM.isReMaterialized(VirtReg)) { + MRI->reMaterialize(MBB, &MI, Phys, + VRM.getReMaterializedMI(VirtReg)); + ++NumReMats; + } else { + const TargetRegisterClass* RC = RegMap->getRegClass(VirtReg); + MRI->loadRegFromStackSlot(MBB, &MI, Phys, VRM.getStackSlot(VirtReg), RC); + ++NumLoads; + } + // This invalidates Phys. + Spills.ClobberPhysReg(Phys); + UpdateKills(*prior(MII), RegKills, KillOps); + DOUT << '\t' << *prior(MII); + } + } + // Insert spills here if asked to. if (VRM.isSpillPt(&MI)) { std::vector &SpillRegs = VRM.getSpillPtSpills(&MI); @@ -1006,43 +1027,6 @@ MF.setPhysRegUsed(Phys); if (MO.isDef()) ReusedOperands.markClobbered(Phys); - - // If it's a split live interval, insert a reload for the first use - // unless it's previously defined in the MBB. - unsigned SplitReg = VRM.getPreSplitReg(VirtReg); - if (SplitReg) { - if (ReloadedSplits.insert(VirtReg)) { - bool HasUse = MO.isUse(); - // If it's a def, we don't need to reload the value unless it's - // a two-address code. - if (!HasUse) { - for (unsigned j = i+1; j != e; ++j) { - MachineOperand &MOJ = MI.getOperand(j); - if (MOJ.isRegister() && MOJ.getReg() == VirtReg) { - HasUse = true; - break; - } - } - } - - if (HasUse) { - if (VRM.isReMaterialized(VirtReg)) { - MRI->reMaterialize(MBB, &MI, Phys, - VRM.getReMaterializedMI(VirtReg)); - ++NumReMats; - } else { - const TargetRegisterClass* RC = RegMap->getRegClass(VirtReg); - MRI->loadRegFromStackSlot(MBB, &MI, Phys, VRM.getStackSlot(VirtReg), RC); - ++NumLoads; - } - // This invalidates Phys. - Spills.ClobberPhysReg(Phys); - UpdateKills(*prior(MII), RegKills, KillOps); - DOUT << '\t' << *prior(MII); - } - } - } - unsigned RReg = SubIdx ? MRI->getSubReg(Phys, SubIdx) : Phys; MI.getOperand(i).setReg(RReg); continue; @@ -1264,12 +1248,6 @@ VirtRegMap::ModRef MR = I->second.second; DOUT << "Folded vreg: " << VirtReg << " MR: " << MR; - // If this is a split live interval, remember we have seen this so - // we do not need to reload it for later uses. - unsigned SplitReg = VRM.getPreSplitReg(VirtReg); - if (SplitReg) - ReloadedSplits.insert(VirtReg); - int SS = VRM.getStackSlot(VirtReg); if (SS == VirtRegMap::NO_STACK_SLOT) continue; Modified: llvm/trunk/lib/CodeGen/VirtRegMap.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/VirtRegMap.h?rev=44428&r1=44427&r2=44428&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/VirtRegMap.h (original) +++ llvm/trunk/lib/CodeGen/VirtRegMap.h Wed Nov 28 19:06:25 2007 @@ -82,6 +82,11 @@ /// splitting. std::map > SpillPt2VirtMap; + /// RestorePt2VirtMap - This records the virtual registers which should + /// be restored right before the MachineInstr due to live interval + /// splitting. + std::map > RestorePt2VirtMap; + /// ReMatId - Instead of assigning a stack slot to a to be rematerialized /// virtual register, an unique id is being assigned. This keeps track of /// the highest id used so far. Note, this starts at (1<<18) to avoid @@ -239,6 +244,41 @@ SpillPt2VirtMap.erase(I); } + /// @brief returns true if the specified MachineInstr is a restore point. + bool isRestorePt(MachineInstr *Pt) const { + return RestorePt2VirtMap.find(Pt) != RestorePt2VirtMap.end(); + } + + /// @brief returns the virtual registers that should be restoreed due to + /// splitting right after the specified MachineInstr. + std::vector &getRestorePtRestores(MachineInstr *Pt) { + return RestorePt2VirtMap[Pt]; + } + + /// @brief records the specified MachineInstr as a restore point for virtReg. + void addRestorePoint(unsigned virtReg, MachineInstr *Pt) { + if (RestorePt2VirtMap.find(Pt) != RestorePt2VirtMap.end()) + RestorePt2VirtMap[Pt].push_back(virtReg); + else { + std::vector Virts; + Virts.push_back(virtReg); + RestorePt2VirtMap.insert(std::make_pair(Pt, Virts)); + } + } + + void transferRestorePts(MachineInstr *Old, MachineInstr *New) { + std::map >::iterator I = + RestorePt2VirtMap.find(Old); + if (I == RestorePt2VirtMap.end()) + return; + while (!I->second.empty()) { + unsigned virtReg = I->second.back(); + I->second.pop_back(); + addRestorePoint(virtReg, New); + } + RestorePt2VirtMap.erase(I); + } + /// @brief Updates information about the specified virtual register's value /// folded into newMI machine instruction. The OpNum argument indicates the /// operand number of OldMI that is folded. @@ -261,6 +301,7 @@ void RemoveMachineInstrFromMaps(MachineInstr *MI) { MI2VirtMap.erase(MI); SpillPt2VirtMap.erase(MI); + RestorePt2VirtMap.erase(MI); } void print(std::ostream &OS) const; From clattner at apple.com Wed Nov 28 23:09:49 2007 From: clattner at apple.com (Chris Lattner) Date: Wed, 28 Nov 2007 21:09:49 -0800 Subject: [llvm-commits] updated patch for PR889 In-Reply-To: References: Message-ID: On Nov 28, 2007, at 12:55 PM, pawel kunio wrote: > Hello, > Here comes updated patch for PR889 with all the changes suggested by > Chris applied to the source. I was just wondering > whether the dynamic casts wont impose too much of burden > performance-wise compared to checking the SubClassID, > possible open thing for checking the types in Value destructor > (applies to Instruction inherited classes only). cast() is a free conversion. It does a check in an assert build (which isn't free) but no check in a non-assert build. dyn_cast() does a check in every build, but the check just looks at the subclassid, so it's equivalent to doing a comparison on subclassid then a C cast (so yeah, it's efficient :) The patch is looking good, but there are a couple of minor issues: + case ConstantExprVal: + if(cast(this)->getOpcode() == Instruction::GetElementPtr) + GetElementPtrConstantExpr ::destroyThis(cast(this)); + else if(cast(this)->getOpcode() == Instruction::ExtractElement) + ExtractElementConstantExpr ::destroyThis(cast(this)); + else if(cast(this)->getOpcode() == Instruction::InsertElement) + InsertElementConstantExpr ::destroyThis(cast(this)); + else if(cast(this)->getOpcode() == Instruction::Select) + SelectConstantExpr::destroyThis(cast(this)); + else if(cast(this)->getOpcode() == Instruction::ShuffleVector) + ShuffleVectorConstantExpr ::destroyThis(cast(this)); Please make this fit in 80 columns, for example, by doing: + case ConstantExprVal: { const ConstantExpr *CE = cast(this); + if(CE->getOpcode() == Instruction::GetElementPtr) + GetElementPtrConstantExpr ::destroyThis(cast(CE)); + else if(CE->getOpcode() == Instruction::ExtractElement) + ExtractElementConstantExpr ::destroyThis(cast(CE)); ... + else if(BinaryConstantExpr* BCE = dyn_cast(this)) + BinaryConstantExpr::destroyThis(BCE); + else if(UnaryConstantExpr* UCE = dyn_cast(this)) + UnaryConstantExpr::destroyThis(UCE); + else if(CompareConstantExpr* CCE = dyn_cast(this)) + CompareConstantExpr::destroyThis(CCE); It looks like some tabs snuck in here. + default: + if (BinaryOperator *BO = dyn_cast(this)) + BinaryOperator::destroyThis(BO); + else if (CallInst *CI = dyn_cast(this)) + { + if(IntrinsicInst* II = dyn_cast(this)) + { + if(DbgInfoIntrinsic* DII = dyn_cast(this)) + { + if(DbgDeclareInst* DDI = dyn_cast(this)) + DbgDeclareInst::destroyThis(DDI); + else if(DbgFuncStartInst* DFSI = dyn_cast(this)) + DbgFuncStartInst::destroyThis(DFSI); + else if(DbgRegionEndInst* DREI = dyn_cast(this)) + DbgRegionEndInst::destroyThis(DREI); + else if(DbgRegionStartInst* DRSI = dyn_cast(this)) + DbgRegionStartInst::destroyThis(DRSI); Likewise, more tabs. + else if (CmpInst *CI = dyn_cast(this)) + { + if (FCmpInst *FCI = dyn_cast(this)) + FCmpInst::destroyThis(FCI); + else if (ICmpInst *ICI = dyn_cast(this)) + ICmpInst::destroyThis(ICI); + else + CmpInst::destroyThis(CI); This pattern occurs frequently, with different classes. This should only have to handle concrete classes, so I'd prefer that you write this like: + else if (CmpInst *CI = dyn_cast(this)) + { + if (FCmpInst *FCI = dyn_cast(this)) + FCmpInst::destroyThis(FCI); + else if (ICmpInst *ICI = dyn_cast(this)) + ICmpInst::destroyThis(ICI); + else + assert(0 && "Unknown compare instruction"); or better yet: + else if (CmpInst *CI = dyn_cast(this)) + { + if (FCmpInst *FCI = dyn_cast(this)) + FCmpInst::destroyThis(FCI); + else + ICmpInst::destroyThis(cast(this)); which makes it obvious that the only sort of CmpInst is a FCmpInst or ICmpInst. +#if 0 + else if(isa(this)) + { Please remove the #if 0 code. Otherwise, it looks great! -Chris From sabre at nondot.org Thu Nov 29 00:04:42 2007 From: sabre at nondot.org (Chris Lattner) Date: Thu, 29 Nov 2007 06:04:42 -0000 Subject: [llvm-commits] [llvm] r44430 - /llvm/trunk/include/llvm/ADT/StringMap.h Message-ID: <200711290604.lAT64gqZ028152@zion.cs.uiuc.edu> Author: lattner Date: Thu Nov 29 00:04:41 2007 New Revision: 44430 URL: http://llvm.org/viewvc/llvm-project?rev=44430&view=rev Log: provide an optional API to allow datatypes in a stringmap to be *gasp* initialized with a value if they want, by specializing the StringMapEntryInitializer class. Modified: llvm/trunk/include/llvm/ADT/StringMap.h Modified: llvm/trunk/include/llvm/ADT/StringMap.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/StringMap.h?rev=44430&r1=44429&r2=44430&view=diff ============================================================================== --- llvm/trunk/include/llvm/ADT/StringMap.h (original) +++ llvm/trunk/include/llvm/ADT/StringMap.h Thu Nov 29 00:04:41 2007 @@ -23,6 +23,17 @@ template class StringMapIterator; +/// StringMapEntryInitializer - This datatype can be partially specialized for +/// various datatypes in a stringmap to allow them to be initialized when an +/// entry is default constructed for the map. +template +class StringMapEntryInitializer { +public: + template + static void Initialize(ValueTy &T, InitTy InitVal) { + } +}; + /// StringMapEntryBase - Shared base class of StringMapEntry instances. class StringMapEntryBase { @@ -132,9 +143,10 @@ /// Create - Create a StringMapEntry for the specified key and default /// construct the value. - template + template static StringMapEntry *Create(const char *KeyStart, const char *KeyEnd, - AllocatorTy &Allocator) { + AllocatorTy &Allocator, + InitType InitVal) { unsigned KeyLength = KeyEnd-KeyStart; // Okay, the item doesn't already exist, and 'Bucket' is the bucket to fill @@ -154,15 +166,30 @@ char *StrBuffer = const_cast(NewItem->getKeyData()); memcpy(StrBuffer, KeyStart, KeyLength); StrBuffer[KeyLength] = 0; // Null terminate for convenience of clients. + + // Initialize the value if the client wants to. + StringMapEntryInitializer::Initialize(NewItem->getValue(),InitVal); return NewItem; } + template + static StringMapEntry *Create(const char *KeyStart, const char *KeyEnd, + AllocatorTy &Allocator) { + return Create(KeyStart, KeyEnd, Allocator, (void*)0); + } + + /// Create - Create a StringMapEntry with normal malloc/free. - static StringMapEntry *Create(const char *KeyStart, const char *KeyEnd) { + template + static StringMapEntry *Create(const char *KeyStart, const char *KeyEnd, + InitType InitVal) { MallocAllocator A; - return Create(KeyStart, KeyEnd, A); + return Create(KeyStart, KeyEnd, A, InitVal); + } + + static StringMapEntry *Create(const char *KeyStart, const char *KeyEnd) { + return Create(KeyStart, KeyEnd, (void*)0); } - /// GetStringMapEntryFromValue - Given a value that is known to be embedded /// into a StringMapEntry, return the StringMapEntry itself. @@ -262,14 +289,16 @@ /// GetOrCreateValue - Look up the specified key in the table. If a value /// exists, return it. Otherwise, default construct a value, insert it, and /// return. + template StringMapEntry &GetOrCreateValue(const char *KeyStart, - const char *KeyEnd) { + const char *KeyEnd, + InitTy Val) { unsigned BucketNo = LookupBucketFor(KeyStart, KeyEnd); ItemBucket &Bucket = TheTable[BucketNo]; if (Bucket.Item && Bucket.Item != getTombstoneVal()) return *static_cast(Bucket.Item); - MapEntryTy *NewItem = MapEntryTy::Create(KeyStart, KeyEnd, Allocator); + MapEntryTy *NewItem = MapEntryTy::Create(KeyStart, KeyEnd, Allocator, Val); if (Bucket.Item == getTombstoneVal()) --NumTombstones; @@ -284,6 +313,11 @@ return *NewItem; } + StringMapEntry &GetOrCreateValue(const char *KeyStart, + const char *KeyEnd) { + return GetOrCreateValue(KeyStart, KeyEnd, (void*)0); + } + /// remove - Remove the specified key/value pair from the map, but do not /// erase it. This aborts if the key is not in the map. void remove(MapEntryTy *KeyValue) { From sabre at nondot.org Thu Nov 29 00:14:41 2007 From: sabre at nondot.org (Chris Lattner) Date: Thu, 29 Nov 2007 06:14:41 -0000 Subject: [llvm-commits] [llvm] r44432 - /llvm/trunk/include/llvm/ADT/StringMap.h Message-ID: <200711290614.lAT6EfKv028565@zion.cs.uiuc.edu> Author: lattner Date: Thu Nov 29 00:14:41 2007 New Revision: 44432 URL: http://llvm.org/viewvc/llvm-project?rev=44432&view=rev Log: Pass the whole StringMapEntry into StringMapEntryInitializer::Initialize. Modified: llvm/trunk/include/llvm/ADT/StringMap.h Modified: llvm/trunk/include/llvm/ADT/StringMap.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/StringMap.h?rev=44432&r1=44431&r2=44432&view=diff ============================================================================== --- llvm/trunk/include/llvm/ADT/StringMap.h (original) +++ llvm/trunk/include/llvm/ADT/StringMap.h Thu Nov 29 00:14:41 2007 @@ -22,6 +22,8 @@ class StringMapConstIterator; template class StringMapIterator; + template + class StringMapEntry; /// StringMapEntryInitializer - This datatype can be partially specialized for /// various datatypes in a stringmap to allow them to be initialized when an @@ -30,7 +32,7 @@ class StringMapEntryInitializer { public: template - static void Initialize(ValueTy &T, InitTy InitVal) { + static void Initialize(StringMapEntry &T, InitTy InitVal) { } }; @@ -168,7 +170,7 @@ StrBuffer[KeyLength] = 0; // Null terminate for convenience of clients. // Initialize the value if the client wants to. - StringMapEntryInitializer::Initialize(NewItem->getValue(),InitVal); + StringMapEntryInitializer::Initialize(*NewItem, InitVal); return NewItem; } From baldrick at free.fr Thu Nov 29 02:30:15 2007 From: baldrick at free.fr (Duncan Sands) Date: Thu, 29 Nov 2007 08:30:15 -0000 Subject: [llvm-commits] [llvm] r44433 - /llvm/trunk/lib/VMCore/Instructions.cpp Message-ID: <200711290830.lAT8UFcE002403@zion.cs.uiuc.edu> Author: baldrick Date: Thu Nov 29 02:30:15 2007 New Revision: 44433 URL: http://llvm.org/viewvc/llvm-project?rev=44433&view=rev Log: Small parameter attributes cleanup. Modified: llvm/trunk/lib/VMCore/Instructions.cpp Modified: llvm/trunk/lib/VMCore/Instructions.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Instructions.cpp?rev=44433&r1=44432&r2=44433&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/Instructions.cpp (original) +++ llvm/trunk/lib/VMCore/Instructions.cpp Thu Nov 29 02:30:15 2007 @@ -385,8 +385,9 @@ bool CallInst::paramHasAttr(uint16_t i, ParameterAttributes attr) const { if (ParamAttrs && ParamAttrs->paramHasAttr(i, attr)) return true; - const Function *F = getCalledFunction(); - return F && F->getParamAttrs() && F->getParamAttrs()->paramHasAttr(i, attr); + if (const Function *F = getCalledFunction()) + return F->paramHasAttr(i, attr); + return false; } @@ -462,8 +463,9 @@ bool InvokeInst::paramHasAttr(uint16_t i, ParameterAttributes attr) const { if (ParamAttrs && ParamAttrs->paramHasAttr(i, attr)) return true; - const Function *F = getCalledFunction(); - return F && F->getParamAttrs() && F->getParamAttrs()->paramHasAttr(i, attr); + if (const Function *F = getCalledFunction()) + return F->paramHasAttr(i, attr); + return false; } From evan.cheng at apple.com Thu Nov 29 03:49:24 2007 From: evan.cheng at apple.com (Evan Cheng) Date: Thu, 29 Nov 2007 09:49:24 -0000 Subject: [llvm-commits] [llvm] r44434 - in /llvm/trunk: include/llvm/CodeGen/LiveInterval.h lib/CodeGen/LiveInterval.cpp lib/CodeGen/LiveIntervalAnalysis.cpp lib/CodeGen/SimpleRegisterCoalescing.cpp Message-ID: <200711290949.lAT9nOk7012988@zion.cs.uiuc.edu> Author: evancheng Date: Thu Nov 29 03:49:23 2007 New Revision: 44434 URL: http://llvm.org/viewvc/llvm-project?rev=44434&view=rev Log: Replace the odd kill# hack with something less fragile. Modified: llvm/trunk/include/llvm/CodeGen/LiveInterval.h llvm/trunk/lib/CodeGen/LiveInterval.cpp llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp Modified: llvm/trunk/include/llvm/CodeGen/LiveInterval.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/LiveInterval.h?rev=44434&r1=44433&r2=44434&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/LiveInterval.h (original) +++ llvm/trunk/include/llvm/CodeGen/LiveInterval.h Thu Nov 29 03:49:23 2007 @@ -38,16 +38,18 @@ /// contains ~1u,x to indicate that the value # is not used. /// def - Instruction # of the definition. /// reg - Source reg iff val# is defined by a copy; zero otherwise. + /// hasPHIKill - One or more of the kills are PHI nodes. /// kills - Instruction # of the kills. If a kill is an odd #, it means /// the kill is a phi join point. struct VNInfo { unsigned id; unsigned def; unsigned reg; + bool hasPHIKill; SmallVector kills; - VNInfo() : id(~1U), def(~1U), reg(0) {} + VNInfo() : id(~1U), def(~1U), reg(0), hasPHIKill(false) {} VNInfo(unsigned i, unsigned d, unsigned r) - : id(i), def(d), reg(r) {} + : id(i), def(d), reg(r), hasPHIKill(false) {} }; /// LiveRange structure - This represents a simple register range in the @@ -158,6 +160,7 @@ void copyValNumInfo(VNInfo *DstValNo, const VNInfo *SrcValNo) { DstValNo->def = SrcValNo->def; DstValNo->reg = SrcValNo->reg; + DstValNo->hasPHIKill = SrcValNo->hasPHIKill; DstValNo->kills = SrcValNo->kills; } Modified: llvm/trunk/lib/CodeGen/LiveInterval.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveInterval.cpp?rev=44434&r1=44433&r2=44434&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/LiveInterval.cpp (original) +++ llvm/trunk/lib/CodeGen/LiveInterval.cpp Thu Nov 29 03:49:23 2007 @@ -206,7 +206,7 @@ // endpoint as well. if (End > it->end) extendIntervalEndTo(it, End); - else + else if (End < it->end) // Overlapping intervals, there might have been a kill here. removeKill(it->valno, End); return it; @@ -631,6 +631,8 @@ if (j != ee-1) OS << " "; } + if (vni->hasPHIKill) + OS << " phi"; OS << ")"; } } Modified: llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp?rev=44434&r1=44433&r2=44434&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp (original) +++ llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Thu Nov 29 03:49:23 2007 @@ -362,7 +362,8 @@ DOUT << " Removing [" << Start << "," << End << "] from: "; interval.print(DOUT, mri_); DOUT << "\n"; interval.removeRange(Start, End); - interval.addKill(VNI, Start+1); // odd # means phi node + interval.addKill(VNI, Start); + VNI->hasPHIKill = true; DOUT << " RESULT: "; interval.print(DOUT, mri_); // Replace the interval with one of a NEW value number. Note that this @@ -392,7 +393,8 @@ unsigned killIndex = getInstructionIndex(&mbb->back()) + InstrSlots::NUM; LiveRange LR(defIndex, killIndex, ValNo); interval.addRange(LR); - interval.addKill(ValNo, killIndex+1); // odd # means phi node + interval.addKill(ValNo, killIndex); + ValNo->hasPHIKill = true; DOUT << " +" << LR; } } @@ -1081,21 +1083,14 @@ vrm.setVirtIsReMaterialized(li.reg, ReMatDefMI); bool CanDelete = true; - for (unsigned j = 0, ee = VNI->kills.size(); j != ee; ++j) { - unsigned KillIdx = VNI->kills[j]; - MachineInstr *KillMI = (KillIdx & 1) - ? NULL : getInstructionFromIndex(KillIdx); - // Kill is a phi node, not all of its uses can be rematerialized. + if (VNI->hasPHIKill) { + // A kill is a phi node, not all of its uses can be rematerialized. // It must not be deleted. - if (!KillMI) { - CanDelete = false; - // Need a stack slot if there is any live range where uses cannot be - // rematerialized. - NeedStackSlot = true; - break; - } + CanDelete = false; + // Need a stack slot if there is any live range where uses cannot be + // rematerialized. + NeedStackSlot = true; } - if (CanDelete) ReMatDelete.set(VN); } else { Modified: llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp?rev=44434&r1=44433&r2=44434&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp (original) +++ llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp Thu Nov 29 03:49:23 2007 @@ -490,6 +490,7 @@ if (CopiedValNos.insert(DstValNo)) { VNInfo *ValNo = RealDstInt.getNextValue(DstValNo->def, DstValNo->reg, li_->getVNInfoAllocator()); + ValNo->hasPHIKill = DstValNo->hasPHIKill; RealDstInt.addKills(ValNo, DstValNo->kills); RealDstInt.MergeValueInAsValue(*ResDstInt, DstValNo, ValNo); } @@ -734,6 +735,7 @@ // Okay, the final step is to loop over the RHS live intervals, adding them to // the LHS. + LHSValNo->hasPHIKill |= VNI->hasPHIKill; LHS.addKills(LHSValNo, VNI->kills); LHS.MergeRangesInAsValue(RHS, LHSValNo); LHS.weight += RHS.weight; @@ -969,6 +971,7 @@ VNInfo *VNI = I->first; unsigned LHSValID = LHSValNoAssignments[VNI->id]; LiveInterval::removeKill(NewVNInfo[LHSValID], VNI->def); + NewVNInfo[LHSValID]->hasPHIKill |= VNI->hasPHIKill; RHS.addKills(NewVNInfo[LHSValID], VNI->kills); } @@ -978,6 +981,7 @@ VNInfo *VNI = I->first; unsigned RHSValID = RHSValNoAssignments[VNI->id]; LiveInterval::removeKill(NewVNInfo[RHSValID], VNI->def); + NewVNInfo[RHSValID]->hasPHIKill |= VNI->hasPHIKill; LHS.addKills(NewVNInfo[RHSValID], VNI->kills); } From evan.cheng at apple.com Thu Nov 29 04:12:20 2007 From: evan.cheng at apple.com (Evan Cheng) Date: Thu, 29 Nov 2007 10:12:20 -0000 Subject: [llvm-commits] [llvm] r44436 - in /llvm/trunk: include/llvm/CodeGen/LiveIntervalAnalysis.h lib/CodeGen/LiveIntervalAnalysis.cpp Message-ID: <200711291012.lATACNxB014321@zion.cs.uiuc.edu> Author: evancheng Date: Thu Nov 29 04:12:14 2007 New Revision: 44436 URL: http://llvm.org/viewvc/llvm-project?rev=44436&view=rev Log: Fix a major performance issue with splitting. If there is a def (not def/use) in the middle of a split basic block, create a new live interval starting at the def. This avoid artifically extending the live interval over a number of cycles where it is dead. e.g. bb1: = vr1204 (use / kill) <= new interval starts and ends here. .. .. vr1204 = (new def) <= start a new interval here. = vr1204 (use) Modified: llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Modified: llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h?rev=44436&r1=44435&r2=44436&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h (original) +++ llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h Thu Nov 29 04:12:14 2007 @@ -286,6 +286,21 @@ /// within a single basic block. bool intervalIsInOneMBB(const LiveInterval &li) const; + /// SRInfo - Spill / restore info. + struct SRInfo { + int index; + unsigned vreg; + bool canFold; + SRInfo(int i, unsigned vr, bool f) : index(i), vreg(vr), canFold(f) {}; + }; + + bool alsoFoldARestore(int Id, int index, unsigned vr, + BitVector &RestoreMBBs, + std::map > &RestoreIdxes); + void eraseRestoreInfo(int Id, int index, unsigned vr, + BitVector &RestoreMBBs, + std::map > &RestoreIdxes); + /// rewriteInstructionForSpills, rewriteInstructionsForSpills - Helper functions /// for addIntervalsForSpills to rewrite uses / defs for the given live range. void rewriteInstructionForSpills(const LiveInterval &li, bool TrySplit, @@ -295,7 +310,7 @@ VirtRegMap &vrm, SSARegMap *RegMap, const TargetRegisterClass* rc, SmallVector &ReMatIds, unsigned &NewVReg, bool &HasDef, bool &HasUse, const LoopInfo *loopInfo, - std::map &NewVRegs, + std::map &MBBVRegsMap, std::vector &NewLIs); void rewriteInstructionsForSpills(const LiveInterval &li, bool TrySplit, LiveInterval::Ranges::const_iterator &I, @@ -304,10 +319,10 @@ VirtRegMap &vrm, SSARegMap *RegMap, const TargetRegisterClass* rc, SmallVector &ReMatIds, const LoopInfo *loopInfo, BitVector &SpillMBBs, - std::map > &SpillIdxes, + std::map > &SpillIdxes, BitVector &RestoreMBBs, - std::map > &RestoreIdxes, - std::map &NewVRegs, + std::map > &RestoreIdxes, + std::map &MBBVRegsMap, std::vector &NewLIs); static LiveInterval createInterval(unsigned Reg); Modified: llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp?rev=44436&r1=44435&r2=44436&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp (original) +++ llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Thu Nov 29 04:12:14 2007 @@ -703,7 +703,7 @@ SmallVector &ReMatIds, unsigned &NewVReg, bool &HasDef, bool &HasUse, const LoopInfo *loopInfo, - std::map &NewVRegs, + std::map &MBBVRegsMap, std::vector &NewLIs) { RestartInstruction: for (unsigned i = 0; i != MI->getNumOperands(); ++i) { @@ -816,7 +816,7 @@ LiveInterval &nI = getOrCreateInterval(NewVReg); if (CreatedNewVReg) { NewLIs.push_back(&nI); - NewVRegs.insert(std::make_pair(MI->getParent()->getNumber(), NewVReg)); + MBBVRegsMap.insert(std::make_pair(MI->getParent()->getNumber(), NewVReg)); if (TrySplit) vrm.setIsSplitFromReg(NewVReg, li.reg); } @@ -861,6 +861,17 @@ return false; } +static const VNInfo *findDefinedVNInfo(const LiveInterval &li, unsigned DefIdx) { + const VNInfo *VNI = NULL; + for (LiveInterval::const_vni_iterator i = li.vni_begin(), + e = li.vni_end(); i != e; ++i) + if ((*i)->def == DefIdx) { + VNI = *i; + break; + } + return VNI; +} + void LiveIntervals:: rewriteInstructionsForSpills(const LiveInterval &li, bool TrySplit, LiveInterval::Ranges::const_iterator &I, @@ -872,10 +883,10 @@ SmallVector &ReMatIds, const LoopInfo *loopInfo, BitVector &SpillMBBs, - std::map > &SpillIdxes, + std::map > &SpillIdxes, BitVector &RestoreMBBs, - std::map > &RestoreIdxes, - std::map &NewVRegs, + std::map > &RestoreIdxes, + std::map &MBBVRegsMap, std::vector &NewLIs) { unsigned NewVReg = 0; unsigned index = getBaseIndex(I->start); @@ -892,9 +903,34 @@ NewVReg = 0; if (TrySplitMI) { std::map::const_iterator NVI = - NewVRegs.find(MBB->getNumber()); - if (NVI != NewVRegs.end()) + MBBVRegsMap.find(MBB->getNumber()); + if (NVI != MBBVRegsMap.end()) { NewVReg = NVI->second; + // One common case: + // x = use + // ... + // ... + // def = ... + // = use + // It's better to start a new interval to avoid artifically + // extend the new interval. + // FIXME: Too slow? Can we fix it after rewriteInstructionsForSpills? + bool MIHasUse = false; + bool MIHasDef = false; + for (unsigned i = 0; i != MI->getNumOperands(); ++i) { + MachineOperand& mop = MI->getOperand(i); + if (!mop.isRegister() || mop.getReg() != li.reg) + continue; + if (mop.isUse()) + MIHasUse = true; + else + MIHasDef = true; + } + if (MIHasDef && !MIHasUse) { + MBBVRegsMap.erase(MBB->getNumber()); + NewVReg = 0; + } + } } bool IsNew = NewVReg == 0; bool HasDef = false; @@ -903,7 +939,7 @@ MI, ReMatOrigDefMI, ReMatDefMI, Slot, LdSlot, isLoad, isLoadSS, DefIsReMat, CanDelete, vrm, RegMap, rc, ReMatIds, NewVReg, HasDef, HasUse, - loopInfo, NewVRegs, NewLIs); + loopInfo, MBBVRegsMap, NewLIs); if (!HasDef && !HasUse) continue; @@ -919,36 +955,37 @@ unsigned MBBId = MBB->getNumber(); if (HasDef) { if (MI != ReMatOrigDefMI || !CanDelete) { - // If this is a two-address code, then this index probably starts a - // VNInfo so we should examine all the VNInfo's. bool HasKill = false; if (!HasUse) HasKill = anyKillInMBBAfterIdx(li, I->valno, MBB, getDefIndex(index)); else { - const VNInfo *VNI = NULL; - for (LiveInterval::const_vni_iterator i = li.vni_begin(), - e = li.vni_end(); i != e; ++i) - if ((*i)->def == getDefIndex(index)) { - VNI = *i; - break; - } + // If this is a two-address code, then this index starts a new VNInfo. + const VNInfo *VNI = findDefinedVNInfo(li, getDefIndex(index)); if (VNI) HasKill = anyKillInMBBAfterIdx(li, VNI, MBB, getDefIndex(index)); } if (!HasKill) { - std::map >::iterator SII = + std::map >::iterator SII = SpillIdxes.find(MBBId); - if (SII == SpillIdxes.end()) - SpillIdxes[MBBId] = std::make_pair(index, true); - else if ((int)index > SII->second.first) { + if (SII == SpillIdxes.end()) { + std::vector S; + S.push_back(SRInfo(index, NewVReg, true)); + SpillIdxes.insert(std::make_pair(MBBId, S)); + } else if (SII->second.back().vreg != NewVReg) { + SII->second.push_back(SRInfo(index, NewVReg, true)); + } else if ((int)index > SII->second.back().index) { // If there is an earlier def and this is a two-address // instruction, then it's not possible to fold the store (which // would also fold the load). - SpillIdxes[MBBId] = std::make_pair(index, !HasUse); + SRInfo &Info = SII->second.back(); + Info.index = index; + Info.canFold = !HasUse; } SpillMBBs.set(MBBId); } } + + /// FIXME: Move this else where. if (!IsNew) { // It this interval hasn't been assigned a stack slot // (because earlier def is remat), do it now. @@ -961,20 +998,28 @@ } if (HasUse) { - std::map >::iterator SII = + std::map >::iterator SII = SpillIdxes.find(MBBId); - if (SII != SpillIdxes.end() && (int)index > SII->second.first) + if (SII != SpillIdxes.end() && + SII->second.back().vreg == NewVReg && + (int)index > SII->second.back().index) // Use(s) following the last def, it's not safe to fold the spill. - SII->second.second = false; - std::map >::iterator RII = + SII->second.back().canFold = false; + std::map >::iterator RII = RestoreIdxes.find(MBBId); - if (RII != RestoreIdxes.end()) + if (RII != RestoreIdxes.end() && RII->second.back().vreg == NewVReg) // If we are splitting live intervals, only fold if it's the first // use and there isn't another use later in the MBB. - RII->second.second = false; + RII->second.back().canFold = false; else if (IsNew) { // Only need a reload if there isn't an earlier def / use. - RestoreIdxes[MBBId] = std::make_pair(index, true); + if (RII == RestoreIdxes.end()) { + std::vector Infos; + Infos.push_back(SRInfo(index, NewVReg, true)); + RestoreIdxes.insert(std::make_pair(MBBId, Infos)); + } else { + RII->second.push_back(SRInfo(index, NewVReg, true)); + } RestoreMBBs.set(MBBId); } } @@ -985,6 +1030,30 @@ } } +bool LiveIntervals::alsoFoldARestore(int Id, int index, unsigned vr, + BitVector &RestoreMBBs, + std::map > &RestoreIdxes) { + if (!RestoreMBBs[Id]) + return false; + std::vector &Restores = RestoreIdxes[Id]; + for (unsigned i = 0, e = Restores.size(); i != e; ++i) + if (Restores[i].index == index && + Restores[i].vreg == vr && + Restores[i].canFold) + return true; + return false; +} + +void LiveIntervals::eraseRestoreInfo(int Id, int index, unsigned vr, + BitVector &RestoreMBBs, + std::map > &RestoreIdxes) { + if (!RestoreMBBs[Id]) + return; + std::vector &Restores = RestoreIdxes[Id]; + for (unsigned i = 0, e = Restores.size(); i != e; ++i) + if (Restores[i].index == index && Restores[i].vreg) + Restores[i].index = -1; +} std::vector LiveIntervals:: @@ -1003,10 +1072,10 @@ // Each bit specify whether it a spill is required in the MBB. BitVector SpillMBBs(mf_->getNumBlockIDs()); - std::map > SpillIdxes; + std::map > SpillIdxes; BitVector RestoreMBBs(mf_->getNumBlockIDs()); - std::map > RestoreIdxes; - std::map NewVRegs; + std::map > RestoreIdxes; + std::map MBBVRegsMap; std::vector NewLIs; SSARegMap *RegMap = mf_->getSSARegMap(); const TargetRegisterClass* rc = RegMap->getRegClass(li.reg); @@ -1045,13 +1114,13 @@ Slot, LdSlot, isLoad, isLoadSS, DefIsReMat, false, vrm, RegMap, rc, ReMatIds, loopInfo, SpillMBBs, SpillIdxes, RestoreMBBs, RestoreIdxes, - NewVRegs, NewLIs); + MBBVRegsMap, NewLIs); } else { rewriteInstructionsForSpills(li, false, I, NULL, 0, Slot, 0, false, false, false, false, vrm, RegMap, rc, ReMatIds, loopInfo, SpillMBBs, SpillIdxes, RestoreMBBs, RestoreIdxes, - NewVRegs, NewLIs); + MBBVRegsMap, NewLIs); } IsFirstRange = false; } @@ -1119,17 +1188,21 @@ Slot, LdSlot, isLoad, isLoadSS, DefIsReMat, CanDelete, vrm, RegMap, rc, ReMatIds, loopInfo, SpillMBBs, SpillIdxes, RestoreMBBs, RestoreIdxes, - NewVRegs, NewLIs); + MBBVRegsMap, NewLIs); } // Insert spills / restores if we are splitting. - if (TrySplit) { - if (NeedStackSlot) { - int Id = SpillMBBs.find_first(); - while (Id != -1) { - unsigned VReg = NewVRegs[Id]; - int index = SpillIdxes[Id].first; - bool DoFold = SpillIdxes[Id].second; + if (!TrySplit) + return NewLIs; + + if (NeedStackSlot) { + int Id = SpillMBBs.find_first(); + while (Id != -1) { + std::vector &spills = SpillIdxes[Id]; + for (unsigned i = 0, e = spills.size(); i != e; ++i) { + int index = spills[i].index; + unsigned VReg = spills[i].vreg; + bool DoFold = spills[i].canFold; bool isReMat = vrm.isReMaterialized(VReg); MachineInstr *MI = getInstructionFromIndex(index); int OpIdx = -1; @@ -1144,8 +1217,7 @@ // first and only use. // If there are more than one uses, a load is still needed. if (!isReMat && !FoldedLoad && - RestoreMBBs[Id] && RestoreIdxes[Id].first == index && - RestoreIdxes[Id].second) { + alsoFoldARestore(Id, index,VReg,RestoreMBBs,RestoreIdxes)) { FoldedLoad = true; continue; } else { @@ -1160,13 +1232,10 @@ if (OpIdx == -1) DoFold = false; if (DoFold) { - if (tryFoldMemoryOperand(MI, vrm, NULL, index, OpIdx, true, Slot, - VReg)) { - if (FoldedLoad) { + if (tryFoldMemoryOperand(MI, vrm, NULL, index,OpIdx,true,Slot,VReg)) { + if (FoldedLoad) // Folded a two-address instruction, do not issue a load. - RestoreMBBs.reset(Id); - RestoreIdxes.erase(Id); - } + eraseRestoreInfo(Id, index, VReg, RestoreMBBs, RestoreIdxes); } else DoFold = false; } @@ -1174,15 +1243,20 @@ // Else tell the spiller to issue a store for us. if (!DoFold) vrm.addSpillPoint(VReg, MI); - Id = SpillMBBs.find_next(Id); } + Id = SpillMBBs.find_next(Id); } + } - int Id = RestoreMBBs.find_first(); - while (Id != -1) { - unsigned VReg = NewVRegs[Id]; - int index = RestoreIdxes[Id].first; - bool DoFold = RestoreIdxes[Id].second; + int Id = RestoreMBBs.find_first(); + while (Id != -1) { + std::vector &restores = RestoreIdxes[Id]; + for (unsigned i = 0, e = restores.size(); i != e; ++i) { + int index = restores[i].index; + if (index == -1) + continue; + unsigned VReg = restores[i].vreg; + bool DoFold = restores[i].canFold; MachineInstr *MI = getInstructionFromIndex(index); int OpIdx = -1; if (DoFold) { @@ -1227,14 +1301,13 @@ // load / rematerialization for us. if (!DoFold) vrm.addRestorePoint(VReg, MI); - Id = RestoreMBBs.find_next(Id); } + Id = RestoreMBBs.find_next(Id); } // Finalize spill weights. - if (TrySplit) - for (unsigned i = 0, e = NewLIs.size(); i != e; ++i) - NewLIs[i]->weight /= NewLIs[i]->getSize(); + for (unsigned i = 0, e = NewLIs.size(); i != e; ++i) + NewLIs[i]->weight /= NewLIs[i]->getSize(); return NewLIs; } From evan.cheng at apple.com Thu Nov 29 04:04:05 2007 From: evan.cheng at apple.com (Evan Cheng) Date: Thu, 29 Nov 2007 10:04:05 -0000 Subject: [llvm-commits] [llvm] r44435 - in /llvm/trunk/test/CodeGen/ARM: 2007-08-14-SpillDeadDef.ll remat.ll Message-ID: <200711291004.lATA49vL013837@zion.cs.uiuc.edu> Author: evancheng Date: Thu Nov 29 04:03:54 2007 New Revision: 44435 URL: http://llvm.org/viewvc/llvm-project?rev=44435&view=rev Log: Update tests. Added: llvm/trunk/test/CodeGen/ARM/remat.ll Removed: llvm/trunk/test/CodeGen/ARM/2007-08-14-SpillDeadDef.ll Removed: llvm/trunk/test/CodeGen/ARM/2007-08-14-SpillDeadDef.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2007-08-14-SpillDeadDef.ll?rev=44434&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/ARM/2007-08-14-SpillDeadDef.ll (original) +++ llvm/trunk/test/CodeGen/ARM/2007-08-14-SpillDeadDef.ll (removed) @@ -1,116 +0,0 @@ -; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin -; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin -stats -info-output-file - | grep "re-materializable defs elided" - - %struct.CONTENTBOX = type { i32, i32, i32, i32, i32 } - %struct.LOCBOX = type { i32, i32, i32, i32 } - %struct.SIDEBOX = type { i32, i32 } - %struct.UNCOMBOX = type { i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32 } - %struct.cellbox = type { i8*, i32, i32, i32, [9 x i32], i32, i32, i32, i32, i32, i32, i32, double, double, double, double, double, i32, i32, %struct.CONTENTBOX*, %struct.UNCOMBOX*, [8 x %struct.tilebox*], %struct.SIDEBOX* } - %struct.termbox = type { %struct.termbox*, i32, i32, i32, i32, i32 } - %struct.tilebox = type { %struct.tilebox*, double, double, double, double, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, %struct.termbox*, %struct.LOCBOX* } - at numcells = external global i32 ; [#uses=1] - at cellarray = external global %struct.cellbox** ; <%struct.cellbox***> [#uses=1] - at numBinsY = external global i32 ; [#uses=1] - -define fastcc void @fixpenal() { -entry: - %tmp491 = load i32* @numcells, align 4 ; [#uses=1] - %tmp9 = load %struct.cellbox*** @cellarray, align 4 ; <%struct.cellbox**> [#uses=1] - %tmp77.i = load i32* @numBinsY, align 4 ; [#uses=2] - br label %bb490 - -bb8: ; preds = %bb490, %cond_false428 - br i1 false, label %cond_false58.i, label %cond_false.i - -cond_false.i: ; preds = %bb8 - ret void - -cond_false58.i: ; preds = %bb8 - %highBinX.0.i = select i1 false, i32 1, i32 0 ; [#uses=2] - br i1 false, label %cond_next85.i, label %cond_false76.i - -cond_false76.i: ; preds = %cond_false58.i - ret void - -cond_next85.i: ; preds = %cond_false58.i - br i1 false, label %cond_next105.i, label %cond_false98.i - -cond_false98.i: ; preds = %cond_next85.i - ret void - -cond_next105.i: ; preds = %cond_next85.i - %tmp108.i = icmp eq i32 1, %highBinX.0.i ; [#uses=1] - %tmp115.i = icmp eq i32 1, %tmp77.i ; [#uses=1] - %bothcond.i = and i1 %tmp115.i, %tmp108.i ; [#uses=1] - %storemerge.i = select i1 %bothcond.i, i32 1, i32 0 ; [#uses=2] - br i1 false, label %whoOverlaps.exit, label %bb503.preheader.i - -bb503.preheader.i: ; preds = %bb513.i, %cond_next105.i - %i.022.0.i = phi i32 [ %tmp512.i, %bb513.i ], [ 0, %cond_next105.i ] ; [#uses=2] - %tmp165.i = getelementptr i32*** null, i32 %i.022.0.i ; [#uses=0] - br label %bb503.i - -bb137.i: ; preds = %bb503.i - br i1 false, label %bb162.i, label %bb148.i - -bb148.i: ; preds = %bb137.i - ret void - -bb162.i: ; preds = %bb137.i - %tmp49435.i = load i32* null ; [#uses=1] - br label %bb170.i - -bb170.i: ; preds = %bb491.i, %bb162.i - %indvar.i = phi i32 [ %k.032.0.i, %bb491.i ], [ 0, %bb162.i ] ; [#uses=2] - %k.032.0.i = add i32 %indvar.i, 1 ; [#uses=2] - %tmp173.i = getelementptr i32* null, i32 %k.032.0.i ; [#uses=1] - %tmp174.i = load i32* %tmp173.i ; [#uses=4] - %tmp177.i = icmp eq i32 %tmp174.i, %cell.1 ; [#uses=1] - %tmp184.i = icmp sgt i32 %tmp174.i, %tmp491 ; [#uses=1] - %bothcond = or i1 %tmp177.i, %tmp184.i ; [#uses=1] - br i1 %bothcond, label %bb491.i, label %cond_next188.i - -cond_next188.i: ; preds = %bb170.i - %tmp191.i = getelementptr %struct.cellbox** %tmp9, i32 %tmp174.i ; <%struct.cellbox**> [#uses=1] - %tmp192.i = load %struct.cellbox** %tmp191.i ; <%struct.cellbox*> [#uses=1] - %tmp195.i = icmp eq i32 %tmp174.i, 0 ; [#uses=1] - br i1 %tmp195.i, label %bb491.i, label %cond_true198.i - -cond_true198.i: ; preds = %cond_next188.i - %tmp210.i = getelementptr %struct.cellbox* %tmp192.i, i32 0, i32 3 ; [#uses=0] - ret void - -bb491.i: ; preds = %cond_next188.i, %bb170.i - %tmp490.i = add i32 %indvar.i, 2 ; [#uses=1] - %tmp496.i = icmp slt i32 %tmp49435.i, %tmp490.i ; [#uses=1] - br i1 %tmp496.i, label %bb500.i, label %bb170.i - -bb500.i: ; preds = %bb491.i - %indvar.next82.i = add i32 %j.0.i, 1 ; [#uses=1] - br label %bb503.i - -bb503.i: ; preds = %bb500.i, %bb503.preheader.i - %j.0.i = phi i32 [ 0, %bb503.preheader.i ], [ %indvar.next82.i, %bb500.i ] ; [#uses=2] - %tmp506.i = icmp sgt i32 %j.0.i, %tmp77.i ; [#uses=1] - br i1 %tmp506.i, label %bb513.i, label %bb137.i - -bb513.i: ; preds = %bb503.i - %tmp512.i = add i32 %i.022.0.i, 1 ; [#uses=2] - %tmp516.i = icmp sgt i32 %tmp512.i, %highBinX.0.i ; [#uses=1] - br i1 %tmp516.i, label %whoOverlaps.exit, label %bb503.preheader.i - -whoOverlaps.exit: ; preds = %bb513.i, %cond_next105.i - br i1 false, label %cond_false428, label %bb490 - -cond_false428: ; preds = %whoOverlaps.exit - br i1 false, label %bb497, label %bb8 - -bb490: ; preds = %whoOverlaps.exit, %entry - %binY.tmp.2 = phi i32 [ 0, %entry ], [ %storemerge.i, %whoOverlaps.exit ] ; [#uses=1] - %cell.1 = phi i32 [ 1, %entry ], [ 0, %whoOverlaps.exit ] ; [#uses=1] - br i1 false, label %bb497, label %bb8 - -bb497: ; preds = %bb490, %cond_false428 - %binY.tmp.3 = phi i32 [ %binY.tmp.2, %bb490 ], [ %storemerge.i, %cond_false428 ] ; [#uses=0] - ret void -} Added: llvm/trunk/test/CodeGen/ARM/remat.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/remat.ll?rev=44435&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/ARM/remat.ll (added) +++ llvm/trunk/test/CodeGen/ARM/remat.ll Thu Nov 29 04:03:54 2007 @@ -0,0 +1,116 @@ +; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin +; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin -stats -info-output-file - | grep "Number of re-materialization" | grep 5 + + %struct.CONTENTBOX = type { i32, i32, i32, i32, i32 } + %struct.LOCBOX = type { i32, i32, i32, i32 } + %struct.SIDEBOX = type { i32, i32 } + %struct.UNCOMBOX = type { i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32 } + %struct.cellbox = type { i8*, i32, i32, i32, [9 x i32], i32, i32, i32, i32, i32, i32, i32, double, double, double, double, double, i32, i32, %struct.CONTENTBOX*, %struct.UNCOMBOX*, [8 x %struct.tilebox*], %struct.SIDEBOX* } + %struct.termbox = type { %struct.termbox*, i32, i32, i32, i32, i32 } + %struct.tilebox = type { %struct.tilebox*, double, double, double, double, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, %struct.termbox*, %struct.LOCBOX* } + at numcells = external global i32 ; [#uses=1] + at cellarray = external global %struct.cellbox** ; <%struct.cellbox***> [#uses=1] + at numBinsY = external global i32 ; [#uses=1] + +define fastcc void @fixpenal() { +entry: + %tmp491 = load i32* @numcells, align 4 ; [#uses=1] + %tmp9 = load %struct.cellbox*** @cellarray, align 4 ; <%struct.cellbox**> [#uses=1] + %tmp77.i = load i32* @numBinsY, align 4 ; [#uses=2] + br label %bb490 + +bb8: ; preds = %bb490, %cond_false428 + br i1 false, label %cond_false58.i, label %cond_false.i + +cond_false.i: ; preds = %bb8 + ret void + +cond_false58.i: ; preds = %bb8 + %highBinX.0.i = select i1 false, i32 1, i32 0 ; [#uses=2] + br i1 false, label %cond_next85.i, label %cond_false76.i + +cond_false76.i: ; preds = %cond_false58.i + ret void + +cond_next85.i: ; preds = %cond_false58.i + br i1 false, label %cond_next105.i, label %cond_false98.i + +cond_false98.i: ; preds = %cond_next85.i + ret void + +cond_next105.i: ; preds = %cond_next85.i + %tmp108.i = icmp eq i32 1, %highBinX.0.i ; [#uses=1] + %tmp115.i = icmp eq i32 1, %tmp77.i ; [#uses=1] + %bothcond.i = and i1 %tmp115.i, %tmp108.i ; [#uses=1] + %storemerge.i = select i1 %bothcond.i, i32 1, i32 0 ; [#uses=2] + br i1 false, label %whoOverlaps.exit, label %bb503.preheader.i + +bb503.preheader.i: ; preds = %bb513.i, %cond_next105.i + %i.022.0.i = phi i32 [ %tmp512.i, %bb513.i ], [ 0, %cond_next105.i ] ; [#uses=2] + %tmp165.i = getelementptr i32*** null, i32 %i.022.0.i ; [#uses=0] + br label %bb503.i + +bb137.i: ; preds = %bb503.i + br i1 false, label %bb162.i, label %bb148.i + +bb148.i: ; preds = %bb137.i + ret void + +bb162.i: ; preds = %bb137.i + %tmp49435.i = load i32* null ; [#uses=1] + br label %bb170.i + +bb170.i: ; preds = %bb491.i, %bb162.i + %indvar.i = phi i32 [ %k.032.0.i, %bb491.i ], [ 0, %bb162.i ] ; [#uses=2] + %k.032.0.i = add i32 %indvar.i, 1 ; [#uses=2] + %tmp173.i = getelementptr i32* null, i32 %k.032.0.i ; [#uses=1] + %tmp174.i = load i32* %tmp173.i ; [#uses=4] + %tmp177.i = icmp eq i32 %tmp174.i, %cell.1 ; [#uses=1] + %tmp184.i = icmp sgt i32 %tmp174.i, %tmp491 ; [#uses=1] + %bothcond = or i1 %tmp177.i, %tmp184.i ; [#uses=1] + br i1 %bothcond, label %bb491.i, label %cond_next188.i + +cond_next188.i: ; preds = %bb170.i + %tmp191.i = getelementptr %struct.cellbox** %tmp9, i32 %tmp174.i ; <%struct.cellbox**> [#uses=1] + %tmp192.i = load %struct.cellbox** %tmp191.i ; <%struct.cellbox*> [#uses=1] + %tmp195.i = icmp eq i32 %tmp174.i, 0 ; [#uses=1] + br i1 %tmp195.i, label %bb491.i, label %cond_true198.i + +cond_true198.i: ; preds = %cond_next188.i + %tmp210.i = getelementptr %struct.cellbox* %tmp192.i, i32 0, i32 3 ; [#uses=0] + ret void + +bb491.i: ; preds = %cond_next188.i, %bb170.i + %tmp490.i = add i32 %indvar.i, 2 ; [#uses=1] + %tmp496.i = icmp slt i32 %tmp49435.i, %tmp490.i ; [#uses=1] + br i1 %tmp496.i, label %bb500.i, label %bb170.i + +bb500.i: ; preds = %bb491.i + %indvar.next82.i = add i32 %j.0.i, 1 ; [#uses=1] + br label %bb503.i + +bb503.i: ; preds = %bb500.i, %bb503.preheader.i + %j.0.i = phi i32 [ 0, %bb503.preheader.i ], [ %indvar.next82.i, %bb500.i ] ; [#uses=2] + %tmp506.i = icmp sgt i32 %j.0.i, %tmp77.i ; [#uses=1] + br i1 %tmp506.i, label %bb513.i, label %bb137.i + +bb513.i: ; preds = %bb503.i + %tmp512.i = add i32 %i.022.0.i, 1 ; [#uses=2] + %tmp516.i = icmp sgt i32 %tmp512.i, %highBinX.0.i ; [#uses=1] + br i1 %tmp516.i, label %whoOverlaps.exit, label %bb503.preheader.i + +whoOverlaps.exit: ; preds = %bb513.i, %cond_next105.i + br i1 false, label %cond_false428, label %bb490 + +cond_false428: ; preds = %whoOverlaps.exit + br i1 false, label %bb497, label %bb8 + +bb490: ; preds = %whoOverlaps.exit, %entry + %binY.tmp.2 = phi i32 [ 0, %entry ], [ %storemerge.i, %whoOverlaps.exit ] ; [#uses=1] + %cell.1 = phi i32 [ 1, %entry ], [ 0, %whoOverlaps.exit ] ; [#uses=1] + br i1 false, label %bb497, label %bb8 + +bb497: ; preds = %bb490, %cond_false428 + %binY.tmp.3 = phi i32 [ %binY.tmp.2, %bb490 ], [ %storemerge.i, %cond_false428 ] ; [#uses=0] + ret void +} From pawel.kunio at gmail.com Thu Nov 29 03:57:16 2007 From: pawel.kunio at gmail.com (pawel kunio) Date: Thu, 29 Nov 2007 10:57:16 +0100 Subject: [llvm-commits] Re: updated patch for PR889 Message-ID: As to the tabs and 80 char limit, already applied. Regarding the patch, I'd say I'd rather stick to the assert(0 && "Unknown 'subtype' instruction in Value destructor"); The reason is two-fold, 1. Some of the Value inherited class could have escaped my searches and 2. We will be able to enforce more strictly the destroyThis method pattern in newly added Value inherited classes. What do You think? Regard, pawel From clattner at apple.com Thu Nov 29 10:56:32 2007 From: clattner at apple.com (Chris Lattner) Date: Thu, 29 Nov 2007 08:56:32 -0800 Subject: [llvm-commits] updated patch for PR889 In-Reply-To: References: Message-ID: <1B31E2FA-35C0-4662-B45D-1036721E3533@apple.com> On Nov 29, 2007, at 1:57 AM, pawel kunio wrote: > As to the tabs and 80 char limit, already applied. Thanks! > Regarding the > patch, I'd say I'd rather stick > to the assert(0 && "Unknown 'subtype' instruction in Value > destructor"); > The reason is two-fold, 1. Some of the Value inherited class could > have escaped my searches > and 2. We will be able to enforce more strictly the destroyThis method > pattern in newly added > Value inherited classes. > What do You think? I'm ok with either one. Note that they will both enforce the property for new classes. If you have: if (..) ... else if (...) .. else assert(0 && "bad"); This will assert if none of the if's above match. Likewise, if you have: if (..) ... else cast(this) The cast in the 'else' case will abort if 'this' doesn't match sometype. -Chris From resistor at mac.com Thu Nov 29 12:02:23 2007 From: resistor at mac.com (Owen Anderson) Date: Thu, 29 Nov 2007 18:02:23 -0000 Subject: [llvm-commits] [llvm] r44437 - /llvm/trunk/lib/Transforms/Scalar/GVN.cpp Message-ID: <200711291802.lATI2Nj3003559@zion.cs.uiuc.edu> Author: resistor Date: Thu Nov 29 12:02:22 2007 New Revision: 44437 URL: http://llvm.org/viewvc/llvm-project?rev=44437&view=rev Log: Fix a miscompilation in spiff on PPC. Modified: llvm/trunk/lib/Transforms/Scalar/GVN.cpp Modified: llvm/trunk/lib/Transforms/Scalar/GVN.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/GVN.cpp?rev=44437&r1=44436&r2=44437&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/GVN.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/GVN.cpp Thu Nov 29 12:02:22 2007 @@ -1054,7 +1054,8 @@ if (CI->getCalledFunction() && !AA.doesNotAccessMemory(CI->getCalledFunction())) { MemoryDependenceAnalysis& MD = getAnalysis(); - if (MD.getDependency(CI) != MD.getDependency(cast(repl))) { + if (cast(repl)->getParent() != CI->getParent() || + MD.getDependency(CI) != MD.getDependency(cast(repl))) { // There must be an intervening may-alias store, so nothing from // this point on will be able to be replaced with the preceding call currAvail.erase(repl); From criswell at uiuc.edu Thu Nov 29 14:37:56 2007 From: criswell at uiuc.edu (John Criswell) Date: Thu, 29 Nov 2007 20:37:56 -0000 Subject: [llvm-commits] [poolalloc] r44441 - in /poolalloc/trunk/lib: DSA/DataStructure.cpp DSA/Local.cpp PoolAllocate/Heuristic.cpp PoolAllocate/PointerCompress.cpp PoolAllocate/TransformFunctionBody.cpp Message-ID: <200711292037.lATKbuOV011741@zion.cs.uiuc.edu> Author: criswell Date: Thu Nov 29 14:37:55 2007 New Revision: 44441 URL: http://llvm.org/viewvc/llvm-project?rev=44441&view=rev Log: Update use of TargetData->getTypeSize() to TargetData->getABITypeSize(). I believe we want all of the sizes to including ABI padding. Modified: poolalloc/trunk/lib/DSA/DataStructure.cpp poolalloc/trunk/lib/DSA/Local.cpp poolalloc/trunk/lib/PoolAllocate/Heuristic.cpp poolalloc/trunk/lib/PoolAllocate/PointerCompress.cpp poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp Modified: poolalloc/trunk/lib/DSA/DataStructure.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/DataStructure.cpp?rev=44441&r1=44440&r2=44441&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/DataStructure.cpp (original) +++ poolalloc/trunk/lib/DSA/DataStructure.cpp Thu Nov 29 14:37:55 2007 @@ -398,7 +398,7 @@ const ArrayType *AT = cast(SS.Ty); ++SS.Idx; if (SS.Idx != AT->getNumElements()) { - SS.Offset += unsigned(TD.getTypeSize(AT->getElementType())); + SS.Offset += unsigned(TD.getABITypeSize(AT->getElementType())); return; } Stack.pop_back(); // At the end of the array @@ -433,7 +433,7 @@ assert(SS.Idx < AT->getNumElements()); Stack.push_back(StackState(AT->getElementType(), SS.Offset+SS.Idx* - unsigned(TD.getTypeSize(AT->getElementType())))); + unsigned(TD.getABITypeSize(AT->getElementType())))); } } } @@ -490,7 +490,7 @@ (Size == 0 && !Ty->isSized() && !isArray()) || (Size == 1 && Ty == Type::VoidTy && isArray()) || (Size == 0 && !Ty->isSized() && !isArray()) || - (TD.getTypeSize(Ty) == Size)) && + (TD.getABITypeSize(Ty) == Size)) && "Size member of DSNode doesn't match the type structure!"); assert(NewTy != Type::VoidTy && "Cannot merge void type into DSNode!"); @@ -513,7 +513,7 @@ } // Figure out how big the new type we're merging in is... - unsigned NewTySize = NewTy->isSized() ? (unsigned)TD.getTypeSize(NewTy) : 0; + unsigned NewTySize = NewTy->isSized() ? (unsigned)TD.getABITypeSize(NewTy) : 0; // Otherwise check to see if we can fold this type into the current node. If // we can't, we fold the node completely, if we can, we potentially update our @@ -653,7 +653,7 @@ unsigned O = 0; const Type *SubType = Ty; while (O < Offset) { - assert(Offset-O < TD.getTypeSize(SubType) && "Offset out of range!"); + assert(Offset-O < TD.getABITypeSize(SubType) && "Offset out of range!"); switch (SubType->getTypeID()) { case Type::StructTyID: { @@ -668,7 +668,7 @@ } case Type::ArrayTyID: { SubType = cast(SubType)->getElementType(); - unsigned ElSize = (unsigned)TD.getTypeSize(SubType); + unsigned ElSize = (unsigned)TD.getABITypeSize(SubType); unsigned Remainder = (Offset-O) % ElSize; O = Offset-Remainder; break; @@ -690,7 +690,7 @@ isa(NewTy)) return false; unsigned SubTypeSize = SubType->isSized() ? - (unsigned)TD.getTypeSize(SubType) : 0; + (unsigned)TD.getABITypeSize(SubType) : 0; // Ok, we are getting desperate now. Check for physical subtyping, where we // just require each element in the node to be compatible. @@ -718,12 +718,12 @@ else NextPadSize = SubTypeSize; NextSubType = STy->getElementType(0); - NextSubTypeSize = (unsigned)TD.getTypeSize(NextSubType); + NextSubTypeSize = (unsigned)TD.getABITypeSize(NextSubType); break; } case Type::ArrayTyID: NextSubType = cast(SubType)->getElementType(); - NextSubTypeSize = (unsigned)TD.getTypeSize(NextSubType); + NextSubTypeSize = (unsigned)TD.getABITypeSize(NextSubType); NextPadSize = NextSubTypeSize; break; default: ; Modified: poolalloc/trunk/lib/DSA/Local.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/Local.cpp?rev=44441&r1=44440&r2=44441&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/Local.cpp (original) +++ poolalloc/trunk/lib/DSA/Local.cpp Thu Nov 29 14:37:55 2007 @@ -459,7 +459,7 @@ if (ConstantInt *CS = dyn_cast(GEP.getOperand(i))) { Offset += (CS->getType()->isSigned() ? CS->getSExtValue() : CS->getZExtValue()) - * TD.getTypeSize(CurTy); + * TD.getABITypeSize(CurTy); } else { // Variable index into a node. We must merge all of the elements of the // sequential type here. @@ -467,7 +467,7 @@ cerr << "Pointer indexing not handled yet!\n"; else { const ArrayType *ATy = cast(STy); - unsigned ElSize = TD.getTypeSize(CurTy); + unsigned ElSize = TD.getABITypeSize(CurTy); DSNode *N = Value.getNode(); assert(N && "Value must have a node!"); unsigned RawOffset = Offset+Value.getOffset(); Modified: poolalloc/trunk/lib/PoolAllocate/Heuristic.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/Heuristic.cpp?rev=44441&r1=44440&r2=44441&view=diff ============================================================================== --- poolalloc/trunk/lib/PoolAllocate/Heuristic.cpp (original) +++ poolalloc/trunk/lib/PoolAllocate/Heuristic.cpp Thu Nov 29 14:37:55 2007 @@ -57,7 +57,7 @@ unsigned Heuristic::getRecommendedSize(const DSNode *N) { unsigned PoolSize = 0; if (!N->isArray() && N->getType()->isSized()) { - PoolSize = N->getParentGraph()->getTargetData().getTypeSize(N->getType()); + PoolSize = N->getParentGraph()->getTargetData().getABITypeSize(N->getType()); } if (PoolSize == 1) PoolSize = 0; return PoolSize; Modified: poolalloc/trunk/lib/PoolAllocate/PointerCompress.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/PointerCompress.cpp?rev=44441&r1=44440&r2=44441&view=diff ============================================================================== --- poolalloc/trunk/lib/PoolAllocate/PointerCompress.cpp (original) +++ poolalloc/trunk/lib/PoolAllocate/PointerCompress.cpp Thu Nov 29 14:37:55 2007 @@ -226,7 +226,7 @@ NewTy = ComputeCompressedType(Pool->getType(), 0, Nodes); // Get the compressed type size. - NewSize = NewTy->isSized() ? TD.getTypeSize(NewTy) : 0; + NewSize = NewTy->isSized() ? TD.getABITypeSize(NewTy) : 0; } @@ -318,9 +318,9 @@ const TargetData &TD = getNode()->getParentGraph()->getTargetData(); std::cerr << " From size: " << (getNode()->getType()->isSized() ? - TD.getTypeSize(getNode()->getType()) : 0) + TD.getABITypeSize(getNode()->getType()) : 0) << " To size: " - << (NewTy->isSized() ? TD.getTypeSize(NewTy) : 0) << "\n"; + << (NewTy->isSized() ? TD.getABITypeSize(NewTy) : 0) << "\n"; std::cerr << "Node: "; getNode()->dump(); std::cerr << "New Type: " << *NewTy << "\n"; } @@ -733,7 +733,7 @@ Idx = CastInst::createSExtOrBitCast(Idx, SCALARUINTTYPE, Idx->getName(), &GEPI); Constant *Scale = ConstantInt::get(SCALARUINTTYPE, - TD.getTypeSize(ElTy)); + TD.getABITypeSize(ElTy)); Idx = BinaryOperator::createMul(Idx, Scale, "fieldidx", &GEPI); Val = BinaryOperator::createAdd(Val, Idx, GEPI.getName(), &GEPI); } Modified: poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp?rev=44441&r1=44440&r2=44441&view=diff ============================================================================== --- poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp (original) +++ poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp Thu Nov 29 14:37:55 2007 @@ -198,7 +198,7 @@ TargetData &TD = PAInfo.getAnalysis(); Value *AllocSize = - ConstantInt::get(Type::Int32Ty, TD.getTypeSize(MI.getAllocatedType())); + ConstantInt::get(Type::Int32Ty, TD.getABITypeSize(MI.getAllocatedType())); if (MI.isArrayAllocation()) AllocSize = BinaryOperator::create(Instruction::Mul, AllocSize, @@ -240,7 +240,7 @@ if (PH == 0 || isa(PH)) return; TargetData &TD = PAInfo.getAnalysis(); Value *AllocSize = - ConstantInt::get(Type::Int32Ty, TD.getTypeSize(MI.getAllocatedType())); + ConstantInt::get(Type::Int32Ty, TD.getABITypeSize(MI.getAllocatedType())); if (MI.isArrayAllocation()) AllocSize = BinaryOperator::create(Instruction::Mul, AllocSize, @@ -296,7 +296,7 @@ void FuncTransform::visitCallocCall(CallSite CS) { TargetData& TD = PAInfo.getAnalysis(); - bool useLong = TD.getTypeSize(PointerType::get(Type::Int8Ty)) != 4; + bool useLong = TD.getABITypeSize(PointerType::get(Type::Int8Ty)) != 4; Module *M = CS.getInstruction()->getParent()->getParent()->getParent(); assert(CS.arg_end()-CS.arg_begin() == 2 && "calloc takes two arguments!"); From echristo at apple.com Thu Nov 29 15:02:39 2007 From: echristo at apple.com (Eric Christopher) Date: Thu, 29 Nov 2007 13:02:39 -0800 Subject: [llvm-commits] [llvm] r44353 - /llvm/trunk/test/CFrontend/2005-02-20-AggregateSAVEEXPR.c In-Reply-To: References: <200711270617.lAR6H2EB029102@zion.cs.uiuc.edu> <03D4045C-7101-46DA-B73E-B379C56E312F.SS496SS@apple.com> <1196153937.10604.3.camel@asl.dorms.spbu.ru> Message-ID: On Nov 27, 2007, at 1:22 AM, Eric Christopher wrote: >>> >> This pretty much looks like cygwin-related stuff. Actually it needs >> to >> store two sets of headers - "native" and mingw, thus such directory. >> >> My mingw32 installation has complex.h, not mingw/complex.h. >> However, I >> don't understand, why cygwin doesn't have it's complex.h and test >> should >> use mingw-provided one. > > Agreed, I thought it did. It has been a while since I've had a cygwin > box though. I can ask those guys tomorrow though. Anyhow, I talked to some of the cygwin guys and there's no complex support really at all so the test should probably be disabled for cygwin right now (or xfailed so that it starts xpassing when/if someone turns on complex support). -eric From asl at math.spbu.ru Thu Nov 29 15:36:16 2007 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Thu, 29 Nov 2007 21:36:16 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r44442 - in /llvm-gcc-4.2/trunk/gcc: passes.c tree-optimize.c tree-pass.h Message-ID: <200711292136.lATLaGR5014625@zion.cs.uiuc.edu> Author: asl Date: Thu Nov 29 15:36:16 2007 New Revision: 44442 URL: http://llvm.org/viewvc/llvm-project?rev=44442&view=rev Log: Move second openmp expansion pass before llvm-convert. This allows us not to reinvent a wheel and rewrite all openmp lowering code at llvm side :) Thanks to Wojciech Matyjewicz for inspiration :) Modified: llvm-gcc-4.2/trunk/gcc/passes.c llvm-gcc-4.2/trunk/gcc/tree-optimize.c llvm-gcc-4.2/trunk/gcc/tree-pass.h Modified: llvm-gcc-4.2/trunk/gcc/passes.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/passes.c?rev=44442&r1=44441&r2=44442&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/passes.c (original) +++ llvm-gcc-4.2/trunk/gcc/passes.c Thu Nov 29 15:36:16 2007 @@ -334,6 +334,11 @@ /* The root of the compilation pass tree, once constructed. */ struct tree_opt_pass *all_passes, *all_ipa_passes, *all_lowering_passes; +/* LLVM LOCAL begin */ +#ifdef ENABLE_LLVM +struct tree_opt_pass *all_extra_lowering_passes; +#endif +/* LLVM LOCAL end */ /* Iterate over the pass tree allocating dump file numbers. We want to do this depth first, and independent of whether the pass is @@ -511,6 +516,17 @@ NEXT_PASS (pass_rebuild_cgraph_edges); *p = NULL; + /* LLVM LOCAL begin */ +#ifdef ENABLE_LLVM + p = &all_extra_lowering_passes; + NEXT_PASS (pass_fixup_cfg); + NEXT_PASS (pass_init_datastructures); + NEXT_PASS (pass_expand_omp); + NEXT_PASS (pass_free_datastructures); + *p = NULL; +#endif + /* LLVM LOCAL end */ + p = &all_passes; NEXT_PASS (pass_fixup_cfg); NEXT_PASS (pass_init_datastructures); @@ -742,6 +758,13 @@ PROP_gimple_any | PROP_gimple_lcf | PROP_gimple_leh | PROP_cfg); register_dump_files (all_lowering_passes, false, PROP_gimple_any); + /* LLVM LOCAL begin */ +#ifdef ENABLE_LLVM + register_dump_files (all_extra_lowering_passes, false, + PROP_gimple_any | PROP_gimple_lcf | PROP_gimple_leh + | PROP_cfg); +#endif + /* LLVM LOCAL end */ register_dump_files (all_passes, false, PROP_gimple_any | PROP_gimple_lcf | PROP_gimple_leh | PROP_cfg); Modified: llvm-gcc-4.2/trunk/gcc/tree-optimize.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/tree-optimize.c?rev=44442&r1=44441&r2=44442&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/tree-optimize.c (original) +++ llvm-gcc-4.2/trunk/gcc/tree-optimize.c Thu Nov 29 15:36:16 2007 @@ -473,6 +473,7 @@ /* Perform all tree transforms and optimizations. */ /* LLVM LOCAL begin */ #ifdef ENABLE_LLVM + execute_pass_list(all_extra_lowering_passes); llvm_emit_code_for_current_function(fndecl); #else execute_pass_list (all_passes); Modified: llvm-gcc-4.2/trunk/gcc/tree-pass.h URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/tree-pass.h?rev=44442&r1=44441&r2=44442&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/tree-pass.h (original) +++ llvm-gcc-4.2/trunk/gcc/tree-pass.h Thu Nov 29 15:36:16 2007 @@ -397,6 +397,11 @@ /* The root of the compilation pass tree, once constructed. */ extern struct tree_opt_pass *all_passes, *all_ipa_passes, *all_lowering_passes; +/* LLVM LOCAL begin */ +#ifdef ENABLE_LLVM +extern struct tree_opt_pass *all_extra_lowering_passes; +#endif +/* LLVM LOCAL end */ extern void execute_pass_list (struct tree_opt_pass *); extern void execute_ipa_pass_list (struct tree_opt_pass *); From dpatel at apple.com Thu Nov 29 15:57:10 2007 From: dpatel at apple.com (Devang Patel) Date: Thu, 29 Nov 2007 13:57:10 -0800 Subject: [llvm-commits] [llvm-gcc-4.2] r44442 - in /llvm-gcc-4.2/trunk/gcc: passes.c tree-optimize.c tree-pass.h In-Reply-To: <200711292136.lATLaGR5014625@zion.cs.uiuc.edu> References: <200711292136.lATLaGR5014625@zion.cs.uiuc.edu> Message-ID: <040FA0E1-4148-4684-96A6-F57309E52F69@apple.com> Nice! - Devang On Nov 29, 2007, at 1:36 PM, Anton Korobeynikov wrote: > Author: asl > Date: Thu Nov 29 15:36:16 2007 > New Revision: 44442 > > URL: http://llvm.org/viewvc/llvm-project?rev=44442&view=rev > Log: > Move second openmp expansion pass before llvm-convert. This allows > us not to > reinvent a wheel and rewrite all openmp lowering code at llvm side :) > > Thanks to Wojciech Matyjewicz for inspiration :) > > Modified: > llvm-gcc-4.2/trunk/gcc/passes.c > llvm-gcc-4.2/trunk/gcc/tree-optimize.c > llvm-gcc-4.2/trunk/gcc/tree-pass.h > > Modified: llvm-gcc-4.2/trunk/gcc/passes.c > URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/passes.c?rev=44442&r1=44441&r2=44442&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm-gcc-4.2/trunk/gcc/passes.c (original) > +++ llvm-gcc-4.2/trunk/gcc/passes.c Thu Nov 29 15:36:16 2007 > @@ -334,6 +334,11 @@ > > /* The root of the compilation pass tree, once constructed. */ > struct tree_opt_pass *all_passes, *all_ipa_passes, > *all_lowering_passes; > +/* LLVM LOCAL begin */ > +#ifdef ENABLE_LLVM > +struct tree_opt_pass *all_extra_lowering_passes; > +#endif > +/* LLVM LOCAL end */ > > /* Iterate over the pass tree allocating dump file numbers. We want > to do this depth first, and independent of whether the pass is > @@ -511,6 +516,17 @@ > NEXT_PASS (pass_rebuild_cgraph_edges); > *p = NULL; > > + /* LLVM LOCAL begin */ > +#ifdef ENABLE_LLVM > + p = &all_extra_lowering_passes; > + NEXT_PASS (pass_fixup_cfg); > + NEXT_PASS (pass_init_datastructures); > + NEXT_PASS (pass_expand_omp); > + NEXT_PASS (pass_free_datastructures); > + *p = NULL; > +#endif > + /* LLVM LOCAL end */ > + > p = &all_passes; > NEXT_PASS (pass_fixup_cfg); > NEXT_PASS (pass_init_datastructures); > @@ -742,6 +758,13 @@ > PROP_gimple_any | PROP_gimple_lcf | PROP_gimple_leh > | PROP_cfg); > register_dump_files (all_lowering_passes, false, PROP_gimple_any); > + /* LLVM LOCAL begin */ > +#ifdef ENABLE_LLVM > + register_dump_files (all_extra_lowering_passes, false, > + PROP_gimple_any | PROP_gimple_lcf | PROP_gimple_leh > + | PROP_cfg); > +#endif > + /* LLVM LOCAL end */ > register_dump_files (all_passes, false, > PROP_gimple_any | PROP_gimple_lcf | PROP_gimple_leh > | PROP_cfg); > > Modified: llvm-gcc-4.2/trunk/gcc/tree-optimize.c > URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/tree-optimize.c?rev=44442&r1=44441&r2=44442&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm-gcc-4.2/trunk/gcc/tree-optimize.c (original) > +++ llvm-gcc-4.2/trunk/gcc/tree-optimize.c Thu Nov 29 15:36:16 2007 > @@ -473,6 +473,7 @@ > /* Perform all tree transforms and optimizations. */ > /* LLVM LOCAL begin */ > #ifdef ENABLE_LLVM > + execute_pass_list(all_extra_lowering_passes); > llvm_emit_code_for_current_function(fndecl); > #else > execute_pass_list (all_passes); > > Modified: llvm-gcc-4.2/trunk/gcc/tree-pass.h > URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/tree-pass.h?rev=44442&r1=44441&r2=44442&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm-gcc-4.2/trunk/gcc/tree-pass.h (original) > +++ llvm-gcc-4.2/trunk/gcc/tree-pass.h Thu Nov 29 15:36:16 2007 > @@ -397,6 +397,11 @@ > > /* The root of the compilation pass tree, once constructed. */ > extern struct tree_opt_pass *all_passes, *all_ipa_passes, > *all_lowering_passes; > +/* LLVM LOCAL begin */ > +#ifdef ENABLE_LLVM > +extern struct tree_opt_pass *all_extra_lowering_passes; > +#endif > +/* LLVM LOCAL end */ > > extern void execute_pass_list (struct tree_opt_pass *); > extern void execute_ipa_pass_list (struct tree_opt_pass *); > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits - Devang From evan.cheng at apple.com Thu Nov 29 17:02:50 2007 From: evan.cheng at apple.com (Evan Cheng) Date: Thu, 29 Nov 2007 23:02:50 -0000 Subject: [llvm-commits] [llvm] r44443 - /llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Message-ID: <200711292302.lATN2p61019552@zion.cs.uiuc.edu> Author: evancheng Date: Thu Nov 29 17:02:50 2007 New Revision: 44443 URL: http://llvm.org/viewvc/llvm-project?rev=44443&view=rev Log: Do not lose rematerialization info when spilling already split live intervals. Modified: llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Modified: llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp?rev=44443&r1=44442&r2=44443&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp (original) +++ llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Thu Nov 29 17:02:50 2007 @@ -720,7 +720,7 @@ continue; bool TryFold = !DefIsReMat; - bool FoldSS = true; + bool FoldSS = true; // Default behavior unless it's a remat. int FoldSlot = Slot; if (DefIsReMat) { // If this is the rematerializable definition MI itself and @@ -734,8 +734,7 @@ // If def for this use can't be rematerialized, then try folding. // If def is rematerializable and it's a load, also try folding. - TryFold = !ReMatOrigDefMI || - (ReMatOrigDefMI && (MI == ReMatOrigDefMI || isLoad)); + TryFold = !ReMatDefMI || (ReMatDefMI && (MI == ReMatOrigDefMI || isLoad)); if (isLoad) { // Try fold loads (from stack slot, constant pool, etc.) into uses. FoldSS = isLoadSS; @@ -810,6 +809,12 @@ } else { vrm.assignVirt2StackSlot(NewVReg, Slot); } + } else if (HasUse && HasDef && + vrm.getStackSlot(NewVReg) == VirtRegMap::NO_STACK_SLOT) { + // If this interval hasn't been assigned a stack slot (because earlier + // def is a deleted remat def), do it now. + assert(Slot != VirtRegMap::NO_STACK_SLOT); + vrm.assignVirt2StackSlot(NewVReg, Slot); } // create a new register interval for this spill / remat. @@ -984,17 +989,6 @@ SpillMBBs.set(MBBId); } } - - /// FIXME: Move this else where. - if (!IsNew) { - // It this interval hasn't been assigned a stack slot - // (because earlier def is remat), do it now. - int SS = vrm.getStackSlot(NewVReg); - if (SS != (int)Slot) { - assert(SS == VirtRegMap::NO_STACK_SLOT); - vrm.assignVirt2StackSlot(NewVReg, Slot); - } - } } if (HasUse) { @@ -1110,6 +1104,7 @@ // are two-address instructions that re-defined the value. Only the // first def can be rematerialized! if (IsFirstRange) { + // Note ReMatOrigDefMI has already been deleted. rewriteInstructionsForSpills(li, false, I, NULL, ReMatDefMI, Slot, LdSlot, isLoad, isLoadSS, DefIsReMat, false, vrm, RegMap, rc, ReMatIds, loopInfo, From dpatel at apple.com Thu Nov 29 18:51:36 2007 From: dpatel at apple.com (Devang Patel) Date: Fri, 30 Nov 2007 00:51:36 -0000 Subject: [llvm-commits] [llvm] r44446 - in /llvm/trunk: include/llvm/CodeGen/MachineModuleInfo.h lib/CodeGen/MachineModuleInfo.cpp Message-ID: <200711300051.lAU0pa7H025446@zion.cs.uiuc.edu> Author: dpatel Date: Thu Nov 29 18:51:33 2007 New Revision: 44446 URL: http://llvm.org/viewvc/llvm-project?rev=44446&view=rev Log: Provide a way to update DescGlobals cache directly. Modified: llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp Modified: llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h?rev=44446&r1=44445&r2=44446&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h (original) +++ llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h Thu Nov 29 18:51:33 2007 @@ -755,6 +755,10 @@ DIDeserializer() {} ~DIDeserializer() {} + const std::map &getGlobalDescs() const { + return GlobalDescs; + } + /// Deserialize - Reconstitute a GlobalVariable into it's component /// DebugInfoDesc objects. DebugInfoDesc *Deserialize(Value *V); @@ -810,6 +814,9 @@ /// Serialize - Recursively cast the specified descriptor into a /// GlobalVariable so that it can be serialized to a .bc or .ll file. GlobalVariable *Serialize(DebugInfoDesc *DD); + + /// addDescriptor - Directly connect DD with existing GV. + void addDescriptor(DebugInfoDesc *DD, GlobalVariable *GV); }; //===----------------------------------------------------------------------===// @@ -1164,7 +1171,7 @@ std::vector AnchoredDescs; for (unsigned i = 0, N = Globals.size(); i < N; ++i) { GlobalVariable *GV = Globals[i]; - + // FIXME - In the short term, changes are too drastic to continue. if (DebugInfoDesc::TagFromGlobal(GV) == Desc.getTag() && DebugInfoDesc::VersionFromGlobal(GV) == LLVMDebugVersion) { @@ -1276,6 +1283,7 @@ /// of one is required to emit exception handling info. Function *getPersonality() const; + DIDeserializer *getDIDeserializer() { return &DR; } }; // End class MachineModuleInfo } // End llvm namespace Modified: llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp?rev=44446&r1=44445&r2=44446&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp (original) +++ llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp Thu Nov 29 18:51:33 2007 @@ -1364,6 +1364,12 @@ return GV; } +/// addDescriptor - Directly connect DD with existing GV. +void DISerializer::addDescriptor(DebugInfoDesc *DD, + GlobalVariable *GV) { + DescGlobals[DD] = GV; +} + //===----------------------------------------------------------------------===// /// Verify - Return true if the GlobalVariable appears to be a valid From dpatel at apple.com Thu Nov 29 18:58:44 2007 From: dpatel at apple.com (Devang Patel) Date: Fri, 30 Nov 2007 00:58:44 -0000 Subject: [llvm-commits] [llvm-gcc-4.0] r44447 - in /llvm-gcc-4.0/trunk/gcc: llvm-backend.cpp llvm-debug.cpp llvm-debug.h testsuite/gcc.dg/pch/dwarf-1.c testsuite/gcc.dg/pch/dwarf-1.hs Message-ID: <200711300058.lAU0wjXH026158@zion.cs.uiuc.edu> Author: dpatel Date: Thu Nov 29 18:58:44 2007 New Revision: 44447 URL: http://llvm.org/viewvc/llvm-project?rev=44447&view=rev Log: Restore debug info after reading PCH. Added: llvm-gcc-4.0/trunk/gcc/testsuite/gcc.dg/pch/dwarf-1.c llvm-gcc-4.0/trunk/gcc/testsuite/gcc.dg/pch/dwarf-1.hs Modified: llvm-gcc-4.0/trunk/gcc/llvm-backend.cpp llvm-gcc-4.0/trunk/gcc/llvm-debug.cpp llvm-gcc-4.0/trunk/gcc/llvm-debug.h Modified: llvm-gcc-4.0/trunk/gcc/llvm-backend.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/gcc/llvm-backend.cpp?rev=44447&r1=44446&r2=44447&view=diff ============================================================================== --- llvm-gcc-4.0/trunk/gcc/llvm-backend.cpp (original) +++ llvm-gcc-4.0/trunk/gcc/llvm-backend.cpp Thu Nov 29 18:58:44 2007 @@ -242,6 +242,9 @@ readLLVMTypesStringTable(); readLLVMValues(); + if (TheDebugInfo) + TheDebugInfo->readLLVMDebugInfo(); + flag_llvm_pch_read = 1; } Modified: llvm-gcc-4.0/trunk/gcc/llvm-debug.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/gcc/llvm-debug.cpp?rev=44447&r1=44446&r2=44447&view=diff ============================================================================== --- llvm-gcc-4.0/trunk/gcc/llvm-debug.cpp (original) +++ llvm-gcc-4.0/trunk/gcc/llvm-debug.cpp Thu Nov 29 18:58:44 2007 @@ -881,6 +881,36 @@ return Unit; } +/// readLLVMDebugInfo - Read debug info from PCH file. TheModule already +/// represents module read from PCH file. Restore AnchorDesc from PCH file. +void DebugInfo::readLLVMDebugInfo() { + MachineModuleInfo MMI; + MMI.AnalyzeModule(*TheModule); + + std::vector Subprograms = + MMI.getAnchoredDescriptors(*TheModule); + + if (!Subprograms.empty()) + SubprogramAnchor = Subprograms[0]->getAnchor(); + + std::vector CUs = + MMI.getAnchoredDescriptors(*TheModule); + + if (!CUs.empty()) + CompileUnitAnchor = CUs[0]->getAnchor(); + + std::vector GVs = + MMI.getAnchoredDescriptors(*TheModule); + + if (!GVs.empty()) + GlobalVariableAnchor = GVs[0]->getAnchor(); + + const std::map &GlobalDescs + = MMI.getDIDeserializer()->getGlobalDescs(); + for (std::map::const_iterator + I = GlobalDescs.begin(), E = GlobalDescs.end(); I != E; ++I) + SR.addDescriptor(I->second, I->first); +} /* APPLE LOCAL end LLVM (ENTIRE FILE!) */ Modified: llvm-gcc-4.0/trunk/gcc/llvm-debug.h URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/gcc/llvm-debug.h?rev=44447&r1=44446&r2=44447&view=diff ============================================================================== --- llvm-gcc-4.0/trunk/gcc/llvm-debug.h (original) +++ llvm-gcc-4.0/trunk/gcc/llvm-debug.h Thu Nov 29 18:58:44 2007 @@ -123,7 +123,9 @@ /// getOrCreateCompileUnit - Get the compile unit from the cache or create a /// new one if necessary. CompileUnitDesc *getOrCreateCompileUnit(const std::string &FullPath); - + + /// readLLVMDebugInfo - Read debug info from PCH file. + void readLLVMDebugInfo(); }; } // end namespace llvm Added: llvm-gcc-4.0/trunk/gcc/testsuite/gcc.dg/pch/dwarf-1.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/gcc/testsuite/gcc.dg/pch/dwarf-1.c?rev=44447&view=auto ============================================================================== --- llvm-gcc-4.0/trunk/gcc/testsuite/gcc.dg/pch/dwarf-1.c (added) +++ llvm-gcc-4.0/trunk/gcc/testsuite/gcc.dg/pch/dwarf-1.c Thu Nov 29 18:58:44 2007 @@ -0,0 +1,6 @@ +#include "dwarf-1.h" + +int main() { + foo(); + return 0; +} Added: llvm-gcc-4.0/trunk/gcc/testsuite/gcc.dg/pch/dwarf-1.hs URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/gcc/testsuite/gcc.dg/pch/dwarf-1.hs?rev=44447&view=auto ============================================================================== --- llvm-gcc-4.0/trunk/gcc/testsuite/gcc.dg/pch/dwarf-1.hs (added) +++ llvm-gcc-4.0/trunk/gcc/testsuite/gcc.dg/pch/dwarf-1.hs Thu Nov 29 18:58:44 2007 @@ -0,0 +1,3 @@ +int foo() { + return 42; +} From dpatel at apple.com Thu Nov 29 19:05:59 2007 From: dpatel at apple.com (Devang Patel) Date: Fri, 30 Nov 2007 01:05:59 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r44448 - in /llvm-gcc-4.2/trunk/gcc: llvm-backend.cpp llvm-debug.cpp llvm-debug.h testsuite/gcc.dg/pch/dwarf-1.c testsuite/gcc.dg/pch/dwarf-1.hs Message-ID: <200711300105.lAU15xCm026720@zion.cs.uiuc.edu> Author: dpatel Date: Thu Nov 29 19:05:58 2007 New Revision: 44448 URL: http://llvm.org/viewvc/llvm-project?rev=44448&view=rev Log: Restore debug info after reading PCH. Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/pch/dwarf-1.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/pch/dwarf-1.hs Modified: llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp llvm-gcc-4.2/trunk/gcc/llvm-debug.h Modified: llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp?rev=44448&r1=44447&r2=44448&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Thu Nov 29 19:05:58 2007 @@ -243,6 +243,9 @@ readLLVMTypesStringTable(); readLLVMValues(); + if (TheDebugInfo) + TheDebugInfo->readLLVMDebugInfo(); + flag_llvm_pch_read = 1; } Modified: llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp?rev=44448&r1=44447&r2=44448&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Thu Nov 29 19:05:58 2007 @@ -878,6 +878,36 @@ return Unit; } +/// readLLVMDebugInfo - Read debug info from PCH file. TheModule already +/// represents module read from PCH file. Restore AnchorDesc from PCH file. +void DebugInfo::readLLVMDebugInfo() { + MachineModuleInfo MMI; + MMI.AnalyzeModule(*TheModule); + std::vector Subprograms = + MMI.getAnchoredDescriptors(*TheModule); + + if (!Subprograms.empty()) + SubprogramAnchor = Subprograms[0]->getAnchor(); + + std::vector CUs = + MMI.getAnchoredDescriptors(*TheModule); + + if (!CUs.empty()) + CompileUnitAnchor = CUs[0]->getAnchor(); + + std::vector GVs = + MMI.getAnchoredDescriptors(*TheModule); + + if (!GVs.empty()) + GlobalVariableAnchor = GVs[0]->getAnchor(); + + const std::map &GlobalDescs + = MMI.getDIDeserializer()->getGlobalDescs(); + for (std::map::const_iterator + I = GlobalDescs.begin(), E = GlobalDescs.end(); I != E; ++I) + SR.addDescriptor(I->second, I->first); +} + /* LLVM LOCAL end (ENTIRE FILE!) */ Modified: llvm-gcc-4.2/trunk/gcc/llvm-debug.h URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-debug.h?rev=44448&r1=44447&r2=44448&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-debug.h (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-debug.h Thu Nov 29 19:05:58 2007 @@ -123,7 +123,9 @@ /// getOrCreateCompileUnit - Get the compile unit from the cache or create a /// new one if necessary. CompileUnitDesc *getOrCreateCompileUnit(const std::string &FullPath); - + + /// readLLVMDebugInfo - Read debug info from PCH file. + void readLLVMDebugInfo(); }; } // end namespace llvm Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/pch/dwarf-1.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/pch/dwarf-1.c?rev=44448&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/pch/dwarf-1.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/pch/dwarf-1.c Thu Nov 29 19:05:58 2007 @@ -0,0 +1,6 @@ +#include "dwarf-1.h" + +int main() { + foo(); + return 0; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/pch/dwarf-1.hs URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/pch/dwarf-1.hs?rev=44448&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/pch/dwarf-1.hs (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/pch/dwarf-1.hs Thu Nov 29 19:05:58 2007 @@ -0,0 +1,3 @@ +int foo() { + return 42; +} From evan.cheng at apple.com Fri Nov 30 01:15:20 2007 From: evan.cheng at apple.com (Evan Cheng) Date: Fri, 30 Nov 2007 07:15:20 -0000 Subject: [llvm-commits] [llvm-gcc-4.0] r44451 - /llvm-gcc-4.0/trunk/GNUmakefile Message-ID: <200711300715.lAU7FK3B015341@zion.cs.uiuc.edu> Author: evancheng Date: Fri Nov 30 01:15:20 2007 New Revision: 44451 URL: http://llvm.org/viewvc/llvm-project?rev=44451&view=rev Log: Fix an obvious typo. Modified: llvm-gcc-4.0/trunk/GNUmakefile Modified: llvm-gcc-4.0/trunk/GNUmakefile URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/GNUmakefile?rev=44451&r1=44450&r2=44451&view=diff ============================================================================== --- llvm-gcc-4.0/trunk/GNUmakefile (original) +++ llvm-gcc-4.0/trunk/GNUmakefile Fri Nov 30 01:15:20 2007 @@ -39,7 +39,7 @@ ifndef DISABLE_LLVM ENABLE_LLVM = true # LLVM gets installed into /usr/local, not /usr. -#ifndef DEVELOPER_DIR +ifndef DEVELOPER_DIR PREFIX = /Developer/usr/llvm-gcc-4.0 else PREFIX = ${DEVELOPER_DIR}/usr/lvm-gcc-4.0 From baldrick at free.fr Fri Nov 30 03:03:25 2007 From: baldrick at free.fr (Duncan Sands) Date: Fri, 30 Nov 2007 10:03:25 +0100 Subject: [llvm-commits] [poolalloc] r44441 - in /poolalloc/trunk/lib: DSA/DataStructure.cpp DSA/Local.cpp PoolAllocate/Heuristic.cpp PoolAllocate/PointerCompress.cpp PoolAllocate/TransformFunctionBody.cpp In-Reply-To: <200711292037.lATKbuOV011741@zion.cs.uiuc.edu> References: <200711292037.lATKbuOV011741@zion.cs.uiuc.edu> Message-ID: <200711301003.25885.baldrick@free.fr> Hi John, > Update use of TargetData->getTypeSize() to TargetData->getABITypeSize(). > I believe we want all of the sizes to including ABI padding. you need to use getABITypeSize for GEP calculations, in particular for advancing pointers or moving to the next array element (you shouldn't need this for moving around in structs, because there is a special API for structs that does it all for you). Also, all memory allocations need to use getABITypeSize, including alloca's and storage for globals. You probably only want getTypeStoreSize if you are doing alias analysis. Ciao, Duncan. From baldrick at free.fr Fri Nov 30 03:11:20 2007 From: baldrick at free.fr (Duncan Sands) Date: Fri, 30 Nov 2007 10:11:20 +0100 Subject: [llvm-commits] [llvm-gcc-4.2] r44442 - in /llvm-gcc-4.2/trunk/gcc: passes.c tree-optimize.c tree-pass.h In-Reply-To: <200711292136.lATLaGR5014625@zion.cs.uiuc.edu> References: <200711292136.lATLaGR5014625@zion.cs.uiuc.edu> Message-ID: <200711301011.21863.baldrick@free.fr> Hi Anton, > Move second openmp expansion pass before llvm-convert. This allows us not to > reinvent a wheel and rewrite all openmp lowering code at llvm side :) yummy! You could condition the extra passes on flag_openmp, so that the cost is only paid in that case. Time for the big question: does openmp now work with LLVM? Ciao, Duncan. From baldrick at free.fr Fri Nov 30 09:52:20 2007 From: baldrick at free.fr (Duncan Sands) Date: Fri, 30 Nov 2007 15:52:20 -0000 Subject: [llvm-commits] [llvm] r44452 - /llvm/trunk/lib/VMCore/Verifier.cpp Message-ID: <200711301552.lAUFqKcu011750@zion.cs.uiuc.edu> Author: baldrick Date: Fri Nov 30 09:52:20 2007 New Revision: 44452 URL: http://llvm.org/viewvc/llvm-project?rev=44452&view=rev Log: Check that there are not more attributes than function parameters. Modified: llvm/trunk/lib/VMCore/Verifier.cpp Modified: llvm/trunk/lib/VMCore/Verifier.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Verifier.cpp?rev=44452&r1=44451&r2=44452&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/Verifier.cpp (original) +++ llvm/trunk/lib/VMCore/Verifier.cpp Fri Nov 30 09:52:20 2007 @@ -396,6 +396,10 @@ bool SawSRet = false; if (const ParamAttrsList *Attrs = F.getParamAttrs()) { + Assert1(Attrs->size() && + Attrs->getParamIndex(Attrs->size()-1) <= FT->getNumParams(), + "Function has excess attributes!", &F); + bool SawNest = false; for (unsigned Idx = 0; Idx <= FT->getNumParams(); ++Idx) { From baldrick at free.fr Fri Nov 30 12:19:18 2007 From: baldrick at free.fr (Duncan Sands) Date: Fri, 30 Nov 2007 18:19:18 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r44456 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Message-ID: <200711301819.lAUIJI8W019310@zion.cs.uiuc.edu> Author: baldrick Date: Fri Nov 30 12:19:15 2007 New Revision: 44456 URL: http://llvm.org/viewvc/llvm-project?rev=44456&view=rev Log: Add the nounwind attribute to calls in nothrow regions. Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=44456&r1=44455&r2=44456&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Fri Nov 30 12:19:15 2007 @@ -2311,7 +2311,6 @@ // call) and if so, what the exception destination will be. BasicBlock *LandingPad = 0; bool NoUnwind = false; - // FIXME: set the nounwind attribute if NoUnwind. // Do not turn intrinsic calls into invokes. if (!isa(Callee) || !cast(Callee)->getIntrinsicID()) { @@ -2342,6 +2341,17 @@ } } + if (NoUnwind && !(PAL && PAL->paramHasAttr(0, ParamAttr::NoUnwind))) { + // This particular call does not unwind even though the callee may + // unwind in general. Add the 'nounwind' attribute to the call. + uint16_t RAttributes = PAL ? PAL->getParamAttrs(0) : 0; + RAttributes |= ParamAttr::NoUnwind; + + ParamAttrsVector modVec; + modVec.push_back(ParamAttrsWithIndex::get(0, RAttributes)); + PAL = ParamAttrsList::getModified(PAL, modVec); + } + SmallVector CallOperands; CallingConv::ID CallingConvention; FunctionCallArgumentConversion Client(exp, CallOperands, CallingConvention, From baldrick at free.fr Fri Nov 30 12:19:18 2007 From: baldrick at free.fr (Duncan Sands) Date: Fri, 30 Nov 2007 18:19:18 -0000 Subject: [llvm-commits] [llvm] r44457 - in /llvm/trunk: include/llvm/ParameterAttributes.h lib/AsmParser/llvmAsmParser.y lib/VMCore/Function.cpp tools/llvm-upgrade/UpgradeParser.y Message-ID: <200711301819.lAUIJIYM019318@zion.cs.uiuc.edu> Author: baldrick Date: Fri Nov 30 12:19:18 2007 New Revision: 44457 URL: http://llvm.org/viewvc/llvm-project?rev=44457&view=rev Log: Add a convenience method for modifying parameter attributes. While there, I noticed that not all attribute methods returned a pointer-to-constant, so I fixed that. Modified: llvm/trunk/include/llvm/ParameterAttributes.h llvm/trunk/lib/AsmParser/llvmAsmParser.y llvm/trunk/lib/VMCore/Function.cpp llvm/trunk/tools/llvm-upgrade/UpgradeParser.y Modified: llvm/trunk/include/llvm/ParameterAttributes.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ParameterAttributes.h?rev=44457&r1=44456&r2=44457&view=diff ============================================================================== --- llvm/trunk/include/llvm/ParameterAttributes.h (original) +++ llvm/trunk/include/llvm/ParameterAttributes.h Fri Nov 30 12:19:18 2007 @@ -130,13 +130,24 @@ : attrs(attrVec), refCount(0) {} public: - /// This method ensures the uniqueness of ParamAttrsList instances. The + /// This method ensures the uniqueness of ParamAttrsList instances. The /// argument is a vector of attribute/index pairs as represented by the - /// ParamAttrsWithIndex structure. The vector is used in the construction of - /// the ParamAttrsList instance. If an instance with identical vector pairs - /// exists, it will be returned instead of creating a new instance. + /// ParamAttrsWithIndex structure. The index values must be in strictly + /// increasing order and ParamAttr::None is not allowed. The vector is + /// used to construct the ParamAttrsList instance. If an instance with + /// identical vector pairs exists, it will be returned instead of creating + /// a new instance. /// @brief Get a ParamAttrsList instance. - static ParamAttrsList *get(const ParamAttrsVector &attrVec); + static const ParamAttrsList *get(const ParamAttrsVector &attrVec); + + /// Returns the ParamAttrsList obtained by modifying PAL using the supplied + /// list of attribute/index pairs. Any existing attributes for the given + /// index are replaced by the given attributes. If there were no attributes + /// then the new ones are inserted. Attributes can be deleted by replacing + /// them with ParamAttr::None. Index values must be strictly increasing. + /// @brief Get a new ParamAttrsList instance by modifying an existing one. + static const ParamAttrsList *getModified(const ParamAttrsList *PAL, + const ParamAttrsVector &modVec); /// Returns whether each of the specified lists of attributes can be safely /// replaced with the other in a function or a function call. Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.y URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.y?rev=44457&r1=44456&r2=44457&view=diff ============================================================================== --- llvm/trunk/lib/AsmParser/llvmAsmParser.y (original) +++ llvm/trunk/lib/AsmParser/llvmAsmParser.y Fri Nov 30 12:19:18 2007 @@ -2243,7 +2243,7 @@ bool isVarArg = ParamTypeList.size() && ParamTypeList.back() == Type::VoidTy; if (isVarArg) ParamTypeList.pop_back(); - ParamAttrsList *PAL = 0; + const ParamAttrsList *PAL = 0; if (!Attrs.empty()) PAL = ParamAttrsList::get(Attrs); @@ -2645,7 +2645,7 @@ GEN_ERROR("Invalid number of parameters detected"); } - ParamAttrsList *PAL = 0; + const ParamAttrsList *PAL = 0; if (!Attrs.empty()) PAL = ParamAttrsList::get(Attrs); @@ -2977,7 +2977,7 @@ } // Finish off the ParamAttrs and check them - ParamAttrsList *PAL = 0; + const ParamAttrsList *PAL = 0; if (!Attrs.empty()) PAL = ParamAttrsList::get(Attrs); Modified: llvm/trunk/lib/VMCore/Function.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Function.cpp?rev=44457&r1=44456&r2=44457&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/Function.cpp (original) +++ llvm/trunk/lib/VMCore/Function.cpp Fri Nov 30 12:19:18 2007 @@ -167,7 +167,7 @@ static ManagedStatic > ParamAttrsLists; -ParamAttrsList * +const ParamAttrsList * ParamAttrsList::get(const ParamAttrsVector &attrVec) { // If there are no attributes then return a null ParamAttrsList pointer. if (attrVec.empty()) @@ -200,6 +200,64 @@ return PAL; } +const ParamAttrsList * +ParamAttrsList::getModified(const ParamAttrsList *PAL, + const ParamAttrsVector &modVec) { + if (modVec.empty()) + return PAL; + +#ifndef NDEBUG + for (unsigned i = 0, e = modVec.size(); i < e; ++i) + assert((!i || modVec[i-1].index < modVec[i].index) + && "Misordered ParamAttrsList!"); +#endif + + if (!PAL) { + // Strip any instances of ParamAttr::None from modVec before calling 'get'. + ParamAttrsVector newVec; + for (unsigned i = 0, e = modVec.size(); i < e; ++i) + if (modVec[i].attrs != ParamAttr::None) + newVec.push_back(modVec[i]); + return get(newVec); + } + + const ParamAttrsVector &oldVec = PAL->attrs; + + ParamAttrsVector newVec; + unsigned oldI = 0; + unsigned modI = 0; + unsigned oldE = oldVec.size(); + unsigned modE = modVec.size(); + + while (oldI < oldE && modI < modE) { + uint16_t oldIndex = oldVec[oldI].index; + uint16_t modIndex = modVec[modI].index; + + if (oldIndex < modIndex) { + newVec.push_back(oldVec[oldI]); + ++oldI; + } else if (modIndex < oldIndex) { + if (modVec[modI].attrs != ParamAttr::None) + newVec.push_back(modVec[modI]); + ++modI; + } else { + // Same index - overwrite or delete existing attributes. + if (modVec[modI].attrs != ParamAttr::None) + newVec.push_back(modVec[modI]); + ++oldI; + ++modI; + } + } + + for (; oldI < oldE; ++oldI) + newVec.push_back(oldVec[oldI]); + for (; modI < modE; ++modI) + if (modVec[modI].attrs != ParamAttr::None) + newVec.push_back(modVec[modI]); + + return get(newVec); +} + ParamAttrsList::~ParamAttrsList() { ParamAttrsLists->RemoveNode(this); } Modified: llvm/trunk/tools/llvm-upgrade/UpgradeParser.y URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-upgrade/UpgradeParser.y?rev=44457&r1=44456&r2=44457&view=diff ============================================================================== --- llvm/trunk/tools/llvm-upgrade/UpgradeParser.y (original) +++ llvm/trunk/tools/llvm-upgrade/UpgradeParser.y Fri Nov 30 12:19:18 2007 @@ -2055,7 +2055,7 @@ bool isVarArg = Params.size() && Params.back() == Type::VoidTy; if (isVarArg) Params.pop_back(); - ParamAttrsList *PAL = 0; + const ParamAttrsList *PAL = 0; if (lastCallingConv == OldCallingConv::CSRet) { ParamAttrsVector Attrs; ParamAttrsWithIndex PAWI; From baldrick at free.fr Fri Nov 30 12:20:59 2007 From: baldrick at free.fr (Duncan Sands) Date: Fri, 30 Nov 2007 18:20:59 -0000 Subject: [llvm-commits] [llvm] r44458 - /llvm/trunk/lib/VMCore/Function.cpp Message-ID: <200711301820.lAUIKxHi019397@zion.cs.uiuc.edu> Author: baldrick Date: Fri Nov 30 12:20:58 2007 New Revision: 44458 URL: http://llvm.org/viewvc/llvm-project?rev=44458&view=rev Log: Small optimization of parameter attribute lookup. Modified: llvm/trunk/lib/VMCore/Function.cpp Modified: llvm/trunk/lib/VMCore/Function.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Function.cpp?rev=44458&r1=44457&r2=44458&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/Function.cpp (original) +++ llvm/trunk/lib/VMCore/Function.cpp Fri Nov 30 12:20:58 2007 @@ -79,7 +79,7 @@ uint16_t ParamAttrsList::getParamAttrs(uint16_t Index) const { unsigned limit = attrs.size(); - for (unsigned i = 0; i < limit; ++i) + for (unsigned i = 0; i < limit && attrs[i].index <= Index; ++i) if (attrs[i].index == Index) return attrs[i].attrs; return ParamAttr::None; From sabre at nondot.org Fri Nov 30 12:52:58 2007 From: sabre at nondot.org (Chris Lattner) Date: Fri, 30 Nov 2007 18:52:58 -0000 Subject: [llvm-commits] [llvm] r44460 - /llvm/trunk/lib/Analysis/IPA/GlobalsModRef.cpp Message-ID: <200711301852.lAUIqwAh020717@zion.cs.uiuc.edu> Author: lattner Date: Fri Nov 30 12:52:58 2007 New Revision: 44460 URL: http://llvm.org/viewvc/llvm-project?rev=44460&view=rev Log: chain update requests properly. Modified: llvm/trunk/lib/Analysis/IPA/GlobalsModRef.cpp Modified: llvm/trunk/lib/Analysis/IPA/GlobalsModRef.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/IPA/GlobalsModRef.cpp?rev=44460&r1=44459&r2=44460&view=diff ============================================================================== --- llvm/trunk/lib/Analysis/IPA/GlobalsModRef.cpp (original) +++ llvm/trunk/lib/Analysis/IPA/GlobalsModRef.cpp Fri Nov 30 12:52:58 2007 @@ -548,7 +548,10 @@ // Otherwise, if this is an allocation related to an indirect global, remove // it. AllocsForIndirectGlobals.erase(V); + + AliasAnalysis::deleteValue(V); } void GlobalsModRef::copyValue(Value *From, Value *To) { + AliasAnalysis::copyValue(From, To); } From sabre at nondot.org Fri Nov 30 12:59:27 2007 From: sabre at nondot.org (Chris Lattner) Date: Fri, 30 Nov 2007 18:59:27 -0000 Subject: [llvm-commits] [test-suite] r44461 - /test-suite/trunk/Makefile.programs Message-ID: <200711301859.lAUIxRmK021011@zion.cs.uiuc.edu> Author: lattner Date: Fri Nov 30 12:59:27 2007 New Revision: 44461 URL: http://llvm.org/viewvc/llvm-project?rev=44461&view=rev Log: remove dead glue Modified: test-suite/trunk/Makefile.programs Modified: test-suite/trunk/Makefile.programs URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.programs?rev=44461&r1=44460&r2=44461&view=diff ============================================================================== --- test-suite/trunk/Makefile.programs (original) +++ test-suite/trunk/Makefile.programs Fri Nov 30 12:59:27 2007 @@ -300,12 +300,12 @@ Output/opt-pass-args: $(LOPT) Output/.dir -$(LLVMAS) < /dev/null -o - | \ $(LOPT) $(EXTRA_LOPT_OPTIONS) -std-compile-opts -disable-output -debug-pass=Arguments 2>&1 | \ - sed 's/Pass Arguments: //' | sed 's/-emitbytecode//' > $@ + sed 's/Pass Arguments: //' > $@ Output/llvm-ld-pass-args: $(LLVMLDPROG) Output/.dir $(LLVMAS) < /dev/null > Output/llvm-ld.test.bc $(LLVMLD) Output/llvm-ld.test.bc -o Output/llvm-ld.test-out -debug-pass=Arguments > $@.1 2>&1 - sed 's/Pass Arguments: //' < $@.1 | sed 's/-emitbytecode//' > $@ + sed 's/Pass Arguments: //' < $@.1 > $@ # If the program requires exception handling support, enable (potentially # expensive) support for it. From isanbard at gmail.com Fri Nov 30 15:13:31 2007 From: isanbard at gmail.com (Bill Wendling) Date: Fri, 30 Nov 2007 21:13:31 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r44464 - /llvm-gcc-4.2/trunk/driverdriver.c Message-ID: <200711302113.lAULDVC8026775@zion.cs.uiuc.edu> Author: void Date: Fri Nov 30 15:13:29 2007 New Revision: 44464 URL: http://llvm.org/viewvc/llvm-project?rev=44464&view=rev Log: The drivers live in /Developer/usr/llvm-gcc-4.2/bin now instead of the current directory. Use "make_relative_prefix" to create this. Modified: llvm-gcc-4.2/trunk/driverdriver.c Modified: llvm-gcc-4.2/trunk/driverdriver.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/driverdriver.c?rev=44464&r1=44463&r2=44464&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/driverdriver.c (original) +++ llvm-gcc-4.2/trunk/driverdriver.c Fri Nov 30 15:13:29 2007 @@ -1251,7 +1251,20 @@ curr_dir = (char *) malloc (sizeof (char) * (prefix_len + 1)); strncpy (curr_dir, argv[0], prefix_len); curr_dir[prefix_len] = '\0'; - driver_exec_prefix = (argv[0], "/usr/bin", curr_dir); + /* LLVM LOCAL begin - These drivers live in /.../usr/llvm-gcc-4.0/bin */ + { + size_t curr_dir_len = strlen (curr_dir); + const char *llvm_bin_dir = "/usr/llvm-gcc-4.0/bin/"; + size_t bin_dir_len = strlen (llvm_bin_dir); + + if (curr_dir_len <= bin_dir_len || + strncmp (&curr_dir[curr_dir_len - bin_dir_len], llvm_bin_dir, bin_dir_len) != 0) + driver_exec_prefix = + make_relative_prefix (argv[0], curr_dir, "/usr/llvm-gcc-4.0/bin/"); + else + driver_exec_prefix = curr_dir; + } + /* LLVM LOCAL end - These drivers live in /.../usr/llvm-gcc-4.0/bin */ #ifdef DEBUG fprintf (stderr,"%s: full progname = %s\n", progname, argv[0]); From isanbard at gmail.com Fri Nov 30 15:13:49 2007 From: isanbard at gmail.com (Bill Wendling) Date: Fri, 30 Nov 2007 21:13:49 -0000 Subject: [llvm-commits] [llvm-gcc-4.0] r44465 - /llvm-gcc-4.0/trunk/driverdriver.c Message-ID: <200711302113.lAULDnls026801@zion.cs.uiuc.edu> Author: void Date: Fri Nov 30 15:13:49 2007 New Revision: 44465 URL: http://llvm.org/viewvc/llvm-project?rev=44465&view=rev Log: The drivers live in /Developer/usr/llvm-gcc-4.0/bin now instead of the current directory. Use "make_relative_prefix" to create this. Modified: llvm-gcc-4.0/trunk/driverdriver.c Modified: llvm-gcc-4.0/trunk/driverdriver.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/driverdriver.c?rev=44465&r1=44464&r2=44465&view=diff ============================================================================== --- llvm-gcc-4.0/trunk/driverdriver.c (original) +++ llvm-gcc-4.0/trunk/driverdriver.c Fri Nov 30 15:13:49 2007 @@ -20,7 +20,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - #include #include #include @@ -1260,11 +1259,25 @@ curr_dir = (char *) malloc (sizeof (char) * (prefix_len + 1)); strncpy (curr_dir, argv[0], prefix_len); curr_dir[prefix_len] = '\0'; - driver_exec_prefix = (argv[0], "/usr/bin", curr_dir); + /* LLVM LOCAL begin - These drivers live in /.../usr/llvm-gcc-4.0/bin */ + { + size_t curr_dir_len = strlen (curr_dir); + const char *llvm_bin_dir = "/usr/llvm-gcc-4.0/bin/"; + size_t bin_dir_len = strlen (llvm_bin_dir); + + if (curr_dir_len <= bin_dir_len || + strncmp (&curr_dir[curr_dir_len - bin_dir_len], llvm_bin_dir, bin_dir_len) != 0) + driver_exec_prefix = + make_relative_prefix (argv[0], curr_dir, "/usr/llvm-gcc-4.0/bin/"); + else + driver_exec_prefix = curr_dir; + } + /* LLVM LOCAL end - These drivers live in /.../usr/llvm-gcc-4.0/bin */ #ifdef DEBUG fprintf (stderr,"%s: full progname = %s\n", progname, argv[0]); fprintf (stderr,"%s: progname = %s\n", progname, progname); + fprintf (stderr,"%s: curr_dir = %s\n", progname, curr_dir); fprintf (stderr,"%s: driver_exec_prefix = %s\n", progname, driver_exec_prefix); #endif From isanbard at gmail.com Fri Nov 30 15:18:29 2007 From: isanbard at gmail.com (Bill Wendling) Date: Fri, 30 Nov 2007 21:18:29 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r44466 - /llvm-gcc-4.2/trunk/driverdriver.c Message-ID: <200711302118.lAULIThL027068@zion.cs.uiuc.edu> Author: void Date: Fri Nov 30 15:18:29 2007 New Revision: 44466 URL: http://llvm.org/viewvc/llvm-project?rev=44466&view=rev Log: Ahem...that's 4.2, not 4.0... Modified: llvm-gcc-4.2/trunk/driverdriver.c Modified: llvm-gcc-4.2/trunk/driverdriver.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/driverdriver.c?rev=44466&r1=44465&r2=44466&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/driverdriver.c (original) +++ llvm-gcc-4.2/trunk/driverdriver.c Fri Nov 30 15:18:29 2007 @@ -1251,20 +1251,20 @@ curr_dir = (char *) malloc (sizeof (char) * (prefix_len + 1)); strncpy (curr_dir, argv[0], prefix_len); curr_dir[prefix_len] = '\0'; - /* LLVM LOCAL begin - These drivers live in /.../usr/llvm-gcc-4.0/bin */ + /* LLVM LOCAL begin - These drivers live in /.../usr/llvm-gcc-4.2/bin */ { size_t curr_dir_len = strlen (curr_dir); - const char *llvm_bin_dir = "/usr/llvm-gcc-4.0/bin/"; + const char *llvm_bin_dir = "/usr/llvm-gcc-4.2/bin/"; size_t bin_dir_len = strlen (llvm_bin_dir); if (curr_dir_len <= bin_dir_len || strncmp (&curr_dir[curr_dir_len - bin_dir_len], llvm_bin_dir, bin_dir_len) != 0) driver_exec_prefix = - make_relative_prefix (argv[0], curr_dir, "/usr/llvm-gcc-4.0/bin/"); + make_relative_prefix (argv[0], curr_dir, "/usr/llvm-gcc-4.2/bin/"); else driver_exec_prefix = curr_dir; } - /* LLVM LOCAL end - These drivers live in /.../usr/llvm-gcc-4.0/bin */ + /* LLVM LOCAL end - These drivers live in /.../usr/llvm-gcc-4.2/bin */ #ifdef DEBUG fprintf (stderr,"%s: full progname = %s\n", progname, argv[0]); From evan.cheng at apple.com Fri Nov 30 15:23:43 2007 From: evan.cheng at apple.com (Evan Cheng) Date: Fri, 30 Nov 2007 21:23:43 -0000 Subject: [llvm-commits] [llvm] r44467 - in /llvm/trunk: include/llvm/CodeGen/LiveIntervalAnalysis.h lib/CodeGen/LiveIntervalAnalysis.cpp test/CodeGen/X86/2007-11-30-LoadFolding-Bug.ll Message-ID: <200711302123.lAULNh1K027270@zion.cs.uiuc.edu> Author: evancheng Date: Fri Nov 30 15:23:43 2007 New Revision: 44467 URL: http://llvm.org/viewvc/llvm-project?rev=44467&view=rev Log: Do not fold reload into an instruction with multiple uses. It issues one extra load. Added: llvm/trunk/test/CodeGen/X86/2007-11-30-LoadFolding-Bug.ll Modified: llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Modified: llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h?rev=44467&r1=44466&r2=44467&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h (original) +++ llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h Fri Nov 30 15:23:43 2007 @@ -274,8 +274,9 @@ /// MI. If it is successul, MI is updated with the newly created MI and /// returns true. bool tryFoldMemoryOperand(MachineInstr* &MI, VirtRegMap &vrm, - MachineInstr *DefMI, unsigned index, unsigned i, - bool isSS, int slot, unsigned reg); + MachineInstr *DefMI, unsigned InstrIdx, + unsigned OpIdx, unsigned NumUses, + bool isSS, int Slot, unsigned Reg); /// anyKillInMBBAfterIdx - Returns true if there is a kill of the specified /// VNInfo that's after the specified index but is within the basic block. Modified: llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp?rev=44467&r1=44466&r2=44467&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp (original) +++ llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Fri Nov 30 15:23:43 2007 @@ -642,13 +642,22 @@ /// MI. If it is successul, MI is updated with the newly created MI and /// returns true. bool LiveIntervals::tryFoldMemoryOperand(MachineInstr* &MI, - VirtRegMap &vrm, - MachineInstr *DefMI, - unsigned index, unsigned i, - bool isSS, int slot, unsigned reg) { + VirtRegMap &vrm, MachineInstr *DefMI, + unsigned InstrIdx, unsigned OpIdx, + unsigned NumUses, + bool isSS, int Slot, unsigned Reg) { + // FIXME: fold subreg use + if (MI->getOperand(OpIdx).getSubReg()) + return false; + + // FIXME: It may be possible to fold load when there are multiple uses. + // e.g. On x86, TEST32rr r, r -> CMP32rm [mem], 0 + if (NumUses > 1) + return false; + MachineInstr *fmi = isSS - ? mri_->foldMemoryOperand(MI, i, slot) - : mri_->foldMemoryOperand(MI, i, DefMI); + ? mri_->foldMemoryOperand(MI, OpIdx, Slot) + : mri_->foldMemoryOperand(MI, OpIdx, DefMI); if (fmi) { // Attempt to fold the memory reference into the instruction. If // we can do this, we don't need to insert spill code. @@ -657,15 +666,13 @@ else LiveVariables::transferKillDeadInfo(MI, fmi, mri_); MachineBasicBlock &MBB = *MI->getParent(); - if (isSS) { - if (!mf_->getFrameInfo()->isFixedObjectIndex(slot)) - vrm.virtFolded(reg, MI, i, fmi); - } + if (isSS && !mf_->getFrameInfo()->isFixedObjectIndex(Slot)) + vrm.virtFolded(Reg, MI, OpIdx, fmi); vrm.transferSpillPts(MI, fmi); vrm.transferRestorePts(MI, fmi); mi2iMap_.erase(MI); - i2miMap_[index/InstrSlots::NUM] = fmi; - mi2iMap_[fmi] = index; + i2miMap_[InstrIdx /InstrSlots::NUM] = fmi; + mi2iMap_[fmi] = InstrIdx; MI = MBB.insert(MBB.erase(MI), fmi); ++numFolds; return true; @@ -714,8 +721,6 @@ unsigned RegI = Reg; if (Reg == 0 || MRegisterInfo::isPhysicalRegister(Reg)) continue; - unsigned SubIdx = mop.getSubReg(); - bool isSubReg = SubIdx != 0; if (Reg != li.reg) continue; @@ -726,6 +731,8 @@ // If this is the rematerializable definition MI itself and // all of its uses are rematerialized, simply delete it. if (MI == ReMatOrigDefMI && CanDelete) { + DOUT << "\t\t\t\tErasing re-materlizable def: "; + DOUT << MI << '\n'; RemoveMachineInstrFromMaps(MI); vrm.RemoveMachineInstrFromMaps(MI); MI->eraseFromParent(); @@ -747,23 +754,6 @@ if (TryFold) TryFold = !TrySplit && NewVReg == 0; - // FIXME: fold subreg use - if (!isSubReg && TryFold && - tryFoldMemoryOperand(MI, vrm, ReMatDefMI, index, i, FoldSS, FoldSlot, - Reg)) - // Folding the load/store can completely change the instruction in - // unpredictable ways, rescan it from the beginning. - goto RestartInstruction; - - // Create a new virtual register for the spill interval. - bool CreatedNewVReg = false; - if (NewVReg == 0) { - NewVReg = RegMap->createVirtualRegister(rc); - vrm.grow(); - CreatedNewVReg = true; - } - mop.setReg(NewVReg); - // Scan all of the operands of this instruction rewriting operands // to use NewVReg instead of li.reg as appropriate. We do this for // two reasons: @@ -775,9 +765,11 @@ // // Keep track of whether we replace a use and/or def so that we can // create the spill interval with the appropriate range. - + HasUse = mop.isUse(); HasDef = mop.isDef(); + unsigned NumUses = HasUse; + std::vector UpdateOps; for (unsigned j = i+1, e = MI->getNumOperands(); j != e; ++j) { if (!MI->getOperand(j).isRegister()) continue; @@ -785,12 +777,37 @@ if (RegJ == 0 || MRegisterInfo::isPhysicalRegister(RegJ)) continue; if (RegJ == RegI) { - MI->getOperand(j).setReg(NewVReg); + UpdateOps.push_back(j); + if (MI->getOperand(j).isUse()) + ++NumUses; HasUse |= MI->getOperand(j).isUse(); HasDef |= MI->getOperand(j).isDef(); } } + if (TryFold && + tryFoldMemoryOperand(MI, vrm, ReMatDefMI, index, i, + NumUses, FoldSS, FoldSlot, Reg)) { + // Folding the load/store can completely change the instruction in + // unpredictable ways, rescan it from the beginning. + HasUse = false; + HasDef = false; + goto RestartInstruction; + } + + // Create a new virtual register for the spill interval. + bool CreatedNewVReg = false; + if (NewVReg == 0) { + NewVReg = RegMap->createVirtualRegister(rc); + vrm.grow(); + CreatedNewVReg = true; + } + mop.setReg(NewVReg); + + // Reuse NewVReg for other reads. + for (unsigned j = 0, e = UpdateOps.size(); j != e; ++j) + MI->getOperand(UpdateOps[j]).setReg(NewVReg); + if (CreatedNewVReg) { if (DefIsReMat) { vrm.setVirtIsReMaterialized(NewVReg, ReMatDefMI/*, CanDelete*/); @@ -1197,46 +1214,44 @@ for (unsigned i = 0, e = spills.size(); i != e; ++i) { int index = spills[i].index; unsigned VReg = spills[i].vreg; - bool DoFold = spills[i].canFold; bool isReMat = vrm.isReMaterialized(VReg); MachineInstr *MI = getInstructionFromIndex(index); int OpIdx = -1; - bool FoldedLoad = false; - if (DoFold) { + unsigned NumUses = 0; + if (spills[i].canFold) { for (unsigned j = 0, ee = MI->getNumOperands(); j != ee; ++j) { MachineOperand &MO = MI->getOperand(j); if (!MO.isRegister() || MO.getReg() != VReg) continue; - if (MO.isUse()) { - // Can't fold if it's two-address code and the use isn't the - // first and only use. - // If there are more than one uses, a load is still needed. - if (!isReMat && !FoldedLoad && - alsoFoldARestore(Id, index,VReg,RestoreMBBs,RestoreIdxes)) { - FoldedLoad = true; - continue; - } else { - OpIdx = -1; - break; - } + if (MO.isDef()) { + OpIdx = (int)j; + continue; } - OpIdx = (int)j; + // Can't fold if it's two-address code and the use isn't the + // first and only use. + if (isReMat || + (NumUses == 0 && !alsoFoldARestore(Id, index, VReg, RestoreMBBs, + RestoreIdxes))) { + OpIdx = -1; + break; + } + ++NumUses; } } // Fold the store into the def if possible. - if (OpIdx == -1) - DoFold = false; - if (DoFold) { - if (tryFoldMemoryOperand(MI, vrm, NULL, index,OpIdx,true,Slot,VReg)) { - if (FoldedLoad) + bool Folded = false; + if (OpIdx != -1) { + if (tryFoldMemoryOperand(MI, vrm, NULL, index, OpIdx, NumUses, + true, Slot, VReg)) { + if (NumUses) // Folded a two-address instruction, do not issue a load. eraseRestoreInfo(Id, index, VReg, RestoreMBBs, RestoreIdxes); - } else - DoFold = false; + Folded = true; + } } // Else tell the spiller to issue a store for us. - if (!DoFold) + if (!Folded) vrm.addSpillPoint(VReg, MI); } Id = SpillMBBs.find_next(Id); @@ -1251,32 +1266,30 @@ if (index == -1) continue; unsigned VReg = restores[i].vreg; - bool DoFold = restores[i].canFold; MachineInstr *MI = getInstructionFromIndex(index); + unsigned NumUses = 0; int OpIdx = -1; - if (DoFold) { + if (restores[i].canFold) { for (unsigned j = 0, ee = MI->getNumOperands(); j != ee; ++j) { MachineOperand &MO = MI->getOperand(j); if (!MO.isRegister() || MO.getReg() != VReg) continue; if (MO.isDef()) { - // Can't fold if it's two-address code. + // Can't fold if it's two-address code and it hasn't already + // been folded. OpIdx = -1; break; } - if (OpIdx != -1) { - // Multiple uses, do not fold! - OpIdx = -1; - break; - } - OpIdx = (int)j; + if (NumUses == 0) + // Use the first use index. + OpIdx = (int)j; + ++NumUses; } } // Fold the load into the use if possible. - if (OpIdx == -1) - DoFold = false; - if (DoFold) { + bool Folded = false; + if (OpIdx != -1) { if (vrm.isReMaterialized(VReg)) { MachineInstr *ReMatDefMI = vrm.getReMaterializedMI(VReg); int LdSlot = 0; @@ -1284,17 +1297,15 @@ // If the rematerializable def is a load, also try to fold it. if (isLoadSS || (ReMatDefMI->getInstrDescriptor()->Flags & M_LOAD_FLAG)) - DoFold = tryFoldMemoryOperand(MI, vrm, ReMatDefMI, index, OpIdx, - isLoadSS, LdSlot, VReg); - else - DoFold = false; + Folded = tryFoldMemoryOperand(MI, vrm, ReMatDefMI, index, OpIdx, + NumUses, isLoadSS, LdSlot, VReg); } else - DoFold = tryFoldMemoryOperand(MI, vrm, NULL, index, OpIdx, + Folded = tryFoldMemoryOperand(MI, vrm, NULL, index, OpIdx, NumUses, true, Slot, VReg); } // If folding is not possible / failed, then tell the spiller to issue a // load / rematerialization for us. - if (!DoFold) + if (!Folded) vrm.addRestorePoint(VReg, MI); } Id = RestoreMBBs.find_next(Id); Added: llvm/trunk/test/CodeGen/X86/2007-11-30-LoadFolding-Bug.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2007-11-30-LoadFolding-Bug.ll?rev=44467&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/2007-11-30-LoadFolding-Bug.ll (added) +++ llvm/trunk/test/CodeGen/X86/2007-11-30-LoadFolding-Bug.ll Fri Nov 30 15:23:43 2007 @@ -0,0 +1,81 @@ +; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -stats |& \ +; RUN: grep {1 .*folded into instructions} + +declare fastcc void @rdft(i32, i32, double*, i32*, double*) + +define fastcc void @mp_sqrt(i32 %n, i32 %radix, i32* %in, i32* %out, i32* %tmp1, i32* %tmp2, i32 %nfft, double* %tmp1fft, double* %tmp2fft, i32* %ip, double* %w) { +entry: + br label %bb.i5 + +bb.i5: ; preds = %bb.i5, %entry + %nfft_init.0.i = phi i32 [ 1, %entry ], [ %tmp7.i3, %bb.i5 ] ; [#uses=1] + %tmp7.i3 = shl i32 %nfft_init.0.i, 1 ; [#uses=2] + br i1 false, label %bb.i5, label %mp_unexp_mp2d.exit.i + +mp_unexp_mp2d.exit.i: ; preds = %bb.i5 + br i1 false, label %cond_next.i, label %cond_true.i + +cond_true.i: ; preds = %mp_unexp_mp2d.exit.i + ret void + +cond_next.i: ; preds = %mp_unexp_mp2d.exit.i + %tmp22.i = sdiv i32 0, 2 ; [#uses=2] + br i1 false, label %cond_true29.i, label %cond_next36.i + +cond_true29.i: ; preds = %cond_next.i + ret void + +cond_next36.i: ; preds = %cond_next.i + store i32 %tmp22.i, i32* null, align 4 + %tmp8.i14.i = select i1 false, i32 1, i32 0 ; [#uses=1] + br label %bb.i28.i + +bb.i28.i: ; preds = %bb.i28.i, %cond_next36.i + %j.0.reg2mem.0.i16.i = phi i32 [ 0, %cond_next36.i ], [ %indvar.next39.i, %bb.i28.i ] ; [#uses=2] + %din_addr.1.reg2mem.0.i17.i = phi double [ 0.000000e+00, %cond_next36.i ], [ %tmp16.i25.i, %bb.i28.i ] ; [#uses=1] + %tmp1.i18.i = fptosi double %din_addr.1.reg2mem.0.i17.i to i32 ; [#uses=2] + %tmp4.i19.i = icmp slt i32 %tmp1.i18.i, %radix ; [#uses=1] + %x.0.i21.i = select i1 %tmp4.i19.i, i32 %tmp1.i18.i, i32 0 ; [#uses=1] + %tmp41.sum.i = add i32 %j.0.reg2mem.0.i16.i, 2 ; [#uses=0] + %tmp1213.i23.i = sitofp i32 %x.0.i21.i to double ; [#uses=1] + %tmp15.i24.i = sub double 0.000000e+00, %tmp1213.i23.i ; [#uses=1] + %tmp16.i25.i = mul double 0.000000e+00, %tmp15.i24.i ; [#uses=1] + %indvar.next39.i = add i32 %j.0.reg2mem.0.i16.i, 1 ; [#uses=2] + %exitcond40.i = icmp eq i32 %indvar.next39.i, %tmp8.i14.i ; [#uses=1] + br i1 %exitcond40.i, label %mp_unexp_d2mp.exit29.i, label %bb.i28.i + +mp_unexp_d2mp.exit29.i: ; preds = %bb.i28.i + %tmp46.i = sub i32 0, %tmp22.i ; [#uses=1] + store i32 %tmp46.i, i32* null, align 4 + br i1 false, label %bb.i.i, label %mp_sqrt_init.exit + +bb.i.i: ; preds = %bb.i.i, %mp_unexp_d2mp.exit29.i + br label %bb.i.i + +mp_sqrt_init.exit: ; preds = %mp_unexp_d2mp.exit29.i + tail call fastcc void @mp_mul_csqu( i32 0, double* %tmp1fft ) + tail call fastcc void @rdft( i32 0, i32 -1, double* null, i32* %ip, double* %w ) + tail call fastcc void @mp_mul_d2i( i32 0, i32 %radix, i32 0, double* %tmp1fft, i32* %tmp2 ) + br i1 false, label %cond_false.i, label %cond_true36.i + +cond_true36.i: ; preds = %mp_sqrt_init.exit + ret void + +cond_false.i: ; preds = %mp_sqrt_init.exit + tail call fastcc void @mp_round( i32 0, i32 %radix, i32 0, i32* %out ) + tail call fastcc void @mp_add( i32 0, i32 %radix, i32* %tmp1, i32* %tmp2, i32* %tmp1 ) + tail call fastcc void @mp_sub( i32 0, i32 %radix, i32* %in, i32* %tmp2, i32* %tmp2 ) + tail call fastcc void @mp_round( i32 0, i32 %radix, i32 0, i32* %tmp1 ) + tail call fastcc void @mp_mul_d2i( i32 0, i32 %radix, i32 %tmp7.i3, double* %tmp2fft, i32* %tmp2 ) + ret void +} + +declare fastcc void @mp_add(i32, i32, i32*, i32*, i32*) + +declare fastcc void @mp_sub(i32, i32, i32*, i32*, i32*) + +declare fastcc void @mp_round(i32, i32, i32, i32*) + +declare fastcc void @mp_mul_csqu(i32, double*) + +declare fastcc void @mp_mul_d2i(i32, i32, i32, double*, i32*) From kremenek at apple.com Fri Nov 30 16:39:47 2007 From: kremenek at apple.com (Ted Kremenek) Date: Fri, 30 Nov 2007 22:39:47 -0000 Subject: [llvm-commits] [llvm] r44469 - /llvm/trunk/include/llvm/Bitcode/BitstreamReader.h Message-ID: <200711302239.lAUMdlO0032597@zion.cs.uiuc.edu> Author: kremenek Date: Fri Nov 30 16:39:46 2007 New Revision: 44469 URL: http://llvm.org/viewvc/llvm-project?rev=44469&view=rev Log: Fixed potential bug where CurWord is not zeroed out in JumpToBit. Modified: llvm/trunk/include/llvm/Bitcode/BitstreamReader.h Modified: llvm/trunk/include/llvm/Bitcode/BitstreamReader.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Bitcode/BitstreamReader.h?rev=44469&r1=44468&r2=44469&view=diff ============================================================================== --- llvm/trunk/include/llvm/Bitcode/BitstreamReader.h (original) +++ llvm/trunk/include/llvm/Bitcode/BitstreamReader.h Fri Nov 30 16:39:46 2007 @@ -122,6 +122,7 @@ // Move the cursor to the right word. NextChar = FirstChar+ByteNo; BitsInCurWord = 0; + CurWord = 0; // Skip over any bits that are already consumed. if (WordBitNo) { From kremenek at apple.com Fri Nov 30 16:45:05 2007 From: kremenek at apple.com (Ted Kremenek) Date: Fri, 30 Nov 2007 22:45:05 -0000 Subject: [llvm-commits] [llvm] r44470 - in /llvm/trunk: include/llvm/Bitcode/Deserialize.h lib/Bitcode/Reader/Deserialize.cpp Message-ID: <200711302245.lAUMj5Zh000341@zion.cs.uiuc.edu> Author: kremenek Date: Fri Nov 30 16:45:05 2007 New Revision: 44470 URL: http://llvm.org/viewvc/llvm-project?rev=44470&view=rev Log: Fixed subtle bug in Deserializer::JumpTo when jumping when the block-nesting information matching did not exactly match the underlying stream's scoping information. Modified: llvm/trunk/include/llvm/Bitcode/Deserialize.h llvm/trunk/lib/Bitcode/Reader/Deserialize.cpp Modified: llvm/trunk/include/llvm/Bitcode/Deserialize.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Bitcode/Deserialize.h?rev=44470&r1=44469&r2=44470&view=diff ============================================================================== --- llvm/trunk/include/llvm/Bitcode/Deserialize.h (original) +++ llvm/trunk/include/llvm/Bitcode/Deserialize.h Fri Nov 30 16:45:05 2007 @@ -125,7 +125,7 @@ llvm::SmallVector BlockStack; unsigned AbbrevNo; unsigned RecordCode; - Location StreamStart; + uint64_t StreamStart; //===----------------------------------------------------------===// // Public Interface. @@ -348,7 +348,7 @@ bool FinishedBlock(Location BlockLoc); bool JumpTo(const Location& BlockLoc); - void Rewind() { JumpTo(StreamStart); } + void Rewind(); bool AtEnd(); bool inRecord(); Modified: llvm/trunk/lib/Bitcode/Reader/Deserialize.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/Deserialize.cpp?rev=44470&r1=44469&r2=44470&view=diff ============================================================================== --- llvm/trunk/lib/Bitcode/Reader/Deserialize.cpp (original) +++ llvm/trunk/lib/Bitcode/Reader/Deserialize.cpp Fri Nov 30 16:45:05 2007 @@ -21,9 +21,8 @@ Deserializer::Deserializer(BitstreamReader& stream) : Stream(stream), RecIdx(0), FreeList(NULL), AbbrevNo(0), RecordCode(0) { - - AdvanceStream(); - if (!AtEnd()) StreamStart = BlockStack.back(); + + StreamStart = Stream.GetCurrentBitNo(); } Deserializer::~Deserializer() { @@ -165,12 +164,11 @@ assert (!inRecord()); -// AdvanceStream(); + AdvanceStream(); -// assert (AbbrevNo == bitc::ENTER_SUBBLOCK); assert (!BlockStack.empty() || AtEnd()); - uint64_t LastBPos = StreamStart.BitNo; + uint64_t LastBPos = StreamStart; while (!BlockStack.empty()) { @@ -183,8 +181,11 @@ // destroy any accumulated context within the block scope. We then // jump to the position of the block and enter it. Stream.JumpToBit(LastBPos); + + if (BlockStack.size() == Stream.BlockScope.size()) + Stream.PopBlockScope(); + BlockStack.pop_back(); - Stream.PopBlockScope(); AbbrevNo = 0; AdvanceStream(); @@ -195,14 +196,19 @@ } // This block does not contain the block we are looking for. Pop it. + if (BlockStack.size() == Stream.BlockScope.size()) + Stream.PopBlockScope(); + BlockStack.pop_back(); - Stream.PopBlockScope(); + } // Check if we have popped our way to the outermost scope. If so, // we need to adjust our position. if (BlockStack.empty()) { - Stream.JumpToBit(Loc.BitNo < LastBPos ? StreamStart.BitNo : LastBPos); + assert (Stream.BlockScope.empty()); + + Stream.JumpToBit(Loc.BitNo < LastBPos ? StreamStart : LastBPos); AbbrevNo = 0; AdvanceStream(); } @@ -229,6 +235,18 @@ return true; } +void Deserializer::Rewind() { + while (!Stream.BlockScope.empty()) + Stream.PopBlockScope(); + + while (!BlockStack.empty()) + BlockStack.pop_back(); + + Stream.JumpToBit(StreamStart); + AbbrevNo = 0; +} + + unsigned Deserializer::getCurrentBlockID() { if (!inRecord()) AdvanceStream(); From clattner at apple.com Fri Nov 30 16:59:39 2007 From: clattner at apple.com (Chris Lattner) Date: Fri, 30 Nov 2007 14:59:39 -0800 Subject: [llvm-commits] [llvm] r44467 - in /llvm/trunk: include/llvm/CodeGen/LiveIntervalAnalysis.h lib/CodeGen/LiveIntervalAnalysis.cpp test/CodeGen/X86/2007-11-30-LoadFolding-Bug.ll In-Reply-To: <200711302123.lAULNh1K027270@zion.cs.uiuc.edu> References: <200711302123.lAULNh1K027270@zion.cs.uiuc.edu> Message-ID: On Nov 30, 2007, at 1:23 PM, Evan Cheng wrote: > + // FIXME: It may be possible to fold load when there are > multiple uses. > + // e.g. On x86, TEST32rr r, r -> CMP32rm [mem], 0 > + if (NumUses > 1) > + return false; Maybe it would be better for the target foldMemoryOperand hook to handle this? Is there any hope of autogenerating foldMemoryOperand from the .td files? If so, that would be easy to add. -Chris From isanbard at gmail.com Fri Nov 30 17:13:38 2007 From: isanbard at gmail.com (Bill Wendling) Date: Fri, 30 Nov 2007 23:13:38 -0000 Subject: [llvm-commits] [llvm-gcc-4.0] r44474 - /llvm-gcc-4.0/trunk/driverdriver.c Message-ID: <200711302313.lAUNDdp5001744@zion.cs.uiuc.edu> Author: void Date: Fri Nov 30 17:13:38 2007 New Revision: 44474 URL: http://llvm.org/viewvc/llvm-project?rev=44474&view=rev Log: Change the prefix_len if it's not curr_dir. Modified: llvm-gcc-4.0/trunk/driverdriver.c Modified: llvm-gcc-4.0/trunk/driverdriver.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/driverdriver.c?rev=44474&r1=44473&r2=44474&view=diff ============================================================================== --- llvm-gcc-4.0/trunk/driverdriver.c (original) +++ llvm-gcc-4.0/trunk/driverdriver.c Fri Nov 30 17:13:38 2007 @@ -1204,6 +1204,7 @@ char *override_option_str = NULL; char path_buffer[2*PATH_MAX+1]; int linklen; + int delete_prefix = 0; total_argc = argc; prog_len = 0; @@ -1266,10 +1267,12 @@ size_t bin_dir_len = strlen (llvm_bin_dir); if (curr_dir_len <= bin_dir_len || - strncmp (&curr_dir[curr_dir_len - bin_dir_len], llvm_bin_dir, bin_dir_len) != 0) + strncmp (&curr_dir[curr_dir_len - bin_dir_len], llvm_bin_dir, bin_dir_len) != 0) { driver_exec_prefix = make_relative_prefix (argv[0], curr_dir, "/usr/llvm-gcc-4.0/bin/"); - else + delete_prefix = 1; + prefix_len = strlen (driver_exec_prefix); + } else driver_exec_prefix = curr_dir; } /* LLVM LOCAL end - These drivers live in /.../usr/llvm-gcc-4.0/bin */ @@ -1559,5 +1562,7 @@ final_cleanup (); free (curr_dir); + if (delete_prefix) + free (driver_exec_prefix); return greatest_status; } From isanbard at gmail.com Fri Nov 30 17:13:54 2007 From: isanbard at gmail.com (Bill Wendling) Date: Fri, 30 Nov 2007 23:13:54 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r44475 - /llvm-gcc-4.2/trunk/driverdriver.c Message-ID: <200711302313.lAUNDsch001766@zion.cs.uiuc.edu> Author: void Date: Fri Nov 30 17:13:52 2007 New Revision: 44475 URL: http://llvm.org/viewvc/llvm-project?rev=44475&view=rev Log: Change the prefix_len if it's not curr_dir. Modified: llvm-gcc-4.2/trunk/driverdriver.c Modified: llvm-gcc-4.2/trunk/driverdriver.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/driverdriver.c?rev=44475&r1=44474&r2=44475&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/driverdriver.c (original) +++ llvm-gcc-4.2/trunk/driverdriver.c Fri Nov 30 17:13:52 2007 @@ -1196,6 +1196,7 @@ char *override_option_str = NULL; char path_buffer[2*PATH_MAX+1]; int linklen; + int delete_prefix = 0; total_argc = argc; prog_len = 0; @@ -1258,10 +1259,12 @@ size_t bin_dir_len = strlen (llvm_bin_dir); if (curr_dir_len <= bin_dir_len || - strncmp (&curr_dir[curr_dir_len - bin_dir_len], llvm_bin_dir, bin_dir_len) != 0) + strncmp (&curr_dir[curr_dir_len - bin_dir_len], llvm_bin_dir, bin_dir_len) != 0) { driver_exec_prefix = make_relative_prefix (argv[0], curr_dir, "/usr/llvm-gcc-4.2/bin/"); - else + delete_prefix = 1; + prefix_len = strlen (driver_exec_prefix); + } else driver_exec_prefix = curr_dir; } /* LLVM LOCAL end - These drivers live in /.../usr/llvm-gcc-4.2/bin */ @@ -1550,5 +1553,7 @@ final_cleanup (); free (curr_dir); + if (delete_prefix) + free (driver_exec_prefix); return greatest_status; } From dpatel at apple.com Fri Nov 30 17:27:57 2007 From: dpatel at apple.com (Devang Patel) Date: Fri, 30 Nov 2007 23:27:57 -0000 Subject: [llvm-commits] [llvm] r44476 - /llvm/trunk/utils/buildit/build_llvm Message-ID: <200711302327.lAUNRw46002386@zion.cs.uiuc.edu> Author: dpatel Date: Fri Nov 30 17:27:57 2007 New Revision: 44476 URL: http://llvm.org/viewvc/llvm-project?rev=44476&view=rev Log: Change lib lto install location. Modified: llvm/trunk/utils/buildit/build_llvm Modified: llvm/trunk/utils/buildit/build_llvm URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/buildit/build_llvm?rev=44476&r1=44475&r2=44476&view=diff ============================================================================== --- llvm/trunk/utils/buildit/build_llvm (original) +++ llvm/trunk/utils/buildit/build_llvm Fri Nov 30 17:27:57 2007 @@ -166,6 +166,15 @@ cd $DEST_DIR$DEST_ROOT lipo -extract ppc -extract i386 lib/LLVMlto.0.0.0.so -output lib/LLVMlto.0.0.0.so +# LTO is part of developer tools +LTO_HOME=$DEST_DIR//Developer/usr/lib +if [ "x$DEVELOPER_BIN" != "x" ]; then +LTO_HOME=$DEST_DIR/$DEVELOPER_DIR/usr/lib +fi + +mkdir -p $LTO_HOME +mv lib/LLVMlto* $LTO_HOME/. + ################################################################################ # Create SYM_DIR with information required for debugging. From dpatel at apple.com Fri Nov 30 18:24:52 2007 From: dpatel at apple.com (Devang Patel) Date: Sat, 01 Dec 2007 00:24:52 -0000 Subject: [llvm-commits] [llvm] r44477 - /llvm/trunk/utils/buildit/build_llvm Message-ID: <200712010024.lB10Oqi5004758@zion.cs.uiuc.edu> Author: dpatel Date: Fri Nov 30 18:24:50 2007 New Revision: 44477 URL: http://llvm.org/viewvc/llvm-project?rev=44477&view=rev Log: Change LinkTimeOptimizer.h install location. Modified: llvm/trunk/utils/buildit/build_llvm Modified: llvm/trunk/utils/buildit/build_llvm URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/buildit/build_llvm?rev=44477&r1=44476&r2=44477&view=diff ============================================================================== --- llvm/trunk/utils/buildit/build_llvm (original) +++ llvm/trunk/utils/buildit/build_llvm Fri Nov 30 18:24:50 2007 @@ -167,13 +167,15 @@ lipo -extract ppc -extract i386 lib/LLVMlto.0.0.0.so -output lib/LLVMlto.0.0.0.so # LTO is part of developer tools -LTO_HOME=$DEST_DIR//Developer/usr/lib +LTO_HOME=$DEST_DIR//Developer/usr if [ "x$DEVELOPER_BIN" != "x" ]; then -LTO_HOME=$DEST_DIR/$DEVELOPER_DIR/usr/lib +LTO_HOME=$DEST_DIR/$DEVELOPER_DIR/usr fi -mkdir -p $LTO_HOME -mv lib/LLVMlto* $LTO_HOME/. +mkdir -p $LTO_HOME/lib +mv lib/LLVMlto* $LTO_HOME/lib/. +mkdir -p $LTO_HOME/include/llvm +mv $DEST_DIR/usr/local/include/llvm/LinkTimeOptimizer.h $LTO_HOME/include/llvm/. ################################################################################ # Create SYM_DIR with information required for debugging. From echristo at apple.com Fri Nov 30 18:34:39 2007 From: echristo at apple.com (Eric Christopher) Date: Sat, 01 Dec 2007 00:34:39 -0000 Subject: [llvm-commits] [llvm] r44478 - in /llvm/trunk: autoconf/configure.ac configure include/llvm/Config/config.h.in Message-ID: <200712010034.lB10YeZh005143@zion.cs.uiuc.edu> Author: echristo Date: Fri Nov 30 18:34:39 2007 New Revision: 44478 URL: http://llvm.org/viewvc/llvm-project?rev=44478&view=rev Log: Add target triple to include/llvm/Config/config.h.in. Regenerate all files. Modified: llvm/trunk/autoconf/configure.ac llvm/trunk/configure llvm/trunk/include/llvm/Config/config.h.in Modified: llvm/trunk/autoconf/configure.ac URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=44478&r1=44477&r2=44478&view=diff ============================================================================== --- llvm/trunk/autoconf/configure.ac (original) +++ llvm/trunk/autoconf/configure.ac Fri Nov 30 18:34:39 2007 @@ -3,10 +3,10 @@ dnl dnl This file was developed by the LLVM research group and is distributed under dnl the University of Illinois Open Source License. See LICENSE.TXT for details. -dnl +dnl dnl===-----------------------------------------------------------------------=== dnl This is the LLVM configuration script. It is processed by the autoconf -dnl program to produce a script named configure. This script contains the +dnl program to produce a script named configure. This script contains the dnl configuration checks that LLVM needs in order to support multiple platforms. dnl This file is composed of 10 sections per the recommended organization of dnl autoconf input defined in the autoconf documentation. As this file evolves, @@ -46,8 +46,8 @@ dnl configuring LLVM and not some other package (it validates --srcdir argument) AC_CONFIG_SRCDIR([lib/VMCore/Module.cpp]) -dnl Place all of the extra autoconf files into the config subdirectory. Tell -dnl various tools where the m4 autoconf macros are. +dnl Place all of the extra autoconf files into the config subdirectory. Tell +dnl various tools where the m4 autoconf macros are. AC_CONFIG_AUX_DIR([autoconf]) dnl Quit if the source directory has already been configured. @@ -78,7 +78,7 @@ llvm-poolalloc) AC_CONFIG_SUBDIRS([projects/llvm-poolalloc]) ;; poolalloc) AC_CONFIG_SUBDIRS([projects/poolalloc]) ;; llvm-kernel) AC_CONFIG_SUBDIRS([projects/llvm-kernel]) ;; - *) + *) AC_MSG_WARN([Unknown project (${i}) won't be configured automatically]) ;; esac @@ -92,8 +92,8 @@ dnl===-----------------------------------------------------------------------=== dnl Check the target for which we're compiling and the host that will do the -dnl compilations. This will tell us which LLVM compiler will be used for -dnl compiling SSA into object code. This needs to be done early because +dnl compilations. This will tell us which LLVM compiler will be used for +dnl compiling SSA into object code. This needs to be done early because dnl following tests depend on it. AC_CANONICAL_TARGET @@ -102,75 +102,75 @@ AC_CACHE_CHECK([type of operating system we're going to host on], [llvm_cv_os_type], [case $host in - *-*-aix*) + *-*-aix*) llvm_cv_link_all_option="-Wl,--whole-archive" llvm_cv_no_link_all_option="-Wl,--no-whole-archive" - llvm_cv_os_type="AIX" + llvm_cv_os_type="AIX" llvm_cv_platform_type="Unix" ;; - *-*-irix*) + *-*-irix*) llvm_cv_link_all_option="-Wl,--whole-archive" llvm_cv_no_link_all_option="-Wl,--no-whole-archive" - llvm_cv_os_type="IRIX" + llvm_cv_os_type="IRIX" llvm_cv_platform_type="Unix" ;; - *-*-cygwin*) + *-*-cygwin*) llvm_cv_link_all_option="-Wl,--whole-archive" llvm_cv_no_link_all_option="-Wl,--no-whole-archive" - llvm_cv_os_type="Cygwin" + llvm_cv_os_type="Cygwin" llvm_cv_platform_type="Unix" ;; - *-*-darwin*) + *-*-darwin*) llvm_cv_link_all_option="-Wl,-all_load" llvm_cv_link_all_option="-Wl,-noall_load" llvm_cv_os_type="Darwin" llvm_cv_platform_type="Unix" ;; - *-*-freebsd*) + *-*-freebsd*) llvm_cv_link_all_option="-Wl,--whole-archive" llvm_cv_no_link_all_option="-Wl,--no-whole-archive" - llvm_cv_os_type="FreeBSD" + llvm_cv_os_type="FreeBSD" llvm_cv_platform_type="Unix" ;; - *-*-openbsd*) + *-*-openbsd*) llvm_cv_link_all_option="-Wl,--whole-archive" llvm_cv_no_link_all_option="-Wl,--no-whole-archive" - llvm_cv_os_type="OpenBSD" + llvm_cv_os_type="OpenBSD" llvm_cv_platform_type="Unix" ;; - *-*-netbsd*) + *-*-netbsd*) llvm_cv_link_all_option="-Wl,--whole-archive" llvm_cv_no_link_all_option="-Wl,--no-whole-archive" - llvm_cv_os_type="NetBSD" + llvm_cv_os_type="NetBSD" llvm_cv_platform_type="Unix" ;; - *-*-hpux*) + *-*-hpux*) llvm_cv_link_all_option="-Wl,--whole-archive" llvm_cv_no_link_all_option="-Wl,--no-whole-archive" - llvm_cv_os_type="HP-UX" + llvm_cv_os_type="HP-UX" llvm_cv_platform_type="Unix" ;; - *-*-interix*) + *-*-interix*) llvm_cv_link_all_option="-Wl,--whole-archive" llvm_cv_no_link_all_option="-Wl,--no-whole-archive" llvm_cv_os_type="Interix" llvm_cv_platform_type="Unix" ;; - *-*-linux*) + *-*-linux*) llvm_cv_link_all_option="-Wl,--whole-archive" llvm_cv_no_link_all_option="-Wl,--no-whole-archive" llvm_cv_os_type="Linux" llvm_cv_platform_type="Unix" ;; - *-*-solaris*) + *-*-solaris*) llvm_cv_link_all_option="-Wl,-z,allextract" llvm_cv_no_link_all_option="-Wl,-z,defaultextract" llvm_cv_os_type="SunOS" llvm_cv_platform_type="Unix" ;; - *-*-win32*) + *-*-win32*) llvm_cv_link_all_option="-Wl,--whole-archive" llvm_cv_no_link_all_option="-Wl,--no-whole-archive" llvm_cv_os_type="Win32" llvm_cv_platform_type="Win32" ;; - *-*-mingw*) + *-*-mingw*) llvm_cv_link_all_option="-Wl,--whole-archive" llvm_cv_no_link_all_option="-Wl,--no-whole-archive" - llvm_cv_os_type="MingW" + llvm_cv_os_type="MingW" llvm_cv_platform_type="Win32" ;; - *) - llvm_cv_link_all_option="" + *) + llvm_cv_link_all_option="" llvm_cv_no_link_all_option="" - llvm_cv_os_type="Unknown" + llvm_cv_os_type="Unknown" llvm_cv_platform_type="Unknown" ;; esac]) @@ -191,13 +191,13 @@ dnl This is used by lib/System to determine the basic kind of implementation dnl to use. case $llvm_cv_platform_type in - Unix) - AC_DEFINE([LLVM_ON_UNIX],[1],[Define if this is Unixish platform]) + Unix) + AC_DEFINE([LLVM_ON_UNIX],[1],[Define if this is Unixish platform]) AC_SUBST(LLVM_ON_UNIX,[1]) AC_SUBST(LLVM_ON_WIN32,[0]) ;; - Win32) - AC_DEFINE([LLVM_ON_WIN32],[1],[Define if this is Win32ish platform]) + Win32) + AC_DEFINE([LLVM_ON_WIN32],[1],[Define if this is Win32ish platform]) AC_SUBST(LLVM_ON_UNIX,[0]) AC_SUBST(LLVM_ON_WIN32,[1]) ;; @@ -231,15 +231,15 @@ dnl Check for build platform executable suffix if we're crosscompiling if test "$cross_compiling" = yes; then - AC_SUBST(LLVM_CROSS_COMPILING, [1]) + AC_SUBST(LLVM_CROSS_COMPILING, [1]) AC_BUILD_EXEEXT else AC_SUBST(LLVM_CROSS_COMPILING, [0]) fi -dnl Check to see if there's a "CVS" (or .svn) directory indicating that this +dnl Check to see if there's a "CVS" (or .svn) directory indicating that this dnl build is being done from a checkout. This sets up several defaults for the -dnl command line switches. When we build with a CVS directory, we get a +dnl command line switches. When we build with a CVS directory, we get a dnl debug with assertions turned on. Without, we assume a source release and we dnl get an optimized build without assertions. See --enable-optimized and dnl --enable-assertions below @@ -375,7 +375,7 @@ ARM) TARGETS_TO_BUILD="ARM" ;; Mips) TARGETS_TO_BUILD="Mips" ;; *) AC_MSG_ERROR([Can not set target to build]) ;; - esac + esac ;; *)for a_target in `echo $enableval|sed -e 's/,/ /g' ` ; do case "$a_target" in @@ -389,7 +389,7 @@ mips) TARGETS_TO_BUILD="Mips $TARGETS_TO_BUILD" ;; *) AC_MSG_ERROR([Unrecognized target $a_target]) ;; esac - done + done ;; esac TARGETS_TO_BUILD="CBackend MSIL $TARGETS_TO_BUILD" @@ -446,7 +446,7 @@ ocaml) BINDINGS_TO_BUILD="ocaml $BINDINGS_TO_BUILD" ;; *) AC_MSG_ERROR([Unrecognized binding $a_binding]) ;; esac - done + done ;; esac @@ -553,8 +553,8 @@ dnl Checks for documentation and testing tools that we can do without. If these dnl are not found then they are set to "true" which always succeeds but does -dnl nothing. This just lets the build output show that we could have done -dnl something if the tool was available. +dnl nothing. This just lets the build output show that we could have done +dnl something if the tool was available. AC_PATH_PROG(BZIP2,[bzip2],[echo "Skipped: bzip2 not found"]) AC_PATH_PROG(DOXYGEN,[doxygen],[echo "Skipped: doxygen not found"]) AC_PATH_PROG(GROFF,[groff],[echo "Skipped: groff not found"]) @@ -594,7 +594,7 @@ AC_SUBST(LLVMGCC,$LLVMGCC) AC_SUBST(LLVMGXX,$LLVMGXX) fi - + AC_MSG_CHECKING([tool compatibility]) dnl Ensure that compilation tools are GCC or a GNU compatible compiler such as @@ -605,7 +605,7 @@ ICC=no IXX=no case $CC in - icc*|icpc*) + icc*|icpc*) ICC=yes IXX=yes ;; @@ -627,7 +627,7 @@ dnl Verify that GCC is version 3.0 or higher if test "$GCC" = "yes" then - gccmajor=`$CC --version | head -n 1 | sed 's/[[^0-9]]*\([[0-9.]]\).*/\1/'` + gccmajor=`$CC --version | head -n 1 | sed 's/[[^0-9]]*\([[0-9.]]\).*/\1/'` if test "$gccmajor" -lt "3" then AC_MSG_ERROR([gcc 3.x required, but you have a lower version]) @@ -660,7 +660,7 @@ dnl lt_dlopen may be required for plugin support. AC_SEARCH_LIBS(lt_dlopen,ltdl,AC_DEFINE([HAVE_LT_DLOPEN],[1], [Define if lt_dlopen() is available on this platform]), - AC_MSG_WARN([lt_dlopen() not found - plugin support might + AC_MSG_WARN([lt_dlopen() not found - plugin support might not be available])) dnl dlopen() is required for plugin support. @@ -773,11 +773,11 @@ AC_FUNC_ISNAN AC_FUNC_ISINF -dnl Check for mmap support.We also need to know if /dev/zero is required to -dnl be opened for allocating RWX memory. +dnl Check for mmap support.We also need to know if /dev/zero is required to +dnl be opened for allocating RWX memory. dnl Make sure we aren't attempting to configure for an unknown system if test "$llvm_cv_platform_type" = "Unix" ; then - AC_FUNC_MMAP + AC_FUNC_MMAP AC_FUNC_MMAP_FILE AC_NEED_DEV_ZERO_FOR_MMAP @@ -813,7 +813,7 @@ rm conftest.c fi]) -dnl Since we have a sane llvm-gcc, identify it and its sub-tools +dnl Since we have a sane llvm-gcc, identify it and its sub-tools if test "$llvm_cv_llvmgcc_sanity" = "yes" ; then AC_MSG_CHECKING([llvm-gcc component support]) llvmcc1path=`"$LLVMGCC" --print-prog-name=cc1` @@ -833,12 +833,12 @@ AC_MSG_RESULT([ok]) fi -dnl Propagate the shared library extension that the libltdl checks did to +dnl Propagate the shared library extension that the libltdl checks did to dnl the Makefiles so we can use it there too AC_SUBST(SHLIBEXT,$libltdl_cv_shlibext) # Translate the various configuration directories and other basic -# information into substitutions that will end up in Makefile.config.in +# information into substitutions that will end up in Makefile.config.in # that these configured values can be used by the makefiles if test "${prefix}" = "NONE" ; then prefix="/usr/local" @@ -866,26 +866,28 @@ # Place the various directores into the config.h file as #defines so that we # can know about the installation paths within LLVM. -AC_DEFINE_UNQUOTED(LLVM_PREFIX,"$LLVM_PREFIX", +AC_DEFINE_UNQUOTED(LLVM_PREFIX,"$LLVM_PREFIX", [Installation prefix directory]) -AC_DEFINE_UNQUOTED(LLVM_BINDIR, "$LLVM_BINDIR", +AC_DEFINE_UNQUOTED(LLVM_BINDIR, "$LLVM_BINDIR", [Installation directory for binary executables]) -AC_DEFINE_UNQUOTED(LLVM_LIBDIR, "$LLVM_LIBDIR", +AC_DEFINE_UNQUOTED(LLVM_LIBDIR, "$LLVM_LIBDIR", [Installation directory for libraries]) -AC_DEFINE_UNQUOTED(LLVM_DATADIR, "$LLVM_DATADIR", +AC_DEFINE_UNQUOTED(LLVM_DATADIR, "$LLVM_DATADIR", [Installation directory for data files]) -AC_DEFINE_UNQUOTED(LLVM_DOCSDIR, "$LLVM_DOCSDIR", +AC_DEFINE_UNQUOTED(LLVM_DOCSDIR, "$LLVM_DOCSDIR", [Installation directory for documentation]) -AC_DEFINE_UNQUOTED(LLVM_ETCDIR, "$LLVM_ETCDIR", +AC_DEFINE_UNQUOTED(LLVM_ETCDIR, "$LLVM_ETCDIR", [Installation directory for config files]) -AC_DEFINE_UNQUOTED(LLVM_INCLUDEDIR, "$LLVM_INCLUDEDIR", +AC_DEFINE_UNQUOTED(LLVM_INCLUDEDIR, "$LLVM_INCLUDEDIR", [Installation directory for include files]) -AC_DEFINE_UNQUOTED(LLVM_INFODIR, "$LLVM_INFODIR", +AC_DEFINE_UNQUOTED(LLVM_INFODIR, "$LLVM_INFODIR", [Installation directory for .info files]) -AC_DEFINE_UNQUOTED(LLVM_MANDIR, "$LLVM_MANDIR", +AC_DEFINE_UNQUOTED(LLVM_MANDIR, "$LLVM_MANDIR", [Installation directory for man pages]) -AC_DEFINE_UNQUOTED(LLVM_CONFIGTIME, "$LLVM_CONFIGTIME", +AC_DEFINE_UNQUOTED(LLVM_CONFIGTIME, "$LLVM_CONFIGTIME", [Time at which LLVM was configured]) +AC_DEFINE_UNQUOTED(LLVM_HOSTTRIPLE, "$host", + [Host triple we were built on]) # Determine which bindings to build. if test "$BINDINGS_TO_BUILD" = auto ; then @@ -915,7 +917,7 @@ fi if test "x$OCAMLOPT" = x ; then AC_MSG_WARN([--enable-bindings=ocaml specified, but ocamlopt not found. Try configure OCAMLOPT=/path/to/ocamlopt]) - dnl ocamlopt is optional! + dnl ocamlopt is optional! fi if test "x$with_ocaml_libdir" != xauto ; then AC_SUBST(OCAML_LIBDIR,$with_ocaml_libdir) @@ -984,4 +986,3 @@ dnl Finally, crank out the output AC_OUTPUT - Modified: llvm/trunk/configure URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/configure?rev=44478&r1=44477&r2=44478&view=diff ============================================================================== --- llvm/trunk/configure (original) +++ llvm/trunk/configure Fri Nov 30 18:34:39 2007 @@ -34161,6 +34161,11 @@ _ACEOF +cat >>confdefs.h <<_ACEOF +#define LLVM_HOSTTRIPLE "$host" +_ACEOF + + # Determine which bindings to build. if test "$BINDINGS_TO_BUILD" = auto ; then BINDINGS_TO_BUILD="" @@ -35781,4 +35786,3 @@ done fi - Modified: llvm/trunk/include/llvm/Config/config.h.in URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Config/config.h.in?rev=44478&r1=44477&r2=44478&view=diff ============================================================================== --- llvm/trunk/include/llvm/Config/config.h.in (original) +++ llvm/trunk/include/llvm/Config/config.h.in Fri Nov 30 18:34:39 2007 @@ -458,6 +458,9 @@ /* Installation directory for config files */ #undef LLVM_ETCDIR +/* Host triple we were built on */ +#undef LLVM_HOSTTRIPLE + /* Installation directory for include files */ #undef LLVM_INCLUDEDIR From evan.cheng at apple.com Fri Nov 30 19:43:03 2007 From: evan.cheng at apple.com (Evan Cheng) Date: Fri, 30 Nov 2007 17:43:03 -0800 Subject: [llvm-commits] [llvm] r44467 - in /llvm/trunk: include/llvm/CodeGen/LiveIntervalAnalysis.h lib/CodeGen/LiveIntervalAnalysis.cpp test/CodeGen/X86/2007-11-30-LoadFolding-Bug.ll In-Reply-To: References: <200711302123.lAULNh1K027270@zion.cs.uiuc.edu> Message-ID: On Nov 30, 2007, at 2:59 PM, Chris Lattner wrote: > > On Nov 30, 2007, at 1:23 PM, Evan Cheng wrote: > >> + // FIXME: It may be possible to fold load when there are >> multiple uses. >> + // e.g. On x86, TEST32rr r, r -> CMP32rm [mem], 0 >> + if (NumUses > 1) >> + return false; > > Maybe it would be better for the target foldMemoryOperand hook to > handle this? Yeah, I have added that. Not yet checked in. > > Is there any hope of autogenerating foldMemoryOperand from the .td > files? If so, that would be easy to add. IMO, that's tricky enough to not be worthwhile. Evan > > -Chris > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From evan.cheng at apple.com Fri Nov 30 20:07:53 2007 From: evan.cheng at apple.com (Evan Cheng) Date: Sat, 01 Dec 2007 02:07:53 -0000 Subject: [llvm-commits] [llvm] r44479 - in /llvm/trunk: include/llvm/CodeGen/ include/llvm/Target/ lib/CodeGen/ lib/Target/ARM/ lib/Target/Alpha/ lib/Target/Mips/ lib/Target/PowerPC/ lib/Target/Sparc/ lib/Target/X86/ test/CodeGen/X86/ Message-ID: <200712010207.lB127sjf008375@zion.cs.uiuc.edu> Author: evancheng Date: Fri Nov 30 20:07:52 2007 New Revision: 44479 URL: http://llvm.org/viewvc/llvm-project?rev=44479&view=rev Log: Allow some reloads to be folded in multi-use cases. Specifically testl r, r -> cmpl [mem], 0. Added: llvm/trunk/test/CodeGen/X86/2007-11-30-TestLoadFolding.ll Modified: llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h llvm/trunk/include/llvm/Target/MRegisterInfo.h llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp llvm/trunk/lib/Target/ARM/ARMRegisterInfo.h llvm/trunk/lib/Target/Alpha/AlphaRegisterInfo.h llvm/trunk/lib/Target/Mips/MipsRegisterInfo.cpp llvm/trunk/lib/Target/Mips/MipsRegisterInfo.h llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.h llvm/trunk/lib/Target/Sparc/SparcRegisterInfo.h llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp llvm/trunk/lib/Target/X86/X86RegisterInfo.h llvm/trunk/test/CodeGen/X86/2007-08-13-SpillerReuse.ll Modified: llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h?rev=44479&r1=44478&r2=44479&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h (original) +++ llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h Fri Nov 30 20:07:52 2007 @@ -275,7 +275,8 @@ /// returns true. bool tryFoldMemoryOperand(MachineInstr* &MI, VirtRegMap &vrm, MachineInstr *DefMI, unsigned InstrIdx, - unsigned OpIdx, unsigned NumUses, + unsigned OpIdx, + SmallVector &UseOps, bool isSS, int Slot, unsigned Reg); /// anyKillInMBBAfterIdx - Returns true if there is a kill of the specified Modified: llvm/trunk/include/llvm/Target/MRegisterInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/MRegisterInfo.h?rev=44479&r1=44478&r2=44479&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/MRegisterInfo.h (original) +++ llvm/trunk/include/llvm/Target/MRegisterInfo.h Fri Nov 30 20:07:52 2007 @@ -543,6 +543,14 @@ return 0; } + /// foldMemoryOperand - Same as previous except it tries to fold instruction + /// with multiple uses of the same register. + virtual MachineInstr* foldMemoryOperand(MachineInstr* MI, + SmallVectorImpl &UseOps, + int FrameIndex) const { + return 0; + } + /// foldMemoryOperand - Same as the previous version except it allows folding /// of any load and store from / to any address, not just from a specific /// stack slot. @@ -552,6 +560,14 @@ return 0; } + /// foldMemoryOperand - Same as previous except it tries to fold instruction + /// with multiple uses of the same register. + virtual MachineInstr* foldMemoryOperand(MachineInstr* MI, + SmallVectorImpl &UseOps, + MachineInstr* LoadMI) const { + return 0; + } + /// getOpcodeAfterMemoryFold - Returns the opcode of the would be new /// instruction after load / store is folded into an instruction of the /// specified opcode. It returns zero if the specified unfolding is not Modified: llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp?rev=44479&r1=44478&r2=44479&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp (original) +++ llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Fri Nov 30 20:07:52 2007 @@ -644,20 +644,27 @@ bool LiveIntervals::tryFoldMemoryOperand(MachineInstr* &MI, VirtRegMap &vrm, MachineInstr *DefMI, unsigned InstrIdx, unsigned OpIdx, - unsigned NumUses, + SmallVector &UseOps, bool isSS, int Slot, unsigned Reg) { // FIXME: fold subreg use if (MI->getOperand(OpIdx).getSubReg()) return false; - // FIXME: It may be possible to fold load when there are multiple uses. - // e.g. On x86, TEST32rr r, r -> CMP32rm [mem], 0 - if (NumUses > 1) - return false; + MachineInstr *fmi = NULL; + + if (UseOps.size() < 2) + fmi = isSS ? mri_->foldMemoryOperand(MI, OpIdx, Slot) + : mri_->foldMemoryOperand(MI, OpIdx, DefMI); + else { + if (OpIdx != UseOps[0]) + // Must be two-address instruction + one more use. Not going to fold. + return false; + // It may be possible to fold load when there are multiple uses. + // e.g. On x86, TEST32rr r, r -> CMP32rm [mem], 0 + fmi = isSS ? mri_->foldMemoryOperand(MI, UseOps, Slot) + : mri_->foldMemoryOperand(MI, UseOps, DefMI); + } - MachineInstr *fmi = isSS - ? mri_->foldMemoryOperand(MI, OpIdx, Slot) - : mri_->foldMemoryOperand(MI, OpIdx, DefMI); if (fmi) { // Attempt to fold the memory reference into the instruction. If // we can do this, we don't need to insert spill code. @@ -768,7 +775,9 @@ HasUse = mop.isUse(); HasDef = mop.isDef(); - unsigned NumUses = HasUse; + SmallVector UseOps; + if (HasUse) + UseOps.push_back(i); std::vector UpdateOps; for (unsigned j = i+1, e = MI->getNumOperands(); j != e; ++j) { if (!MI->getOperand(j).isRegister()) @@ -779,7 +788,7 @@ if (RegJ == RegI) { UpdateOps.push_back(j); if (MI->getOperand(j).isUse()) - ++NumUses; + UseOps.push_back(j); HasUse |= MI->getOperand(j).isUse(); HasDef |= MI->getOperand(j).isDef(); } @@ -787,7 +796,7 @@ if (TryFold && tryFoldMemoryOperand(MI, vrm, ReMatDefMI, index, i, - NumUses, FoldSS, FoldSlot, Reg)) { + UseOps, FoldSS, FoldSlot, Reg)) { // Folding the load/store can completely change the instruction in // unpredictable ways, rescan it from the beginning. HasUse = false; @@ -1207,6 +1216,7 @@ if (!TrySplit) return NewLIs; + SmallVector UseOps; if (NeedStackSlot) { int Id = SpillMBBs.find_first(); while (Id != -1) { @@ -1217,7 +1227,7 @@ bool isReMat = vrm.isReMaterialized(VReg); MachineInstr *MI = getInstructionFromIndex(index); int OpIdx = -1; - unsigned NumUses = 0; + UseOps.clear(); if (spills[i].canFold) { for (unsigned j = 0, ee = MI->getNumOperands(); j != ee; ++j) { MachineOperand &MO = MI->getOperand(j); @@ -1230,20 +1240,20 @@ // Can't fold if it's two-address code and the use isn't the // first and only use. if (isReMat || - (NumUses == 0 && !alsoFoldARestore(Id, index, VReg, RestoreMBBs, - RestoreIdxes))) { + (UseOps.empty() && !alsoFoldARestore(Id, index, VReg, + RestoreMBBs, RestoreIdxes))) { OpIdx = -1; break; } - ++NumUses; + UseOps.push_back(j); } } // Fold the store into the def if possible. bool Folded = false; if (OpIdx != -1) { - if (tryFoldMemoryOperand(MI, vrm, NULL, index, OpIdx, NumUses, + if (tryFoldMemoryOperand(MI, vrm, NULL, index, OpIdx, UseOps, true, Slot, VReg)) { - if (NumUses) + if (!UseOps.empty()) // Folded a two-address instruction, do not issue a load. eraseRestoreInfo(Id, index, VReg, RestoreMBBs, RestoreIdxes); Folded = true; @@ -1267,8 +1277,8 @@ continue; unsigned VReg = restores[i].vreg; MachineInstr *MI = getInstructionFromIndex(index); - unsigned NumUses = 0; int OpIdx = -1; + UseOps.clear(); if (restores[i].canFold) { for (unsigned j = 0, ee = MI->getNumOperands(); j != ee; ++j) { MachineOperand &MO = MI->getOperand(j); @@ -1280,10 +1290,10 @@ OpIdx = -1; break; } - if (NumUses == 0) + if (UseOps.empty()) // Use the first use index. OpIdx = (int)j; - ++NumUses; + UseOps.push_back(j); } } @@ -1298,9 +1308,9 @@ if (isLoadSS || (ReMatDefMI->getInstrDescriptor()->Flags & M_LOAD_FLAG)) Folded = tryFoldMemoryOperand(MI, vrm, ReMatDefMI, index, OpIdx, - NumUses, isLoadSS, LdSlot, VReg); + UseOps, isLoadSS, LdSlot, VReg); } else - Folded = tryFoldMemoryOperand(MI, vrm, NULL, index, OpIdx, NumUses, + Folded = tryFoldMemoryOperand(MI, vrm, NULL, index, OpIdx, UseOps, true, Slot, VReg); } // If folding is not possible / failed, then tell the spiller to issue a Modified: llvm/trunk/lib/Target/ARM/ARMRegisterInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMRegisterInfo.h?rev=44479&r1=44478&r2=44479&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/ARMRegisterInfo.h (original) +++ llvm/trunk/lib/Target/ARM/ARMRegisterInfo.h Fri Nov 30 20:07:52 2007 @@ -77,11 +77,23 @@ MachineInstr* foldMemoryOperand(MachineInstr* MI, unsigned OpNum, int FrameIndex) const; + MachineInstr* foldMemoryOperand(MachineInstr* MI, + SmallVectorImpl &UseOps, + int FrameIndex) const { + return 0; + } + MachineInstr* foldMemoryOperand(MachineInstr* MI, unsigned OpNum, MachineInstr* LoadMI) const { return 0; } + MachineInstr* foldMemoryOperand(MachineInstr* MI, + SmallVectorImpl &UseOps, + MachineInstr* LoadMI) const { + return 0; + } + const unsigned *getCalleeSavedRegs(const MachineFunction *MF = 0) const; const TargetRegisterClass* const* Modified: llvm/trunk/lib/Target/Alpha/AlphaRegisterInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Alpha/AlphaRegisterInfo.h?rev=44479&r1=44478&r2=44479&view=diff ============================================================================== --- llvm/trunk/lib/Target/Alpha/AlphaRegisterInfo.h (original) +++ llvm/trunk/lib/Target/Alpha/AlphaRegisterInfo.h Fri Nov 30 20:07:52 2007 @@ -51,11 +51,23 @@ MachineInstr* foldMemoryOperand(MachineInstr *MI, unsigned OpNum, int FrameIndex) const; + MachineInstr* foldMemoryOperand(MachineInstr* MI, + SmallVectorImpl &UseOps, + int FrameIndex) const { + return 0; + } + MachineInstr* foldMemoryOperand(MachineInstr* MI, unsigned OpNum, MachineInstr* LoadMI) const { return 0; } + MachineInstr* foldMemoryOperand(MachineInstr* MI, + SmallVectorImpl &UseOps, + MachineInstr* LoadMI) const { + return 0; + } + void copyRegToReg(MachineBasicBlock &MBB, MachineBasicBlock::iterator MBBI, unsigned DestReg, unsigned SrcReg, const TargetRegisterClass *DestRC, Modified: llvm/trunk/lib/Target/Mips/MipsRegisterInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsRegisterInfo.cpp?rev=44479&r1=44478&r2=44479&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsRegisterInfo.cpp (original) +++ llvm/trunk/lib/Target/Mips/MipsRegisterInfo.cpp Fri Nov 30 20:07:52 2007 @@ -203,12 +203,6 @@ return NewMI; } -MachineInstr *MipsRegisterInfo:: -foldMemoryOperand(MachineInstr* MI, unsigned OpNum, - MachineInstr* LoadMI) const { - return NULL; -} - //===----------------------------------------------------------------------===// // // Callee Saved Registers methods Modified: llvm/trunk/lib/Target/Mips/MipsRegisterInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsRegisterInfo.h?rev=44479&r1=44478&r2=44479&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsRegisterInfo.h (original) +++ llvm/trunk/lib/Target/Mips/MipsRegisterInfo.h Fri Nov 30 20:07:52 2007 @@ -58,8 +58,22 @@ MachineInstr* foldMemoryOperand(MachineInstr* MI, unsigned OpNum, int FrameIndex) const; + MachineInstr* foldMemoryOperand(MachineInstr* MI, + SmallVectorImpl &UseOps, + int FrameIndex) const { + return 0; + } + MachineInstr* foldMemoryOperand(MachineInstr* MI, unsigned OpNum, - MachineInstr* LoadMI) const; + MachineInstr* LoadMI) const { + return 0; + } + + MachineInstr* foldMemoryOperand(MachineInstr* MI, + SmallVectorImpl &UseOps, + MachineInstr* LoadMI) const { + return 0; + } void copyRegToReg(MachineBasicBlock &MBB, MachineBasicBlock::iterator MBBI, unsigned DestReg, unsigned SrcReg, Modified: llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.h?rev=44479&r1=44478&r2=44479&view=diff ============================================================================== --- llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.h (original) +++ llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.h Fri Nov 30 20:07:52 2007 @@ -68,11 +68,23 @@ virtual MachineInstr* foldMemoryOperand(MachineInstr* MI, unsigned OpNum, int FrameIndex) const; + virtual MachineInstr* foldMemoryOperand(MachineInstr* MI, + SmallVectorImpl &UseOps, + int FrameIndex) const { + return 0; + } + virtual MachineInstr* foldMemoryOperand(MachineInstr* MI, unsigned OpNum, MachineInstr* LoadMI) const { return 0; } + virtual MachineInstr* foldMemoryOperand(MachineInstr* MI, + SmallVectorImpl &UseOps, + MachineInstr* LoadMI) const { + return 0; + } + const unsigned *getCalleeSavedRegs(const MachineFunction* MF = 0) const; const TargetRegisterClass* const* Modified: llvm/trunk/lib/Target/Sparc/SparcRegisterInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/SparcRegisterInfo.h?rev=44479&r1=44478&r2=44479&view=diff ============================================================================== --- llvm/trunk/lib/Target/Sparc/SparcRegisterInfo.h (original) +++ llvm/trunk/lib/Target/Sparc/SparcRegisterInfo.h Fri Nov 30 20:07:52 2007 @@ -63,11 +63,23 @@ int FrameIndex) const; virtual MachineInstr* foldMemoryOperand(MachineInstr* MI, + SmallVectorImpl &UseOps, + int FrameIndex) const { + return 0; + } + + virtual MachineInstr* foldMemoryOperand(MachineInstr* MI, unsigned OpNum, MachineInstr* LoadMI) const { return 0; } + virtual MachineInstr* foldMemoryOperand(MachineInstr* MI, + SmallVectorImpl &UseOps, + MachineInstr* LoadMI) const { + return 0; + } + const unsigned *getCalleeSavedRegs(const MachineFunction *MF = 0) const; const TargetRegisterClass* const* getCalleeSavedRegClasses( Modified: llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp?rev=44479&r1=44478&r2=44479&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp (original) +++ llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp Fri Nov 30 20:07:52 2007 @@ -1149,6 +1149,31 @@ return foldMemoryOperand(MI, OpNum, MOs); } +MachineInstr* X86RegisterInfo::foldMemoryOperand(MachineInstr *MI, + SmallVectorImpl &UseOps, + int FrameIndex) const { + // Check switch flag + if (NoFusing) return NULL; + + if (UseOps.size() == 1) + return foldMemoryOperand(MI, UseOps[0], FrameIndex); + else if (UseOps.size() != 2 || UseOps[0] != 0 && UseOps[1] != 1) + return NULL; + + unsigned NewOpc = 0; + switch (MI->getOpcode()) { + default: return NULL; + case X86::TEST8rr: NewOpc = X86::CMP8ri; break; + case X86::TEST16rr: NewOpc = X86::CMP16ri; break; + case X86::TEST32rr: NewOpc = X86::CMP32ri; break; + case X86::TEST64rr: NewOpc = X86::CMP64ri32; break; + } + // Change to CMPXXri r, 0 first. + MI->setInstrDescriptor(TII.get(NewOpc)); + MI->getOperand(1).ChangeToImmediate(0); + return foldMemoryOperand(MI, 0, FrameIndex); +} + MachineInstr* X86RegisterInfo::foldMemoryOperand(MachineInstr *MI, unsigned OpNum, MachineInstr *LoadMI) const { // Check switch flag @@ -1160,6 +1185,31 @@ return foldMemoryOperand(MI, OpNum, MOs); } +MachineInstr* X86RegisterInfo::foldMemoryOperand(MachineInstr *MI, + SmallVectorImpl &UseOps, + MachineInstr *LoadMI) const { + // Check switch flag + if (NoFusing) return NULL; + + if (UseOps.size() == 1) + return foldMemoryOperand(MI, UseOps[0], LoadMI); + else if (UseOps.size() != 2 || UseOps[0] != 0 && UseOps[1] != 1) + return NULL; + unsigned NewOpc = 0; + switch (MI->getOpcode()) { + default: return NULL; + case X86::TEST8rr: NewOpc = X86::CMP8ri; break; + case X86::TEST16rr: NewOpc = X86::CMP16ri; break; + case X86::TEST32rr: NewOpc = X86::CMP32ri; break; + case X86::TEST64rr: NewOpc = X86::CMP64ri32; break; + } + // Change to CMPXXri r, 0 first. + MI->setInstrDescriptor(TII.get(NewOpc)); + MI->getOperand(1).ChangeToImmediate(0); + return foldMemoryOperand(MI, 0, LoadMI); +} + + unsigned X86RegisterInfo::getOpcodeAfterMemoryFold(unsigned Opc, unsigned OpNum) const { // Check switch flag @@ -1270,7 +1320,30 @@ MachineOperand &MO = ImpOps[i]; MIB.addReg(MO.getReg(), MO.isDef(), true, MO.isKill(), MO.isDead()); } - NewMIs.push_back(MIB); + // Change CMP32ri r, 0 back to TEST32rr r, r, etc. + unsigned NewOpc = 0; + switch (DataMI->getOpcode()) { + default: break; + case X86::CMP64ri32: + case X86::CMP32ri: + case X86::CMP16ri: + case X86::CMP8ri: { + MachineOperand &MO0 = DataMI->getOperand(0); + MachineOperand &MO1 = DataMI->getOperand(1); + if (MO1.getImm() == 0) { + switch (DataMI->getOpcode()) { + default: break; + case X86::CMP64ri32: NewOpc = X86::TEST64rr; break; + case X86::CMP32ri: NewOpc = X86::TEST32rr; break; + case X86::CMP16ri: NewOpc = X86::TEST16rr; break; + case X86::CMP8ri: NewOpc = X86::TEST8rr; break; + } + DataMI->setInstrDescriptor(TII.get(NewOpc)); + MO1.ChangeToRegister(MO0.getReg(), false); + } + } + } + NewMIs.push_back(DataMI); // Emit the store instruction. if (UnfoldStore) { Modified: llvm/trunk/lib/Target/X86/X86RegisterInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86RegisterInfo.h?rev=44479&r1=44478&r2=44479&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86RegisterInfo.h (original) +++ llvm/trunk/lib/Target/X86/X86RegisterInfo.h Fri Nov 30 20:07:52 2007 @@ -141,6 +141,12 @@ unsigned OpNum, int FrameIndex) const; + /// foldMemoryOperand - Same as previous except it tries to fold instruction + /// with multiple uses of the same register. + MachineInstr* foldMemoryOperand(MachineInstr* MI, + SmallVectorImpl &UseOps, + int FrameIndex) const; + /// foldMemoryOperand - Same as the previous version except it allows folding /// of any load and store from / to any address, not just from a specific /// stack slot. @@ -148,6 +154,13 @@ unsigned OpNum, MachineInstr* LoadMI) const; + /// foldMemoryOperand - Same as the previous version except it allows folding + /// of any load and store from / to any address, not just from a specific + /// stack slot. + MachineInstr* foldMemoryOperand(MachineInstr* MI, + SmallVectorImpl &UseOps, + MachineInstr* LoadMI) const; + /// getOpcodeAfterMemoryFold - Returns the opcode of the would be new /// instruction after load / store is folded into an instruction of the /// specified opcode. It returns zero if the specified unfolding is not Modified: llvm/trunk/test/CodeGen/X86/2007-08-13-SpillerReuse.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2007-08-13-SpillerReuse.ll?rev=44479&r1=44478&r2=44479&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/X86/2007-08-13-SpillerReuse.ll (original) +++ llvm/trunk/test/CodeGen/X86/2007-08-13-SpillerReuse.ll Fri Nov 30 20:07:52 2007 @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -mtriple=i686-apple-darwin | grep "48(%esp)" | count 5 +; RUN: llvm-as < %s | llc -mtriple=i686-apple-darwin | grep "48(%esp)" | count 6 %struct..0anon = type { i32 } %struct.rtvec_def = type { i32, [1 x %struct..0anon] } Added: llvm/trunk/test/CodeGen/X86/2007-11-30-TestLoadFolding.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2007-11-30-TestLoadFolding.ll?rev=44479&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/2007-11-30-TestLoadFolding.ll (added) +++ llvm/trunk/test/CodeGen/X86/2007-11-30-TestLoadFolding.ll Fri Nov 30 20:07:52 2007 @@ -0,0 +1,58 @@ +; RUN: llvm-as < %s | llc -march=x86 -stats |& \ +; RUN: grep {2 .*folded into instructions} +; RUN: llvm-as < %s | llc -march=x86 | grep cmp | count 3 + + %struct.quad_struct = type { i32, i32, %struct.quad_struct*, %struct.quad_struct*, %struct.quad_struct*, %struct.quad_struct*, %struct.quad_struct* } + +define fastcc i32 @perimeter(%struct.quad_struct* %tree, i32 %size) { +entry: + %tree.idx7.val = load %struct.quad_struct** null ; <%struct.quad_struct*> [#uses=1] + %tmp8.i51 = icmp eq %struct.quad_struct* %tree.idx7.val, null ; [#uses=2] + br i1 %tmp8.i51, label %cond_next, label %cond_next.i52 + +cond_next.i52: ; preds = %entry + ret i32 0 + +cond_next: ; preds = %entry + %tmp59 = load i32* null, align 4 ; [#uses=1] + %tmp70 = icmp eq i32 %tmp59, 2 ; [#uses=1] + br i1 %tmp70, label %cond_true.i35, label %bb80 + +cond_true.i35: ; preds = %cond_next + %tmp14.i.i37 = load %struct.quad_struct** null, align 4 ; <%struct.quad_struct*> [#uses=1] + %tmp3.i160 = load i32* null, align 4 ; [#uses=1] + %tmp4.i161 = icmp eq i32 %tmp3.i160, 2 ; [#uses=1] + br i1 %tmp4.i161, label %cond_true.i163, label %cond_false.i178 + +cond_true.i163: ; preds = %cond_true.i35 + %tmp7.i162 = sdiv i32 %size, 4 ; [#uses=2] + %tmp13.i168 = tail call fastcc i32 @sum_adjacent( %struct.quad_struct* null, i32 3, i32 2, i32 %tmp7.i162 ) ; [#uses=1] + %tmp18.i11.i170 = getelementptr %struct.quad_struct* %tmp14.i.i37, i32 0, i32 4 ; <%struct.quad_struct**> [#uses=1] + %tmp19.i12.i171 = load %struct.quad_struct** %tmp18.i11.i170, align 4 ; <%struct.quad_struct*> [#uses=1] + %tmp21.i173 = tail call fastcc i32 @sum_adjacent( %struct.quad_struct* %tmp19.i12.i171, i32 3, i32 2, i32 %tmp7.i162 ) ; [#uses=1] + %tmp22.i174 = add i32 %tmp21.i173, %tmp13.i168 ; [#uses=1] + br i1 false, label %cond_true.i141, label %cond_false.i156 + +cond_false.i178: ; preds = %cond_true.i35 + ret i32 0 + +cond_true.i141: ; preds = %cond_true.i163 + %tmp7.i140 = sdiv i32 %size, 4 ; [#uses=1] + %tmp21.i151 = tail call fastcc i32 @sum_adjacent( %struct.quad_struct* null, i32 3, i32 2, i32 %tmp7.i140 ) ; [#uses=0] + ret i32 0 + +cond_false.i156: ; preds = %cond_true.i163 + %tmp22.i44 = add i32 0, %tmp22.i174 ; [#uses=0] + br i1 %tmp8.i51, label %bb22.i, label %cond_next.i + +bb80: ; preds = %cond_next + ret i32 0 + +cond_next.i: ; preds = %cond_false.i156 + ret i32 0 + +bb22.i: ; preds = %cond_false.i156 + ret i32 0 +} + +declare fastcc i32 @sum_adjacent(%struct.quad_struct*, i32, i32, i32) From resistor at mac.com Fri Nov 30 21:01:40 2007 From: resistor at mac.com (Owen Anderson) Date: Sat, 01 Dec 2007 03:01:40 -0000 Subject: [llvm-commits] [llvm] r44480 - in /llvm/trunk/include/llvm: Analysis/LoopInfo.h CodeGen/MachineLoopInfo.h Message-ID: <200712010301.lB131eMI010175@zion.cs.uiuc.edu> Author: resistor Date: Fri Nov 30 21:01:39 2007 New Revision: 44480 URL: http://llvm.org/viewvc/llvm-project?rev=44480&view=rev Log: Fixes for MachineLoopInfo, mostly from Evan. With these, it should be almost useable! Modified: llvm/trunk/include/llvm/Analysis/LoopInfo.h llvm/trunk/include/llvm/CodeGen/MachineLoopInfo.h Modified: llvm/trunk/include/llvm/Analysis/LoopInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/LoopInfo.h?rev=44480&r1=44479&r2=44480&view=diff ============================================================================== --- llvm/trunk/include/llvm/Analysis/LoopInfo.h (original) +++ llvm/trunk/include/llvm/Analysis/LoopInfo.h Fri Nov 30 21:01:39 2007 @@ -141,7 +141,7 @@ /// isLoopInvariant - Return true if the specified value is loop invariant /// - bool isLoopInvariant(Value *V) const { + inline bool isLoopInvariant(Value *V) const { if (Instruction *I = dyn_cast(V)) return !contains(I->getParent()); return true; // All non-instructions are loop invariant @@ -327,7 +327,7 @@ /// by one each time through the loop. If so, return the phi node that /// corresponds to it. /// - PHINode *getCanonicalInductionVariable() const { + inline PHINode *getCanonicalInductionVariable() const { BlockT *H = getHeader(); BlockT *Incoming = 0, *Backedge = 0; @@ -365,7 +365,7 @@ /// the canonical induction variable value for the "next" iteration of the /// loop. This always succeeds if getCanonicalInductionVariable succeeds. /// - Instruction *getCanonicalInductionVariableIncrement() const { + inline Instruction *getCanonicalInductionVariableIncrement() const { if (PHINode *PN = getCanonicalInductionVariable()) { bool P1InLoop = contains(PN->getIncomingBlock(1)); return cast(PN->getIncomingValue(P1InLoop)); @@ -378,7 +378,7 @@ /// of the loop executes N-1 times. If the trip-count cannot be determined, /// this returns null. /// - Value *getTripCount() const { + inline Value *getTripCount() const { // Canonical loops will end with a 'cmp ne I, V', where I is the incremented // canonical induction variable and V is the trip count of the loop. Instruction *Inc = getCanonicalInductionVariableIncrement(); @@ -405,7 +405,7 @@ } /// isLCSSAForm - Return true if the Loop is in LCSSA form - bool isLCSSAForm() const { + inline bool isLCSSAForm() const { // Sort the blocks vector so that we can use binary search to do quick // lookups. SmallPtrSet LoopBBs(block_begin(), block_end()); Modified: llvm/trunk/include/llvm/CodeGen/MachineLoopInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineLoopInfo.h?rev=44480&r1=44479&r2=44480&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/MachineLoopInfo.h (original) +++ llvm/trunk/include/llvm/CodeGen/MachineLoopInfo.h Fri Nov 30 21:01:39 2007 @@ -39,14 +39,13 @@ namespace llvm { // Provide overrides for Loop methods that don't make sense for machine loops. -template<> +template<> inline PHINode *LoopBase::getCanonicalInductionVariable() const { assert(0 && "getCanonicalInductionVariable not supported for machine loops!"); return 0; } -template<> -Instruction* +template<> inline Instruction* LoopBase::getCanonicalInductionVariableIncrement() const { assert(0 && "getCanonicalInductionVariableIncrement not supported for machine loops!"); @@ -54,19 +53,19 @@ } template<> -bool LoopBase::isLoopInvariant(Value *V) const { +inline bool LoopBase::isLoopInvariant(Value *V) const { assert(0 && "isLoopInvariant not supported for machine loops!"); return false; } template<> -Value *LoopBase::getTripCount() const { +inline Value *LoopBase::getTripCount() const { assert(0 && "getTripCount not supported for machine loops!"); return 0; } template<> -bool LoopBase::isLCSSAForm() const { +inline bool LoopBase::isLCSSAForm() const { assert(0 && "isLCSSAForm not supported for machine loops"); return false; } @@ -129,10 +128,6 @@ virtual void releaseMemory() { LI->releaseMemory(); } - virtual void print(std::ostream &O, const Module* M = 0) const { - if (O) LI->print(O, M); - } - virtual void getAnalysisUsage(AnalysisUsage &AU) const; /// removeLoop - This removes the specified top-level loop from this loop info From evan.cheng at apple.com Fri Nov 30 21:43:59 2007 From: evan.cheng at apple.com (Evan Cheng) Date: Sat, 01 Dec 2007 03:43:59 -0000 Subject: [llvm-commits] [test-suite] r44481 - /test-suite/trunk/Makefile.programs Message-ID: <200712010343.lB13hxbW011782@zion.cs.uiuc.edu> Author: evancheng Date: Fri Nov 30 21:43:58 2007 New Revision: 44481 URL: http://llvm.org/viewvc/llvm-project?rev=44481&view=rev Log: Start testing live interval splitting on ARM and PPC. Modified: test-suite/trunk/Makefile.programs Modified: test-suite/trunk/Makefile.programs URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.programs?rev=44481&r1=44480&r2=44481&view=diff ============================================================================== --- test-suite/trunk/Makefile.programs (original) +++ test-suite/trunk/Makefile.programs Fri Nov 30 21:43:58 2007 @@ -209,8 +209,9 @@ endif#DISABLE_DIFFS ifeq ($(ARCH),PowerPC) -LLCBETAOPTION := --enable-tail-merge -# --enable-ppc-preinc +LLCBETAOPTION := -split-intervals-at-bb +#--enable-tail-merge +#--enable-ppc-preinc #-regalloc=local -fast endif ifeq ($(ARCH),Alpha) @@ -233,7 +234,8 @@ LLCBETAOPTION := -enable-sparc-v9-insts endif ifeq ($(ARCH),ARM) -LLCBETAOPTION := -disable-rematerialization +LLCBETAOPTION := -split-intervals-at-bb +#-disable-rematerialization #-enable-arm-if-conversion #-march=thumb endif From kremenek at apple.com Fri Nov 30 22:17:07 2007 From: kremenek at apple.com (Ted Kremenek) Date: Fri, 30 Nov 2007 20:17:07 -0800 Subject: [llvm-commits] [llvm] r44478 - in /llvm/trunk: autoconf/configure.ac configure include/llvm/Config/config.h.in In-Reply-To: <200712010034.lB10YeZh005143@zion.cs.uiuc.edu> References: <200712010034.lB10YeZh005143@zion.cs.uiuc.edu> Message-ID: <8B591098-EF22-4435-8DE2-64739D245EB7@apple.com> Fantastic! Merci! On Nov 30, 2007, at 4:34 PM, Eric Christopher wrote: > Author: echristo > Date: Fri Nov 30 18:34:39 2007 > New Revision: 44478 > > URL: http://llvm.org/viewvc/llvm-project?rev=44478&view=rev > Log: > Add target triple to include/llvm/Config/config.h.in. Regenerate all > files. > > Modified: > llvm/trunk/autoconf/configure.ac > llvm/trunk/configure > llvm/trunk/include/llvm/Config/config.h.in > > Modified: llvm/trunk/autoconf/configure.ac > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=44478&r1=44477&r2=44478&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/autoconf/configure.ac (original) > +++ llvm/trunk/autoconf/configure.ac Fri Nov 30 18:34:39 2007 > @@ -3,10 +3,10 @@ > dnl > dnl This file was developed by the LLVM research group and is > distributed under > dnl the University of Illinois Open Source License. See LICENSE.TXT > for details. > -dnl > +dnl > dnl > = > = > = > -----------------------------------------------------------------------= > == > dnl This is the LLVM configuration script. It is processed by the > autoconf > -dnl program to produce a script named configure. This script > contains the > +dnl program to produce a script named configure. This script > contains the > dnl configuration checks that LLVM needs in order to support > multiple platforms. > dnl This file is composed of 10 sections per the recommended > organization of > dnl autoconf input defined in the autoconf documentation. As this > file evolves, > @@ -46,8 +46,8 @@ > dnl configuring LLVM and not some other package (it validates -- > srcdir argument) > AC_CONFIG_SRCDIR([lib/VMCore/Module.cpp]) > > -dnl Place all of the extra autoconf files into the config > subdirectory. Tell > -dnl various tools where the m4 autoconf macros are. > +dnl Place all of the extra autoconf files into the config > subdirectory. Tell > +dnl various tools where the m4 autoconf macros are. > AC_CONFIG_AUX_DIR([autoconf]) > > dnl Quit if the source directory has already been configured. > @@ -78,7 +78,7 @@ > llvm-poolalloc) AC_CONFIG_SUBDIRS([projects/llvm-poolalloc]) ;; > poolalloc) AC_CONFIG_SUBDIRS([projects/poolalloc]) ;; > llvm-kernel) AC_CONFIG_SUBDIRS([projects/llvm-kernel]) ;; > - *) > + *) > AC_MSG_WARN([Unknown project (${i}) won't be configured > automatically]) > ;; > esac > @@ -92,8 +92,8 @@ > dnl > = > = > = > -----------------------------------------------------------------------= > == > > dnl Check the target for which we're compiling and the host that > will do the > -dnl compilations. This will tell us which LLVM compiler will be > used for > -dnl compiling SSA into object code. This needs to be done early > because > +dnl compilations. This will tell us which LLVM compiler will be > used for > +dnl compiling SSA into object code. This needs to be done early > because > dnl following tests depend on it. > AC_CANONICAL_TARGET > > @@ -102,75 +102,75 @@ > AC_CACHE_CHECK([type of operating system we're going to host on], > [llvm_cv_os_type], > [case $host in > - *-*-aix*) > + *-*-aix*) > llvm_cv_link_all_option="-Wl,--whole-archive" > llvm_cv_no_link_all_option="-Wl,--no-whole-archive" > - llvm_cv_os_type="AIX" > + llvm_cv_os_type="AIX" > llvm_cv_platform_type="Unix" ;; > - *-*-irix*) > + *-*-irix*) > llvm_cv_link_all_option="-Wl,--whole-archive" > llvm_cv_no_link_all_option="-Wl,--no-whole-archive" > - llvm_cv_os_type="IRIX" > + llvm_cv_os_type="IRIX" > llvm_cv_platform_type="Unix" ;; > - *-*-cygwin*) > + *-*-cygwin*) > llvm_cv_link_all_option="-Wl,--whole-archive" > llvm_cv_no_link_all_option="-Wl,--no-whole-archive" > - llvm_cv_os_type="Cygwin" > + llvm_cv_os_type="Cygwin" > llvm_cv_platform_type="Unix" ;; > - *-*-darwin*) > + *-*-darwin*) > llvm_cv_link_all_option="-Wl,-all_load" > llvm_cv_link_all_option="-Wl,-noall_load" > llvm_cv_os_type="Darwin" > llvm_cv_platform_type="Unix" ;; > - *-*-freebsd*) > + *-*-freebsd*) > llvm_cv_link_all_option="-Wl,--whole-archive" > llvm_cv_no_link_all_option="-Wl,--no-whole-archive" > - llvm_cv_os_type="FreeBSD" > + llvm_cv_os_type="FreeBSD" > llvm_cv_platform_type="Unix" ;; > - *-*-openbsd*) > + *-*-openbsd*) > llvm_cv_link_all_option="-Wl,--whole-archive" > llvm_cv_no_link_all_option="-Wl,--no-whole-archive" > - llvm_cv_os_type="OpenBSD" > + llvm_cv_os_type="OpenBSD" > llvm_cv_platform_type="Unix" ;; > - *-*-netbsd*) > + *-*-netbsd*) > llvm_cv_link_all_option="-Wl,--whole-archive" > llvm_cv_no_link_all_option="-Wl,--no-whole-archive" > - llvm_cv_os_type="NetBSD" > + llvm_cv_os_type="NetBSD" > llvm_cv_platform_type="Unix" ;; > - *-*-hpux*) > + *-*-hpux*) > llvm_cv_link_all_option="-Wl,--whole-archive" > llvm_cv_no_link_all_option="-Wl,--no-whole-archive" > - llvm_cv_os_type="HP-UX" > + llvm_cv_os_type="HP-UX" > llvm_cv_platform_type="Unix" ;; > - *-*-interix*) > + *-*-interix*) > llvm_cv_link_all_option="-Wl,--whole-archive" > llvm_cv_no_link_all_option="-Wl,--no-whole-archive" > llvm_cv_os_type="Interix" > llvm_cv_platform_type="Unix" ;; > - *-*-linux*) > + *-*-linux*) > llvm_cv_link_all_option="-Wl,--whole-archive" > llvm_cv_no_link_all_option="-Wl,--no-whole-archive" > llvm_cv_os_type="Linux" > llvm_cv_platform_type="Unix" ;; > - *-*-solaris*) > + *-*-solaris*) > llvm_cv_link_all_option="-Wl,-z,allextract" > llvm_cv_no_link_all_option="-Wl,-z,defaultextract" > llvm_cv_os_type="SunOS" > llvm_cv_platform_type="Unix" ;; > - *-*-win32*) > + *-*-win32*) > llvm_cv_link_all_option="-Wl,--whole-archive" > llvm_cv_no_link_all_option="-Wl,--no-whole-archive" > llvm_cv_os_type="Win32" > llvm_cv_platform_type="Win32" ;; > - *-*-mingw*) > + *-*-mingw*) > llvm_cv_link_all_option="-Wl,--whole-archive" > llvm_cv_no_link_all_option="-Wl,--no-whole-archive" > - llvm_cv_os_type="MingW" > + llvm_cv_os_type="MingW" > llvm_cv_platform_type="Win32" ;; > - *) > - llvm_cv_link_all_option="" > + *) > + llvm_cv_link_all_option="" > llvm_cv_no_link_all_option="" > - llvm_cv_os_type="Unknown" > + llvm_cv_os_type="Unknown" > llvm_cv_platform_type="Unknown" ;; > esac]) > > @@ -191,13 +191,13 @@ > dnl This is used by lib/System to determine the basic kind of > implementation > dnl to use. > case $llvm_cv_platform_type in > - Unix) > - AC_DEFINE([LLVM_ON_UNIX],[1],[Define if this is Unixish > platform]) > + Unix) > + AC_DEFINE([LLVM_ON_UNIX],[1],[Define if this is Unixish > platform]) > AC_SUBST(LLVM_ON_UNIX,[1]) > AC_SUBST(LLVM_ON_WIN32,[0]) > ;; > - Win32) > - AC_DEFINE([LLVM_ON_WIN32],[1],[Define if this is Win32ish > platform]) > + Win32) > + AC_DEFINE([LLVM_ON_WIN32],[1],[Define if this is Win32ish > platform]) > AC_SUBST(LLVM_ON_UNIX,[0]) > AC_SUBST(LLVM_ON_WIN32,[1]) > ;; > @@ -231,15 +231,15 @@ > > dnl Check for build platform executable suffix if we're crosscompiling > if test "$cross_compiling" = yes; then > - AC_SUBST(LLVM_CROSS_COMPILING, [1]) > + AC_SUBST(LLVM_CROSS_COMPILING, [1]) > AC_BUILD_EXEEXT > else > AC_SUBST(LLVM_CROSS_COMPILING, [0]) > fi > > -dnl Check to see if there's a "CVS" (or .svn) directory indicating > that this > +dnl Check to see if there's a "CVS" (or .svn) directory indicating > that this > dnl build is being done from a checkout. This sets up several > defaults for the > -dnl command line switches. When we build with a CVS directory, we > get a > +dnl command line switches. When we build with a CVS directory, we > get a > dnl debug with assertions turned on. Without, we assume a source > release and we > dnl get an optimized build without assertions. See --enable- > optimized and > dnl --enable-assertions below > @@ -375,7 +375,7 @@ > ARM) TARGETS_TO_BUILD="ARM" ;; > Mips) TARGETS_TO_BUILD="Mips" ;; > *) AC_MSG_ERROR([Can not set target to build]) ;; > - esac > + esac > ;; > *)for a_target in `echo $enableval|sed -e 's/,/ /g' ` ; do > case "$a_target" in > @@ -389,7 +389,7 @@ > mips) TARGETS_TO_BUILD="Mips $TARGETS_TO_BUILD" ;; > *) AC_MSG_ERROR([Unrecognized target $a_target]) ;; > esac > - done > + done > ;; > esac > TARGETS_TO_BUILD="CBackend MSIL $TARGETS_TO_BUILD" > @@ -446,7 +446,7 @@ > ocaml) BINDINGS_TO_BUILD="ocaml $BINDINGS_TO_BUILD" ;; > *) AC_MSG_ERROR([Unrecognized binding $a_binding]) ;; > esac > - done > + done > ;; > esac > > @@ -553,8 +553,8 @@ > > dnl Checks for documentation and testing tools that we can do > without. If these > dnl are not found then they are set to "true" which always succeeds > but does > -dnl nothing. This just lets the build output show that we could > have done > -dnl something if the tool was available. > +dnl nothing. This just lets the build output show that we could > have done > +dnl something if the tool was available. > AC_PATH_PROG(BZIP2,[bzip2],[echo "Skipped: bzip2 not found"]) > AC_PATH_PROG(DOXYGEN,[doxygen],[echo "Skipped: doxygen not found"]) > AC_PATH_PROG(GROFF,[groff],[echo "Skipped: groff not found"]) > @@ -594,7 +594,7 @@ > AC_SUBST(LLVMGCC,$LLVMGCC) > AC_SUBST(LLVMGXX,$LLVMGXX) > fi > - > + > AC_MSG_CHECKING([tool compatibility]) > > dnl Ensure that compilation tools are GCC or a GNU compatible > compiler such as > @@ -605,7 +605,7 @@ > ICC=no > IXX=no > case $CC in > - icc*|icpc*) > + icc*|icpc*) > ICC=yes > IXX=yes > ;; > @@ -627,7 +627,7 @@ > dnl Verify that GCC is version 3.0 or higher > if test "$GCC" = "yes" > then > - gccmajor=`$CC --version | head -n 1 | sed 's/[[^0-9]]*\([[0-9.]] > \).*/\1/'` > + gccmajor=`$CC --version | head -n 1 | sed 's/[[^0-9]]*\([[0-9.]] > \).*/\1/'` > if test "$gccmajor" -lt "3" > then > AC_MSG_ERROR([gcc 3.x required, but you have a lower version]) > @@ -660,7 +660,7 @@ > dnl lt_dlopen may be required for plugin support. > AC_SEARCH_LIBS(lt_dlopen,ltdl,AC_DEFINE([HAVE_LT_DLOPEN],[1], > [Define if lt_dlopen() is available on this platform]), > - AC_MSG_WARN([lt_dlopen() not found - plugin support > might > + AC_MSG_WARN([lt_dlopen() not found - plugin support > might > not be available])) > > dnl dlopen() is required for plugin support. > @@ -773,11 +773,11 @@ > AC_FUNC_ISNAN > AC_FUNC_ISINF > > -dnl Check for mmap support.We also need to know if /dev/zero is > required to > -dnl be opened for allocating RWX memory. > +dnl Check for mmap support.We also need to know if /dev/zero is > required to > +dnl be opened for allocating RWX memory. > dnl Make sure we aren't attempting to configure for an unknown system > if test "$llvm_cv_platform_type" = "Unix" ; then > - AC_FUNC_MMAP > + AC_FUNC_MMAP > AC_FUNC_MMAP_FILE > AC_NEED_DEV_ZERO_FOR_MMAP > > @@ -813,7 +813,7 @@ > rm conftest.c > fi]) > > -dnl Since we have a sane llvm-gcc, identify it and its sub-tools > +dnl Since we have a sane llvm-gcc, identify it and its sub-tools > if test "$llvm_cv_llvmgcc_sanity" = "yes" ; then > AC_MSG_CHECKING([llvm-gcc component support]) > llvmcc1path=`"$LLVMGCC" --print-prog-name=cc1` > @@ -833,12 +833,12 @@ > AC_MSG_RESULT([ok]) > fi > > -dnl Propagate the shared library extension that the libltdl checks > did to > +dnl Propagate the shared library extension that the libltdl checks > did to > dnl the Makefiles so we can use it there too > AC_SUBST(SHLIBEXT,$libltdl_cv_shlibext) > > # Translate the various configuration directories and other basic > -# information into substitutions that will end up in > Makefile.config.in > +# information into substitutions that will end up in > Makefile.config.in > # that these configured values can be used by the makefiles > if test "${prefix}" = "NONE" ; then > prefix="/usr/local" > @@ -866,26 +866,28 @@ > > # Place the various directores into the config.h file as #defines so > that we > # can know about the installation paths within LLVM. > -AC_DEFINE_UNQUOTED(LLVM_PREFIX,"$LLVM_PREFIX", > +AC_DEFINE_UNQUOTED(LLVM_PREFIX,"$LLVM_PREFIX", > [Installation prefix directory]) > -AC_DEFINE_UNQUOTED(LLVM_BINDIR, "$LLVM_BINDIR", > +AC_DEFINE_UNQUOTED(LLVM_BINDIR, "$LLVM_BINDIR", > [Installation directory for binary executables]) > -AC_DEFINE_UNQUOTED(LLVM_LIBDIR, "$LLVM_LIBDIR", > +AC_DEFINE_UNQUOTED(LLVM_LIBDIR, "$LLVM_LIBDIR", > [Installation directory for libraries]) > -AC_DEFINE_UNQUOTED(LLVM_DATADIR, "$LLVM_DATADIR", > +AC_DEFINE_UNQUOTED(LLVM_DATADIR, "$LLVM_DATADIR", > [Installation directory for data files]) > -AC_DEFINE_UNQUOTED(LLVM_DOCSDIR, "$LLVM_DOCSDIR", > +AC_DEFINE_UNQUOTED(LLVM_DOCSDIR, "$LLVM_DOCSDIR", > [Installation directory for documentation]) > -AC_DEFINE_UNQUOTED(LLVM_ETCDIR, "$LLVM_ETCDIR", > +AC_DEFINE_UNQUOTED(LLVM_ETCDIR, "$LLVM_ETCDIR", > [Installation directory for config files]) > -AC_DEFINE_UNQUOTED(LLVM_INCLUDEDIR, "$LLVM_INCLUDEDIR", > +AC_DEFINE_UNQUOTED(LLVM_INCLUDEDIR, "$LLVM_INCLUDEDIR", > [Installation directory for include files]) > -AC_DEFINE_UNQUOTED(LLVM_INFODIR, "$LLVM_INFODIR", > +AC_DEFINE_UNQUOTED(LLVM_INFODIR, "$LLVM_INFODIR", > [Installation directory for .info files]) > -AC_DEFINE_UNQUOTED(LLVM_MANDIR, "$LLVM_MANDIR", > +AC_DEFINE_UNQUOTED(LLVM_MANDIR, "$LLVM_MANDIR", > [Installation directory for man pages]) > -AC_DEFINE_UNQUOTED(LLVM_CONFIGTIME, "$LLVM_CONFIGTIME", > +AC_DEFINE_UNQUOTED(LLVM_CONFIGTIME, "$LLVM_CONFIGTIME", > [Time at which LLVM was configured]) > +AC_DEFINE_UNQUOTED(LLVM_HOSTTRIPLE, "$host", > + [Host triple we were built on]) > > # Determine which bindings to build. > if test "$BINDINGS_TO_BUILD" = auto ; then > @@ -915,7 +917,7 @@ > fi > if test "x$OCAMLOPT" = x ; then > AC_MSG_WARN([--enable-bindings=ocaml specified, but ocamlopt > not found. Try configure OCAMLOPT=/path/to/ocamlopt]) > - dnl ocamlopt is optional! > + dnl ocamlopt is optional! > fi > if test "x$with_ocaml_libdir" != xauto ; then > AC_SUBST(OCAML_LIBDIR,$with_ocaml_libdir) > @@ -984,4 +986,3 @@ > > dnl Finally, crank out the output > AC_OUTPUT > - > > Modified: llvm/trunk/configure > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/configure?rev=44478&r1=44477&r2=44478&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/configure (original) > +++ llvm/trunk/configure Fri Nov 30 18:34:39 2007 > @@ -34161,6 +34161,11 @@ > _ACEOF > > > +cat >>confdefs.h <<_ACEOF > +#define LLVM_HOSTTRIPLE "$host" > +_ACEOF > + > + > # Determine which bindings to build. > if test "$BINDINGS_TO_BUILD" = auto ; then > BINDINGS_TO_BUILD="" > @@ -35781,4 +35786,3 @@ > done > fi > > - > > Modified: llvm/trunk/include/llvm/Config/config.h.in > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Config/config.h.in?rev=44478&r1=44477&r2=44478&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/include/llvm/Config/config.h.in (original) > +++ llvm/trunk/include/llvm/Config/config.h.in Fri Nov 30 18:34:39 > 2007 > @@ -458,6 +458,9 @@ > /* Installation directory for config files */ > #undef LLVM_ETCDIR > > +/* Host triple we were built on */ > +#undef LLVM_HOSTTRIPLE > + > /* Installation directory for include files */ > #undef LLVM_INCLUDEDIR > > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From evan.cheng at apple.com Fri Nov 30 22:42:39 2007 From: evan.cheng at apple.com (Evan Cheng) Date: Sat, 01 Dec 2007 04:42:39 -0000 Subject: [llvm-commits] [llvm] r44482 - /llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Message-ID: <200712010442.lB14gdjT014037@zion.cs.uiuc.edu> Author: evancheng Date: Fri Nov 30 22:42:39 2007 New Revision: 44482 URL: http://llvm.org/viewvc/llvm-project?rev=44482&view=rev Log: Fix a bug where splitting cause some unnecessary spilling. Modified: llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Modified: llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp?rev=44482&r1=44481&r2=44482&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp (original) +++ llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Fri Nov 30 22:42:39 2007 @@ -995,9 +995,9 @@ if (VNI) HasKill = anyKillInMBBAfterIdx(li, VNI, MBB, getDefIndex(index)); } + std::map >::iterator SII = + SpillIdxes.find(MBBId); if (!HasKill) { - std::map >::iterator SII = - SpillIdxes.find(MBBId); if (SII == SpillIdxes.end()) { std::vector S; S.push_back(SRInfo(index, NewVReg, true)); @@ -1013,6 +1013,16 @@ Info.canFold = !HasUse; } SpillMBBs.set(MBBId); + } else if (SII != SpillIdxes.end() && + SII->second.back().vreg == NewVReg && + (int)index > SII->second.back().index) { + // There is an earlier def that's not killed (must be two-address). + // The spill is no longer needed. + SII->second.pop_back(); + if (SII->second.empty()) { + SpillIdxes.erase(MBBId); + SpillMBBs.reset(MBBId); + } } } } From baldrick at free.fr Sat Dec 1 01:51:46 2007 From: baldrick at free.fr (Duncan Sands) Date: Sat, 01 Dec 2007 07:51:46 -0000 Subject: [llvm-commits] [llvm] r44487 - in /llvm/trunk: include/llvm/Analysis/AliasAnalysis.h lib/Analysis/AliasAnalysis.cpp lib/Analysis/AliasAnalysisCounter.cpp lib/Analysis/AliasSetTracker.cpp lib/Analysis/BasicAliasAnalysis.cpp lib/Analysis/IPA/GlobalsModRef.cpp lib/Analysis/LoadValueNumbering.cpp lib/Analysis/MemoryDependenceAnalysis.cpp lib/Transforms/Scalar/ADCE.cpp lib/Transforms/Scalar/DeadStoreElimination.cpp lib/Transforms/Scalar/GVN.cpp lib/Transforms/Scalar/LICM.cpp Message-ID: <200712010751.lB17plt0025886@zion.cs.uiuc.edu> Author: baldrick Date: Sat Dec 1 01:51:45 2007 New Revision: 44487 URL: http://llvm.org/viewvc/llvm-project?rev=44487&view=rev Log: Integrate the readonly/readnone logic more deeply into alias analysis. This meant updating the API which now has versions of the getModRefBehavior, doesNotAccessMemory and onlyReadsMemory methods which take a callsite parameter. These should be used unless the callsite is not known, since in general they can do a better job than the versions that take a function. Also, users should no longer call the version of getModRefBehavior that takes both a function and a callsite. To reduce the chance of misuse it is now protected. Modified: llvm/trunk/include/llvm/Analysis/AliasAnalysis.h llvm/trunk/lib/Analysis/AliasAnalysis.cpp llvm/trunk/lib/Analysis/AliasAnalysisCounter.cpp llvm/trunk/lib/Analysis/AliasSetTracker.cpp llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp llvm/trunk/lib/Analysis/IPA/GlobalsModRef.cpp llvm/trunk/lib/Analysis/LoadValueNumbering.cpp llvm/trunk/lib/Analysis/MemoryDependenceAnalysis.cpp llvm/trunk/lib/Transforms/Scalar/ADCE.cpp llvm/trunk/lib/Transforms/Scalar/DeadStoreElimination.cpp llvm/trunk/lib/Transforms/Scalar/GVN.cpp llvm/trunk/lib/Transforms/Scalar/LICM.cpp Modified: llvm/trunk/include/llvm/Analysis/AliasAnalysis.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/AliasAnalysis.h?rev=44487&r1=44486&r2=44487&view=diff ============================================================================== --- llvm/trunk/include/llvm/Analysis/AliasAnalysis.h (original) +++ llvm/trunk/include/llvm/Analysis/AliasAnalysis.h Sat Dec 1 01:51:45 2007 @@ -186,40 +186,57 @@ }; }; - /// getModRefBehavior - Return the behavior of the specified function if - /// called from the specified call site. The call site may be null in which - /// case the most generic behavior of this function should be returned. - virtual ModRefBehavior getModRefBehavior(Function *F, CallSite CS, - std::vector *Info = 0); - - /// doesNotAccessMemory - If the specified function is known to never read or - /// write memory, return true. If the function only reads from known-constant - /// memory, it is also legal to return true. Functions that unwind the stack - /// are not legal for this predicate. - /// - /// Many optimizations (such as CSE and LICM) can be performed on calls to it, - /// without worrying about aliasing properties, and many functions have this - /// property (e.g. 'sin' and 'cos'). + /// getModRefBehavior - Return the behavior when calling the given call site. + ModRefBehavior getModRefBehavior(CallSite CS, + std::vector *Info = 0); + + /// getModRefBehavior - Return the behavior when calling the given function. + /// For use when the call site is not known. + ModRefBehavior getModRefBehavior(Function *F, + std::vector *Info = 0); + + /// doesNotAccessMemory - If the specified call is known to never read or + /// write memory, return true. If the call only reads from known-constant + /// memory, it is also legal to return true. Calls that unwind the stack + /// are legal for this predicate. + /// + /// Many optimizations (such as CSE and LICM) can be performed on such calls + /// without worrying about aliasing properties, and many calls have this + /// property (e.g. calls to 'sin' and 'cos'). /// /// This property corresponds to the GCC 'const' attribute. /// + bool doesNotAccessMemory(CallSite CS) { + return getModRefBehavior(CS) == DoesNotAccessMemory; + } + + /// doesNotAccessMemory - If the specified function is known to never read or + /// write memory, return true. For use when the call site is not known. + /// bool doesNotAccessMemory(Function *F) { - return getModRefBehavior(F, CallSite()) == DoesNotAccessMemory; + return getModRefBehavior(F) == DoesNotAccessMemory; } - /// onlyReadsMemory - If the specified function is known to only read from - /// non-volatile memory (or not access memory at all), return true. Functions - /// that unwind the stack are not legal for this predicate. + /// onlyReadsMemory - If the specified call is known to only read from + /// non-volatile memory (or not access memory at all), return true. Calls + /// that unwind the stack are legal for this predicate. /// /// This property allows many common optimizations to be performed in the /// absence of interfering store instructions, such as CSE of strlen calls. /// /// This property corresponds to the GCC 'pure' attribute. /// + bool onlyReadsMemory(CallSite CS) { + ModRefBehavior MRB = getModRefBehavior(CS); + return MRB == DoesNotAccessMemory || MRB == OnlyReadsMemory; + } + + /// onlyReadsMemory - If the specified function is known to only read from + /// non-volatile memory (or not access memory at all), return true. For use + /// when the call site is not known. + /// bool onlyReadsMemory(Function *F) { - /// FIXME: If the analysis returns more precise info, we can reduce it to - /// this. - ModRefBehavior MRB = getModRefBehavior(F, CallSite()); + ModRefBehavior MRB = getModRefBehavior(F); return MRB == DoesNotAccessMemory || MRB == OnlyReadsMemory; } @@ -250,6 +267,14 @@ /// virtual bool hasNoModRefInfoForCalls() const; +protected: + /// getModRefBehavior - Return the behavior of the specified function if + /// called from the specified call site. The call site may be null in which + /// case the most generic behavior of this function should be returned. + virtual ModRefBehavior getModRefBehavior(Function *F, CallSite CS, + std::vector *Info = 0); + +public: /// Convenience functions... ModRefResult getModRefInfo(LoadInst *L, Value *P, unsigned Size); ModRefResult getModRefInfo(StoreInst *S, Value *P, unsigned Size); Modified: llvm/trunk/lib/Analysis/AliasAnalysis.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/AliasAnalysis.cpp?rev=44487&r1=44486&r2=44487&view=diff ============================================================================== --- llvm/trunk/lib/Analysis/AliasAnalysis.cpp (original) +++ llvm/trunk/lib/Analysis/AliasAnalysis.cpp Sat Dec 1 01:51:45 2007 @@ -27,6 +27,7 @@ #include "llvm/Analysis/AliasAnalysis.h" #include "llvm/Pass.h" #include "llvm/BasicBlock.h" +#include "llvm/Function.h" #include "llvm/Instructions.h" #include "llvm/Type.h" #include "llvm/Target/TargetData.h" @@ -112,16 +113,40 @@ return pointsToConstantMemory(P) ? NoModRef : Mod; } +AliasAnalysis::ModRefBehavior +AliasAnalysis::getModRefBehavior(CallSite CS, + std::vector *Info) { + if (CS.paramHasAttr(0, ParamAttr::ReadNone)) + // Can't do better than this. + return DoesNotAccessMemory; + ModRefBehavior MRB = UnknownModRefBehavior; + if (Function *F = CS.getCalledFunction()) + MRB = getModRefBehavior(F, CS, Info); + if (MRB != DoesNotAccessMemory && CS.paramHasAttr(0, ParamAttr::ReadOnly)) + return OnlyReadsMemory; + return MRB; +} + +AliasAnalysis::ModRefBehavior +AliasAnalysis::getModRefBehavior(Function *F, + std::vector *Info) { + if (F->paramHasAttr(0, ParamAttr::ReadNone)) + // Can't do better than this. + return DoesNotAccessMemory; + ModRefBehavior MRB = getModRefBehavior(F, CallSite(), Info); + if (MRB != DoesNotAccessMemory && F->paramHasAttr(0, ParamAttr::ReadOnly)) + return OnlyReadsMemory; + return MRB; +} + AliasAnalysis::ModRefResult AliasAnalysis::getModRefInfo(CallSite CS, Value *P, unsigned Size) { ModRefResult Mask = ModRef; - if (Function *F = CS.getCalledFunction()) { - ModRefBehavior MRB = getModRefBehavior(F, CallSite()); - if (MRB == OnlyReadsMemory) - Mask = Ref; - else if (MRB == DoesNotAccessMemory) - return NoModRef; - } + ModRefBehavior MRB = getModRefBehavior(CS); + if (MRB == OnlyReadsMemory) + Mask = Ref; + else if (MRB == DoesNotAccessMemory) + return NoModRef; if (!AA) return Mask; Modified: llvm/trunk/lib/Analysis/AliasAnalysisCounter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/AliasAnalysisCounter.cpp?rev=44487&r1=44486&r2=44487&view=diff ============================================================================== --- llvm/trunk/lib/Analysis/AliasAnalysisCounter.cpp (original) +++ llvm/trunk/lib/Analysis/AliasAnalysisCounter.cpp Sat Dec 1 01:51:45 2007 @@ -89,9 +89,15 @@ bool pointsToConstantMemory(const Value *P) { return getAnalysis().pointsToConstantMemory(P); } + bool doesNotAccessMemory(CallSite CS) { + return getAnalysis().doesNotAccessMemory(CS); + } bool doesNotAccessMemory(Function *F) { return getAnalysis().doesNotAccessMemory(F); } + bool onlyReadsMemory(CallSite CS) { + return getAnalysis().onlyReadsMemory(CS); + } bool onlyReadsMemory(Function *F) { return getAnalysis().onlyReadsMemory(F); } Modified: llvm/trunk/lib/Analysis/AliasSetTracker.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/AliasSetTracker.cpp?rev=44487&r1=44486&r2=44487&view=diff ============================================================================== --- llvm/trunk/lib/Analysis/AliasSetTracker.cpp (original) +++ llvm/trunk/lib/Analysis/AliasSetTracker.cpp Sat Dec 1 01:51:45 2007 @@ -114,15 +114,13 @@ void AliasSet::addCallSite(CallSite CS, AliasAnalysis &AA) { CallSites.push_back(CS); - if (Function *F = CS.getCalledFunction()) { - AliasAnalysis::ModRefBehavior Behavior = AA.getModRefBehavior(F, CS); - if (Behavior == AliasAnalysis::DoesNotAccessMemory) - return; - else if (Behavior == AliasAnalysis::OnlyReadsMemory) { - AliasTy = MayAlias; - AccessTy |= Refs; - return; - } + AliasAnalysis::ModRefBehavior Behavior = AA.getModRefBehavior(CS); + if (Behavior == AliasAnalysis::DoesNotAccessMemory) + return; + else if (Behavior == AliasAnalysis::OnlyReadsMemory) { + AliasTy = MayAlias; + AccessTy |= Refs; + return; } // FIXME: This should use mod/ref information to make this not suck so bad @@ -166,9 +164,8 @@ } bool AliasSet::aliasesCallSite(CallSite CS, AliasAnalysis &AA) const { - if (Function *F = CS.getCalledFunction()) - if (AA.doesNotAccessMemory(F)) - return false; + if (AA.doesNotAccessMemory(CS)) + return false; if (AA.hasNoModRefInfoForCalls()) return true; @@ -297,9 +294,8 @@ bool AliasSetTracker::add(CallSite CS) { - if (Function *F = CS.getCalledFunction()) - if (AA.doesNotAccessMemory(F)) - return true; // doesn't alias anything + if (AA.doesNotAccessMemory(CS)) + return true; // doesn't alias anything AliasSet *AS = findAliasSetForCallSite(CS); if (!AS) { @@ -419,9 +415,8 @@ } bool AliasSetTracker::remove(CallSite CS) { - if (Function *F = CS.getCalledFunction()) - if (AA.doesNotAccessMemory(F)) - return false; // doesn't alias anything + if (AA.doesNotAccessMemory(CS)) + return false; // doesn't alias anything AliasSet *AS = findAliasSetForCallSite(CS); if (!AS) return false; @@ -455,13 +450,10 @@ // If this is a call instruction, remove the callsite from the appropriate // AliasSet. CallSite CS = CallSite::get(PtrVal); - if (CS.getInstruction()) { - Function *F = CS.getCalledFunction(); - if (!F || !AA.doesNotAccessMemory(F)) { + if (CS.getInstruction()) + if (!AA.doesNotAccessMemory(CS)) if (AliasSet *AS = findAliasSetForCallSite(CS)) AS->removeCallSite(CS); - } - } // First, look up the PointerRec for this pointer. hash_map::iterator I = PointerMap.find(PtrVal); Modified: llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp?rev=44487&r1=44486&r2=44487&view=diff ============================================================================== --- llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp (original) +++ llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp Sat Dec 1 01:51:45 2007 @@ -839,11 +839,6 @@ return UnknownModRefBehavior; } - if (F->paramHasAttr(0, ParamAttr::ReadNone)) - return DoesNotAccessMemory; - if (F->paramHasAttr(0, ParamAttr::ReadOnly)) - return OnlyReadsMemory; - return UnknownModRefBehavior; } Modified: llvm/trunk/lib/Analysis/IPA/GlobalsModRef.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/IPA/GlobalsModRef.cpp?rev=44487&r1=44486&r2=44487&view=diff ============================================================================== --- llvm/trunk/lib/Analysis/IPA/GlobalsModRef.cpp (original) +++ llvm/trunk/lib/Analysis/IPA/GlobalsModRef.cpp Sat Dec 1 01:51:45 2007 @@ -394,7 +394,7 @@ // Okay, if we can't say anything about it, maybe some other alias // analysis can. ModRefBehavior MRB = - AliasAnalysis::getModRefBehavior(Callee, CallSite()); + AliasAnalysis::getModRefBehavior(Callee); if (MRB != DoesNotAccessMemory) { // FIXME: could make this more aggressive for functions that just // read memory. We should just say they read all globals. Modified: llvm/trunk/lib/Analysis/LoadValueNumbering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/LoadValueNumbering.cpp?rev=44487&r1=44486&r2=44487&view=diff ============================================================================== --- llvm/trunk/lib/Analysis/LoadValueNumbering.cpp (original) +++ llvm/trunk/lib/Analysis/LoadValueNumbering.cpp Sat Dec 1 01:51:45 2007 @@ -148,7 +148,7 @@ Function *CF = CI->getCalledFunction(); if (CF == 0) return; // Indirect call. AliasAnalysis &AA = getAnalysis(); - AliasAnalysis::ModRefBehavior MRB = AA.getModRefBehavior(CF, CI); + AliasAnalysis::ModRefBehavior MRB = AA.getModRefBehavior(CI); if (MRB != AliasAnalysis::DoesNotAccessMemory && MRB != AliasAnalysis::OnlyReadsMemory) return; // Nothing we can do for now. @@ -227,8 +227,7 @@ CantEqual = true; break; } else if (CallInst *CI = dyn_cast(I)) { - if (CI->getCalledFunction() == 0 || - !AA.onlyReadsMemory(CI->getCalledFunction())) { + if (!AA.onlyReadsMemory(CI)) { CantEqual = true; break; } Modified: llvm/trunk/lib/Analysis/MemoryDependenceAnalysis.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/MemoryDependenceAnalysis.cpp?rev=44487&r1=44486&r2=44487&view=diff ============================================================================== --- llvm/trunk/lib/Analysis/MemoryDependenceAnalysis.cpp (original) +++ llvm/trunk/lib/Analysis/MemoryDependenceAnalysis.cpp Sat Dec 1 01:51:45 2007 @@ -94,11 +94,9 @@ // FreeInsts erase the entire structure pointerSize = ~0UL; - } else if (CallSite::get(QI).getInstruction() != 0 && - cast(QI)->getCalledFunction()) { + } else if (isa(QI)) { AliasAnalysis::ModRefBehavior result = - AA.getModRefBehavior(cast(QI)->getCalledFunction(), - CallSite::get(QI)); + AA.getModRefBehavior(CallSite::get(QI)); if (result != AliasAnalysis::DoesNotAccessMemory && result != AliasAnalysis::OnlyReadsMemory) { if (!start && !block) { Modified: llvm/trunk/lib/Transforms/Scalar/ADCE.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/ADCE.cpp?rev=44487&r1=44486&r2=44487&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/ADCE.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/ADCE.cpp Sat Dec 1 01:51:45 2007 @@ -198,8 +198,7 @@ for (BasicBlock::iterator II = BB->begin(), EI = BB->end(); II != EI; ) { Instruction *I = II++; if (CallInst *CI = dyn_cast(I)) { - Function *F = CI->getCalledFunction(); - if (F && AA.onlyReadsMemory(F)) { + if (AA.onlyReadsMemory(CI)) { if (CI->use_empty()) { BB->getInstList().erase(CI); ++NumCallRemoved; Modified: llvm/trunk/lib/Transforms/Scalar/DeadStoreElimination.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/DeadStoreElimination.cpp?rev=44487&r1=44486&r2=44487&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/DeadStoreElimination.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/DeadStoreElimination.cpp Sat Dec 1 01:51:45 2007 @@ -306,8 +306,7 @@ // If this call does not access memory, it can't // be undeadifying any of our pointers. CallSite CS = CallSite::get(BBI); - if (CS.getCalledFunction() && - AA.doesNotAccessMemory(CS.getCalledFunction())) + if (AA.doesNotAccessMemory(CS)) continue; unsigned modRef = 0; Modified: llvm/trunk/lib/Transforms/Scalar/GVN.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/GVN.cpp?rev=44487&r1=44486&r2=44487&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/GVN.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/GVN.cpp Sat Dec 1 01:51:45 2007 @@ -341,8 +341,7 @@ uint32_t ValueTable::hash_operand(Value* v) { if (CallInst* CI = dyn_cast(v)) - if (CI->getCalledFunction() && - !AA->doesNotAccessMemory(CI->getCalledFunction())) + if (!AA->doesNotAccessMemory(CI)) return nextValueNumber++; return lookup_or_add(v); @@ -485,9 +484,7 @@ return VI->second; if (CallInst* C = dyn_cast(V)) { - if (C->getCalledFunction() && - (AA->doesNotAccessMemory(C->getCalledFunction()) || - AA->onlyReadsMemory(C->getCalledFunction()))) { + if (AA->onlyReadsMemory(C)) { // includes doesNotAccessMemory Expression e = create_expression(C); DenseMap::iterator EI = expressionNumbering.find(e); @@ -1051,8 +1048,7 @@ if (CallInst* CI = dyn_cast(I)) { AliasAnalysis& AA = getAnalysis(); - if (CI->getCalledFunction() && - !AA.doesNotAccessMemory(CI->getCalledFunction())) { + if (!AA.doesNotAccessMemory(CI)) { MemoryDependenceAnalysis& MD = getAnalysis(); if (cast(repl)->getParent() != CI->getParent() || MD.getDependency(CI) != MD.getDependency(cast(repl))) { Modified: llvm/trunk/lib/Transforms/Scalar/LICM.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LICM.cpp?rev=44487&r1=44486&r2=44487&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/LICM.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/LICM.cpp Sat Dec 1 01:51:45 2007 @@ -375,24 +375,22 @@ return !pointerInvalidatedByLoop(LI->getOperand(0), Size); } else if (CallInst *CI = dyn_cast(&I)) { // Handle obvious cases efficiently. - if (Function *Callee = CI->getCalledFunction()) { - AliasAnalysis::ModRefBehavior Behavior =AA->getModRefBehavior(Callee, CI); - if (Behavior == AliasAnalysis::DoesNotAccessMemory) - return true; - else if (Behavior == AliasAnalysis::OnlyReadsMemory) { - // If this call only reads from memory and there are no writes to memory - // in the loop, we can hoist or sink the call as appropriate. - bool FoundMod = false; - for (AliasSetTracker::iterator I = CurAST->begin(), E = CurAST->end(); - I != E; ++I) { - AliasSet &AS = *I; - if (!AS.isForwardingAliasSet() && AS.isMod()) { - FoundMod = true; - break; - } + AliasAnalysis::ModRefBehavior Behavior = AA->getModRefBehavior(CI); + if (Behavior == AliasAnalysis::DoesNotAccessMemory) + return true; + else if (Behavior == AliasAnalysis::OnlyReadsMemory) { + // If this call only reads from memory and there are no writes to memory + // in the loop, we can hoist or sink the call as appropriate. + bool FoundMod = false; + for (AliasSetTracker::iterator I = CurAST->begin(), E = CurAST->end(); + I != E; ++I) { + AliasSet &AS = *I; + if (!AS.isForwardingAliasSet() && AS.isMod()) { + FoundMod = true; + break; } - if (!FoundMod) return true; } + if (!FoundMod) return true; } // FIXME: This should use mod/ref information to see if we can hoist or sink From gordonhenriksen at mac.com Sat Dec 1 14:59:23 2007 From: gordonhenriksen at mac.com (Gordon Henriksen) Date: Sat, 01 Dec 2007 20:59:23 -0000 Subject: [llvm-commits] [llvm] r44493 - /llvm/trunk/test/Bindings/Ocaml/analysis.ml Message-ID: <200712012059.lB1KxOUb032753@zion.cs.uiuc.edu> Author: gordon Date: Sat Dec 1 14:59:23 2007 New Revision: 44493 URL: http://llvm.org/viewvc/llvm-project?rev=44493&view=rev Log: Fix a typo noticed by Alain Frisch. Modified: llvm/trunk/test/Bindings/Ocaml/analysis.ml Modified: llvm/trunk/test/Bindings/Ocaml/analysis.ml URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bindings/Ocaml/analysis.ml?rev=44493&r1=44492&r2=44493&view=diff ============================================================================== --- llvm/trunk/test/Bindings/Ocaml/analysis.ml (original) +++ llvm/trunk/test/Bindings/Ocaml/analysis.ml Sat Dec 1 14:59:23 2007 @@ -23,9 +23,10 @@ (* Test that valid constructs verify. *) - match verify_module m with + begin match verify_module m with Some msg -> bomb "valid module failed verification!" - | None -> (); + | None -> () + end; if not (verify_function fn) then bomb "valid function failed verification!"; @@ -34,9 +35,10 @@ A basic block can contain only one terminator instruction. *) ignore (build_ret_void at_entry); - match verify_module m with + begin match verify_module m with Some msg -> () - | None -> bomb "invalid module passed verification!"; + | None -> bomb "invalid module passed verification!" + end; if verify_function fn then bomb "invalid function passed verification!"; From gordonhenriksen at mac.com Sat Dec 1 15:01:15 2007 From: gordonhenriksen at mac.com (Gordon Henriksen) Date: Sat, 01 Dec 2007 21:01:15 -0000 Subject: [llvm-commits] [llvm] r44494 - in /llvm/trunk/bindings/ocaml: analysis/llvm_analysis.ml analysis/llvm_analysis.mli bitwriter/llvm_bitwriter.mli llvm/llvm.ml llvm/llvm.mli llvm/llvm_ocaml.c Message-ID: <200712012101.lB1L1Fee000380@zion.cs.uiuc.edu> Author: gordon Date: Sat Dec 1 15:01:15 2007 New Revision: 44494 URL: http://llvm.org/viewvc/llvm-project?rev=44494&view=rev Log: Adding ocamldoc-style comments for the Ocaml bindings. Modified: llvm/trunk/bindings/ocaml/analysis/llvm_analysis.ml llvm/trunk/bindings/ocaml/analysis/llvm_analysis.mli llvm/trunk/bindings/ocaml/bitwriter/llvm_bitwriter.mli llvm/trunk/bindings/ocaml/llvm/llvm.ml llvm/trunk/bindings/ocaml/llvm/llvm.mli llvm/trunk/bindings/ocaml/llvm/llvm_ocaml.c Modified: llvm/trunk/bindings/ocaml/analysis/llvm_analysis.ml URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/ocaml/analysis/llvm_analysis.ml?rev=44494&r1=44493&r2=44494&view=diff ============================================================================== --- llvm/trunk/bindings/ocaml/analysis/llvm_analysis.ml (original) +++ llvm/trunk/bindings/ocaml/analysis/llvm_analysis.ml Sat Dec 1 15:01:15 2007 @@ -5,11 +5,6 @@ * This file was developed by Gordon Henriksen and is distributed under the * University of Illinois Open Source License. See LICENSE.TXT for details. * - *===----------------------------------------------------------------------=== - * - * This interface provides an ocaml API for LLVM IR analyses, the classes in - * the Analysis library. - * *===----------------------------------------------------------------------===*) Modified: llvm/trunk/bindings/ocaml/analysis/llvm_analysis.mli URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/ocaml/analysis/llvm_analysis.mli?rev=44494&r1=44493&r2=44494&view=diff ============================================================================== --- llvm/trunk/bindings/ocaml/analysis/llvm_analysis.mli (original) +++ llvm/trunk/bindings/ocaml/analysis/llvm_analysis.mli Sat Dec 1 15:01:15 2007 @@ -13,12 +13,24 @@ *===----------------------------------------------------------------------===*) +(** [verify_module m] returns [None] if the module [m] is valid, and + [Some reason] if it is invalid. [reason] is a string containing a + human-readable validation report. See [llvm::verifyModule]. **) external verify_module : Llvm.llmodule -> string option = "llvm_verify_module" +(** [verify_function f] returns [None] if the function [f] is valid, and + [Some reason] if it is invalid. [reason] is a string containing a + human-readable validation report. See [llvm::verifyFunction]. **) external verify_function : Llvm.llvalue -> bool = "llvm_verify_function" +(** [verify_module m] returns if the module [m] is valid, but prints a + validation report to [stderr] and aborts the program if it is invalid. See + [llvm::verifyModule]. **) external assert_valid_module : Llvm.llmodule -> unit = "llvm_assert_valid_module" +(** [verify_function f] returns if the function [f] is valid, but prints a + validation report to [stderr] and aborts the program if it is invalid. See + [llvm::verifyFunction]. **) external assert_valid_function : Llvm.llvalue -> unit = "llvm_assert_valid_function" Modified: llvm/trunk/bindings/ocaml/bitwriter/llvm_bitwriter.mli URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/ocaml/bitwriter/llvm_bitwriter.mli?rev=44494&r1=44493&r2=44494&view=diff ============================================================================== --- llvm/trunk/bindings/ocaml/bitwriter/llvm_bitwriter.mli (original) +++ llvm/trunk/bindings/ocaml/bitwriter/llvm_bitwriter.mli Sat Dec 1 15:01:15 2007 @@ -13,6 +13,7 @@ *===----------------------------------------------------------------------===*) -(* Writes the bitcode for module the given path. Returns true if successful. *) +(** [write_bitcode_file m path] writes the bitcode for module [m] to the file at + [path]. Returns [true] if successful, [false] otherwise. **) external write_bitcode_file : Llvm.llmodule -> string -> bool = "llvm_write_bitcode_file" Modified: llvm/trunk/bindings/ocaml/llvm/llvm.ml URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/ocaml/llvm/llvm.ml?rev=44494&r1=44493&r2=44494&view=diff ============================================================================== --- llvm/trunk/bindings/ocaml/llvm/llvm.ml (original) +++ llvm/trunk/bindings/ocaml/llvm/llvm.ml Sat Dec 1 15:01:15 2007 @@ -5,21 +5,14 @@ * This file was developed by Gordon Henriksen and is distributed under the * University of Illinois Open Source License. See LICENSE.TXT for details. * - *===----------------------------------------------------------------------=== - * - * This interface provides an ocaml API for the LLVM intermediate - * representation, the classes in the VMCore library. - * *===----------------------------------------------------------------------===*) -(* These abstract types correlate directly to the LLVM VMCore classes. *) type llmodule type lltype type lltypehandle type llvalue -type llbasicblock (* These are actually values, but - benefit from type checking. *) +type llbasicblock type llbuilder type type_kind = @@ -93,19 +86,10 @@ (*===-- Modules -----------------------------------------------------------===*) -(* Creates a module with the supplied module ID. Modules are not garbage - collected; it is mandatory to call dispose_module to free memory. *) external create_module : string -> llmodule = "llvm_create_module" - -(* Disposes a module. All references to subordinate objects are invalidated; - referencing them will invoke undefined behavior. *) external dispose_module : llmodule -> unit = "llvm_dispose_module" - -(* Adds a named type to the module's symbol table. Returns true if successful. - If such a name already exists, then no entry is added and returns false. *) external define_type_name : string -> lltype -> llmodule -> bool = "llvm_add_type_name" - external delete_type_name : string -> llmodule -> unit = "llvm_delete_type_name" @@ -113,8 +97,6 @@ (*===-- Types -------------------------------------------------------------===*) external classify_type : lltype -> type_kind = "llvm_classify_type" -external refine_abstract_type : lltype -> lltype -> unit - = "llvm_refine_abstract_type" (*--... Operations on integer types ........................................--*) external _i1_type : unit -> lltype = "llvm_i1_type" @@ -146,7 +128,6 @@ let ppc_fp128_type = _ppc_fp128_type () (*--... Operations on function types .......................................--*) -(* FIXME: handle parameter attributes *) external function_type : lltype -> lltype array -> lltype = "llvm_function_type" external var_arg_function_type : lltype -> lltype array -> lltype = "llvm_var_arg_function_type" @@ -280,6 +261,7 @@ external lookup_global : string -> llmodule -> llvalue option = "llvm_lookup_global" external delete_global : llvalue -> unit = "llvm_delete_global" +external has_initializer : llvalue -> bool = "llvm_has_initializer" external global_initializer : llvalue -> llvalue = "LLVMGetInitializer" external set_initializer : llvalue -> llvalue -> unit = "llvm_set_initializer" external remove_initializer : llvalue -> unit = "llvm_remove_initializer" @@ -457,6 +439,7 @@ !s let rec string_of_lltype ty = + (* FIXME: stop infinite recursion! :) *) match classify_type ty with Integer_type -> "i" ^ string_of_int (integer_bitwidth ty) | Pointer_type -> (string_of_lltype (element_type ty)) ^ "*" Modified: llvm/trunk/bindings/ocaml/llvm/llvm.mli URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/ocaml/llvm/llvm.mli?rev=44494&r1=44493&r2=44494&view=diff ============================================================================== --- llvm/trunk/bindings/ocaml/llvm/llvm.mli (original) +++ llvm/trunk/bindings/ocaml/llvm/llvm.mli Sat Dec 1 15:01:15 2007 @@ -14,14 +14,34 @@ (* These abstract types correlate directly to the LLVM VMCore classes. *) + +(** The top-level container for all other LLVM Intermediate Representation (IR) + objects. See the [llvm::Module] class. **) type llmodule -type lltype + +(** Each value in the LLVM IR has a type, an instance of [lltype]. See the + [llvm::Type] class. **) +type lltype + +(** When building recursive types using [refine_type], [lltype] values may + become invalid; use [lltypehandle] to resolve this problem. See the + [llvm::AbstractTypeHolder] class. **) type lltypehandle + +(** Any value in the LLVM IR. Functions, instructions, global variables, + constants, and much more are all [llvalues]. See the [llvm::Value] class. + This type covers a wide range of subclasses. **) type llvalue -type llbasicblock (* These are actually values, but - benefit from type checking. *) + +(** A basic block in LLVM IR. See the [llvm::BasicBlock] class. **) +type llbasicblock + +(** Used to generate instructions in the LLVM IR. See the [llvm::LLVMBuilder] + class. **) type llbuilder +(** The kind of an [lltype], the result of [classify_type ty]. See the + [llvm::Type::TypeID] enumeration. **) type type_kind = Void_type | Float_type @@ -34,10 +54,12 @@ | Function_type | Struct_type | Array_type -| Pointer_type +| Pointer_type | Opaque_type | Vector_type +(** The linkage of a global value, accessed with [linkage gv] and + [set_linkage l gv]. See [llvm::GlobalValue::LinkageTypes]. **) type linkage = External_linkage | Link_once_linkage @@ -49,17 +71,29 @@ | External_weak_linkage | Ghost_linkage +(** The linker visibility of a global value, accessed with [visibility gv] and + [set_visibility v gv]. See [llvm::GlobalValue::VisibilityTypes]. **) type visibility = Default_visibility | Hidden_visibility | Protected_visibility -val ccc : int -val fastcc : int -val coldcc : int -val x86_stdcallcc : int -val x86_fastcallcc : int +(* The following calling convention values may be accessed with + [function_call_conv f] and [set_function_call_conv conv f]. Calling + conventions are open-ended. *) +val ccc : int (** [ccc] is the C calling convention. **) +val fastcc : int (** [fastcc] is the calling convention to allow LLVM + maximum optimization opportunities. Use only with + internal linkage. **) +val coldcc : int (** [coldcc] is the calling convention for + callee-save. **) +val x86_stdcallcc : int (** [x86_stdcallcc] is the familiar stdcall calling + convention from C. **) +val x86_fastcallcc : int (** [x86_fastcallcc] is the familiar fastcall calling + convention from C. **) +(** The predicate for an integer comparison ([icmp]) instruction. + See the [llvm::ICmpInst::Predicate] enumeration. **) type int_predicate = Icmp_eq | Icmp_ne @@ -72,6 +106,8 @@ | Icmp_slt | Icmp_sle +(** The predicate for a floating-point comparison ([fcmp]) instruction. + See the [llvm::FCmpInst::Predicate] enumeration. **) type real_predicate = Fcmp_false | Fcmp_oeq @@ -93,332 +129,1082 @@ (*===-- Modules -----------------------------------------------------------===*) -(* Creates a module with the supplied module ID. Modules are not garbage - collected; it is mandatory to call dispose_module to free memory. *) +(** [create_module id] creates a module with the supplied module ID. Modules are + not garbage collected; it is mandatory to call [dispose_module m] to free + memory. See the constructor [llvm::Module::Module]. *) external create_module : string -> llmodule = "llvm_create_module" -(* Disposes a module. All references to subordinate objects are invalidated; - referencing them will invoke undefined behavior. *) +(** [dispose_module m] destroys a module [m] and all of the IR objects it + contained. All references to subordinate objects are invalidated; + referencing them will invoke undefined behavior. See the destructor + [llvm::Module::~Module]. **) external dispose_module : llmodule -> unit = "llvm_dispose_module" -(* Adds a named type to the module's symbol table. Returns true if successful. - If such a name already exists, then no entry is added and returns false. *) +(** [define_type_name name ty m] adds a named type to the module's symbol table. + Returns [true] if successful. If such a name already exists, then no entry + is added and [false] is returned. See the [llvm::Module::addTypeName] + method. **) external define_type_name : string -> lltype -> llmodule -> bool = "llvm_add_type_name" +(** [delete_type_name name] removes a type name from the module's symbol + table. *) external delete_type_name : string -> llmodule -> unit = "llvm_delete_type_name" (*===-- Types -------------------------------------------------------------===*) + +(** [classify_type ty] returns the [type_kind] corresponding to the type [ty]. + See the method [llvm::Type::getTypeID]. **) external classify_type : lltype -> type_kind = "llvm_classify_type" -external refine_abstract_type : lltype -> lltype -> unit - = "llvm_refine_abstract_type" + +(** [string_of_lltype ty] returns a string describing the type [ty]. **) val string_of_lltype : lltype -> string (*--... Operations on integer types ........................................--*) -val i1_type : lltype -val i8_type : lltype + +(** The 1-bit integer type. See [llvm::Type::Int1Ty]. **) +val i1_type : lltype + +(** The 8-bit integer type. See [llvm::Type::Int8Ty]. **) +val i8_type : lltype + +(** The 16-bit integer type. See [llvm::Type::Int16Ty]. **) val i16_type : lltype + +(** The 32-bit integer type. See [llvm::Type::Int32Ty]. **) val i32_type : lltype + +(** The 64-bit integer type. See [llvm::Type::Int64Ty]. **) val i64_type : lltype + +(** [integer_type n] returns an integer type of bitwidth [n]. + See the method [llvm::IntegerType::get]. **) external integer_type : int -> lltype = "llvm_integer_type" + +(** [integer_bitwidth ty] returns the number of bits in the integer type [ty].. + See the method [llvm::IntegerType::getBitWidth]. **) external integer_bitwidth : lltype -> int = "llvm_integer_bitwidth" (*--... Operations on real types ...........................................--*) + +(** The IEEE 32-bit floating point type. See [llvm::Type::FloatTy]. **) val float_type : lltype + +(** The IEEE 64-bit floating point type. See [llvm::Type::DoubleTy]. **) val double_type : lltype + +(** The x87 80-bit floating point type. See [llvm::Type::X86_FP80Ty]. **) val x86fp80_type : lltype + +(** The IEEE 128-bit floating point type. See [llvm::Type::FP128Ty]. **) val fp128_type : lltype + +(** The PowerPC 128-bit floating point type. See [llvm::Type::PPC_FP128Ty]. **) val ppc_fp128_type : lltype (*--... Operations on function types .......................................--*) -(* FIXME: handle parameter attributes *) + +(** [function_type ret_ty param_tys] returns the function type returning + [ret_ty] and taking [param_tys] as parameters. + See the method [llvm::FunctionType::get]. **) external function_type : lltype -> lltype array -> lltype = "llvm_function_type" + +(** [va_arg_function_type ret_ty param_tys] is just like + [function_type ret_ty param_tys] except that it returns the function type + which also takes a variable number of arguments. + See the method [llvm::FunctionType::get]. **) external var_arg_function_type : lltype -> lltype array -> lltype = "llvm_var_arg_function_type" + +(** [is_var_arg fty] returns [true] if [fty] is a varargs function type, [false] + otherwise. See the method [llvm::FunctionType::isVarArg]. **) external is_var_arg : lltype -> bool = "llvm_is_var_arg" + +(** [return_type fty] gets the return type of the function type [fty]. + See the method [llvm::FunctionType::getReturnType]. **) external return_type : lltype -> lltype = "LLVMGetReturnType" + +(** [param_types fty] gets the parameter types of the function type [fty]. + See the method [llvm::FunctionType::getParamType]. **) external param_types : lltype -> lltype array = "llvm_param_types" (*--... Operations on struct types .........................................--*) + +(** [struct_type tys] returns the structure type containing in the types in the + array [tys]. See the method [llvm::StructType::get]. **) external struct_type : lltype array -> lltype = "llvm_struct_type" + +(** [struct_type tys] returns the packed structure type containing in the types + in the array [tys]. See the method [llvm::StructType::get]. **) external packed_struct_type : lltype array -> lltype = "llvm_packed_struct_type" + +(** [element_types sty] returns the constituent types of the struct type [sty]. + See the method [llvm::StructType::getElementType]. **) external element_types : lltype -> lltype array = "llvm_element_types" + +(** [is_packed sty] returns [true] if the structure type [sty] is packed, + [false] otherwise. See the method [llvm::StructType::isPacked]. **) external is_packed : lltype -> bool = "llvm_is_packed" (*--... Operations on pointer, vector, and array types .....................--*) + +(** [array_type ty n] returns the array type containing [n] elements of type + [ty]. See the method [llvm::ArrayType::get]. **) external array_type : lltype -> int -> lltype = "llvm_array_type" + +(** [pointer_type ty] returns the pointer type referencing objects of type + [ty]. See the method [llvm::PointerType::get]. **) external pointer_type : lltype -> lltype = "LLVMPointerType" + +(** [vector_type ty n] returns the array type containing [n] elements of the + primitive type [ty]. See the method [llvm::ArrayType::get]. **) external vector_type : lltype -> int -> lltype = "llvm_vector_type" +(** [element_type ty] returns the element type of the pointer, vector, or array + type [ty]. See the method [llvm::SequentialType::get]. **) external element_type : lltype -> lltype = "LLVMGetElementType" + +(** [element_type aty] returns the element count of the array type [aty]. + See the method [llvm::ArrayType::getNumElements]. **) external array_length : lltype -> int = "llvm_array_length" + +(** [element_type ty] returns the element count of the vector type [ty]. + See the method [llvm::VectorType::getNumElements]. **) external vector_size : lltype -> int = "llvm_vector_size" (*--... Operations on other types ..........................................--*) + +(** [opaque_type ()] creates a new opaque type distinct from any other. + Opaque types are useful for building recursive types in combination with + [refine_type opaque_ty ty]. + See [llvm::OpaqueType::get]. **) external opaque_type : unit -> lltype = "llvm_opaque_type" + +(** [void_type] is the type of a function which does not return any value. + See [llvm::Type::VoidTy]. **) val void_type : lltype + +(** [label_type] is the type of a basic block. See [llvm::Type::LabelTy]. **) val label_type : lltype (*--... Operations on type handles .........................................--*) + +(** [handle_to_type ty] creates a handle to the type [ty]. If [ty] is later + refined as a result of a call to [refine_type], the handle will be updated; + any bare [lltype] references will become invalid. + See the class [llvm::PATypeHolder]. **) external handle_to_type : lltype -> lltypehandle = "llvm_handle_to_type" + +(** [type_of_handle tyh] resolves the type handle [tyh]. + See the method [llvm::PATypeHolder::get()]. **) external type_of_handle : lltypehandle -> lltype = "llvm_type_of_handle" + +(** [refine_type opaque_ty ty] replaces the abstract type [opaque_ty] with the + concrete type [ty] in all users. Warning: This may invalidate [lltype] + values! Use [lltypehandle] to manipulate potentially abstract types. See the + method [llvm::Type::refineAbstractType]. **) external refine_type : lltype -> lltype -> unit = "llvm_refine_type" (*===-- Values ------------------------------------------------------------===*) + +(** [type_of v] returns the type of the value [v]. + See the method [llvm::Value::getType]. **) external type_of : llvalue -> lltype = "llvm_type_of" + +(** [value_name v] returns the name of the value [v]. For global values, this is + the symbol name. For instructions and basic blocks, it is the SSA register + name. It is meaningless for constants. + See the method [llvm::Value::getName]. **) external value_name : llvalue -> string = "llvm_value_name" + +(** [set_value_name n v] sets the name of the value [v] to [n]. See the method + [llvm::Value::setName]. **) external set_value_name : string -> llvalue -> unit = "llvm_set_value_name" + +(** [dump_value v] prints the .ll representation of the value [v] to standard + error. See the method [llvm::Value::dump]. **) external dump_value : llvalue -> unit = "llvm_dump_value" (*--... Operations on constants of (mostly) any type .......................--*) + +(** [is_constant v] returns [true] if the value [v] is a constant, [false] + otherwise. Similar to [llvm::isa]. **) external is_constant : llvalue -> bool = "llvm_is_constant" + +(** [const_null ty] returns the constant null (zero) of the type [ty]. + See the method [llvm::Constant::getNullValue]. **) external const_null : lltype -> llvalue = "LLVMConstNull" + +(** [const_all_ones ty] returns the constant '-1' of the integer or vector type + [ty]. See the method [llvm::Constant::getAllOnesValue]. **) external const_all_ones : (*int|vec*)lltype -> llvalue = "LLVMConstAllOnes" + +(** [undef ty] returns the undefined value of the type [ty]. + See the method [llvm::UndefValue::get]. **) external undef : lltype -> llvalue = "LLVMGetUndef" + +(** [is_null v] returns [true] if the value [v] is the null (zero) value. + See the method [llvm::Constant::isNullValue]. **) external is_null : llvalue -> bool = "llvm_is_null" + +(** [is_undef v] returns [true] if the value [v] is an undefined value, [false] + otherwise. Similar to [llvm::isa]. **) external is_undef : llvalue -> bool = "llvm_is_undef" (*--... Operations on scalar constants .....................................--*) + +(** [const_int ty i] returns the integer constant of type [ty] and value [i]. + See the method [llvm::ConstantInt::get]. **) external const_int : lltype -> int -> llvalue = "llvm_const_int" + +(** [const_of_int64 ty i] returns the integer constant of type [ty] and value + [i]. See the method [llvm::ConstantInt::get]. **) external const_of_int64 : lltype -> Int64.t -> bool -> llvalue = "llvm_const_of_int64" + +(** [const_float ty n] returns the floating point constant of type [ty] and + value [n]. See the method [llvm::ConstantInt::get]. **) external const_float : lltype -> float -> llvalue = "llvm_const_float" (*--... Operations on composite constants ..................................--*) + +(** [const_string s] returns the constant [i8] array with the values of the + characters in the string [s]. The array is not null-terminated (but see + [const_stringz]). This value can in turn be used as the initializer for a + global variable. See the method [llvm::ConstantArray::get]. **) external const_string : string -> llvalue = "llvm_const_string" + +(** [const_stringz s] returns the constant [i8] array with the values of the + characters in the string [s] and a null terminator. This value can in turn + be used as the initializer for a global variable. + See the method [llvm::ConstantArray::get]. **) external const_stringz : string -> llvalue = "llvm_const_stringz" + +(** [const_array ty elts] returns the constant array of type + [array_type ty (Array.length elts)] and containing the values [elts]. + This value can in turn be used as the initializer for a global variable. + See the method [llvm::ConstantArray::get]. **) external const_array : lltype -> llvalue array -> llvalue = "llvm_const_array" + +(** [const_struct elts] returns the structured constant of type + [struct_type (Array.map type_of elts)] and containing the values [elts]. + This value can in turn be used as the initializer for a global variable. + See the method [llvm::ConstantStruct::get]. **) external const_struct : llvalue array -> llvalue = "llvm_const_struct" + +(** [const_packed_struct elts] returns the structured constant of type + [packed_struct_type (Array.map type_of elts)] and containing the values + [elts]. This value can in turn be used as the initializer for a global + variable. See the method [llvm::ConstantStruct::get]. **) external const_packed_struct : llvalue array -> llvalue = "llvm_const_packed_struct" + +(** [const_vector elts] returns the vector constant of type + [vector_type (type_of elts.(0)) (Array.length elts)] and containing the + values [elts]. See the method [llvm::ConstantVector::get]. **) external const_vector : llvalue array -> llvalue = "llvm_const_vector" (*--... Constant expressions ...............................................--*) + +(** [size_of ty] returns the sizeof constant for the type [ty]. This is + equivalent to [const_ptrtoint (const_gep (const_null (pointer_type ty)) + (const_int i64_type 1)) i64_type], but considerably more readable. + See the method [llvm::ConstantExpr::getSizeOf]. **) external size_of : lltype -> llvalue = "LLVMSizeOf" + +(** [const_neg c] returns the arithmetic negation of the constant [c]. + See the method [llvm::ConstantExpr::getNeg]. **) external const_neg : llvalue -> llvalue = "LLVMConstNeg" + +(** [const_not c] returns the bitwise inverse of the constant [c]. + See the method [llvm::ConstantExpr::getNot]. **) external const_not : llvalue -> llvalue = "LLVMConstNot" + +(** [const_add c1 c2] returns the constant sum of two constants. + See the method [llvm::ConstantExpr::getAdd]. **) external const_add : llvalue -> llvalue -> llvalue = "LLVMConstAdd" + +(** [const_sub c1 c2] returns the constant difference, [c1 - c2], of two + constants. See the method [llvm::ConstantExpr::getSub]. **) external const_sub : llvalue -> llvalue -> llvalue = "LLVMConstSub" + +(** [const_mul c1 c2] returns the constant product of two constants. + See the method [llvm::ConstantExpr::getMul]. **) external const_mul : llvalue -> llvalue -> llvalue = "LLVMConstMul" + +(** [const_udiv c1 c2] returns the constant quotient [c1 / c2] of two unsigned + integer constants. + See the method [llvm::ConstantExpr::getUDiv]. **) external const_udiv : llvalue -> llvalue -> llvalue = "LLVMConstUDiv" + +(** [const_sdiv c1 c2] returns the constant quotient [c1 / c2] of two signed + integer constants. + See the method [llvm::ConstantExpr::]. **) external const_sdiv : llvalue -> llvalue -> llvalue = "LLVMConstSDiv" + +(** [const_fdiv c1 c2] returns the constant quotient [c1 / c2] of two floating + point constants. + See the method [llvm::ConstantExpr::getFDiv]. **) external const_fdiv : llvalue -> llvalue -> llvalue = "LLVMConstFDiv" + +(** [const_udiv c1 c2] returns the constant remainder [c1 MOD c2] of two + unsigned integer constants. + See the method [llvm::ConstantExpr::getURem]. **) external const_urem : llvalue -> llvalue -> llvalue = "LLVMConstURem" + +(** [const_sdiv c1 c2] returns the constant remainder [c1 MOD c2] of two + signed integer constants. + See the method [llvm::ConstantExpr::getSRem]. **) external const_srem : llvalue -> llvalue -> llvalue = "LLVMConstSRem" + +(** [const_frem c1 c2] returns the constant remainder [c1 MOD c2] of two + signed floating point constants. + See the method [llvm::ConstantExpr::getFRem]. **) external const_frem : llvalue -> llvalue -> llvalue = "LLVMConstFRem" + +(** [const_and c1 c2] returns the constant bitwise [AND] of two integer + constants. + See the method [llvm::ConstantExpr::getAnd]. **) external const_and : llvalue -> llvalue -> llvalue = "LLVMConstAnd" + +(** [const_or c1 c2] returns the constant bitwise [OR] of two integer + constants. + See the method [llvm::ConstantExpr::getOr]. **) external const_or : llvalue -> llvalue -> llvalue = "LLVMConstOr" + +(** [const_xor c1 c2] returns the constant bitwise [XOR] of two integer + constants. + See the method [llvm::ConstantExpr::getXor]. **) external const_xor : llvalue -> llvalue -> llvalue = "LLVMConstXor" + +(** [const_icmp pred c1 c2] returns the constant comparison of two integer + constants, [c1 pred c2]. + See the method [llvm::ConstantExpr::getICmp]. **) external const_icmp : int_predicate -> llvalue -> llvalue -> llvalue = "llvm_const_icmp" + +(** [const_fcmp pred c1 c2] returns the constant comparison of two floating + point constants, [c1 pred c2]. + See the method [llvm::ConstantExpr::getFCmp]. **) external const_fcmp : real_predicate -> llvalue -> llvalue -> llvalue = "llvm_const_fcmp" + +(** [const_shl c1 c2] returns the constant integer [c1] left-shifted by the + constant integer [c2]. + See the method [llvm::ConstantExpr::getShl]. **) external const_shl : llvalue -> llvalue -> llvalue = "LLVMConstShl" + +(** [const_lshr c1 c2] returns the constant integer [c1] right-shifted by the + constant integer [c2] with zero extension. + See the method [llvm::ConstantExpr::getLShr]. **) external const_lshr : llvalue -> llvalue -> llvalue = "LLVMConstLShr" + +(** [const_ashr c1 c2] returns the constant integer [c1] right-shifted by the + constant integer [c2] with sign extension. + See the method [llvm::ConstantExpr::getAShr]. **) external const_ashr : llvalue -> llvalue -> llvalue = "LLVMConstAShr" + +(** [const_gep pc indices] returns the constant [getElementPtr] of [p1] with the + constant integers indices from the array [indices]. + See the method [llvm::ConstantExpr::getGetElementPtr]. **) external const_gep : llvalue -> llvalue array -> llvalue = "llvm_const_gep" + +(** [const_trunc c ty] returns the constant truncation of integer constant [c] + to the smaller integer type [ty]. + See the method [llvm::ConstantExpr::getTrunc]. **) external const_trunc : llvalue -> lltype -> llvalue = "LLVMConstTrunc" + +(** [const_sext c ty] returns the constant sign extension of integer constant + [c] to the larger integer type [ty]. + See the method [llvm::ConstantExpr::getSExt]. **) external const_sext : llvalue -> lltype -> llvalue = "LLVMConstSExt" + +(** [const_zext c ty] returns the constant zero extension of integer constant + [c] to the larger integer type [ty]. + See the method [llvm::ConstantExpr::getZExt]. **) external const_zext : llvalue -> lltype -> llvalue = "LLVMConstZExt" + +(** [const_fptrunc c ty] returns the constant truncation of floating point + constant [c] to the smaller floating point type [ty]. + See the method [llvm::ConstantExpr::getFPTrunc]. **) external const_fptrunc : llvalue -> lltype -> llvalue = "LLVMConstFPTrunc" + +(** [const_fpext c ty] returns the constant extension of floating point constant + [c] to the larger floating point type [ty]. + See the method [llvm::ConstantExpr::getFPExt]. **) external const_fpext : llvalue -> lltype -> llvalue = "LLVMConstFPExt" + +(** [const_uitofp c ty] returns the constant floating point conversion of + unsigned integer constant [c] to the floating point type [ty]. + See the method [llvm::ConstantExpr::getUIToFP]. **) external const_uitofp : llvalue -> lltype -> llvalue = "LLVMConstUIToFP" + +(** [const_sitofp c ty] returns the constant floating point conversion of + signed integer constant [c] to the floating point type [ty]. + See the method [llvm::ConstantExpr::getSIToFP]. **) external const_sitofp : llvalue -> lltype -> llvalue = "LLVMConstSIToFP" + +(** [const_fptoui c ty] returns the constant unsigned integer conversion of + floating point constant [c] to integer type [ty]. + See the method [llvm::ConstantExpr::getFPToUI]. **) external const_fptoui : llvalue -> lltype -> llvalue = "LLVMConstFPToUI" + +(** [const_fptoui c ty] returns the constant unsigned integer conversion of + floating point constant [c] to integer type [ty]. + See the method [llvm::ConstantExpr::getFPToSI]. **) external const_fptosi : llvalue -> lltype -> llvalue = "LLVMConstFPToSI" + +(** [const_ptrtoint c ty] returns the constant integer conversion of + pointer constant [c] to integer type [ty]. + See the method [llvm::ConstantExpr::getPtrToInt]. **) external const_ptrtoint : llvalue -> lltype -> llvalue = "LLVMConstPtrToInt" + +(** [const_inttoptr c ty] returns the constant pointer conversion of + integer constant [c] to pointer type [ty]. + See the method [llvm::ConstantExpr::getIntToPtr]. **) external const_inttoptr : llvalue -> lltype -> llvalue = "LLVMConstIntToPtr" + +(** [const_bitcast c ty] returns the constant bitwise conversion of constant [c] + to type [ty] of equal size. + See the method [llvm::ConstantExpr::getBitCast]. **) external const_bitcast : llvalue -> lltype -> llvalue = "LLVMConstBitCast" + +(** [const_select cond t f] returns the constant conditional which returns value + [t] if the boolean constant [cond] is true and the value [f] otherwise. + See the method [llvm::ConstantExpr::getSelect]. **) external const_select : llvalue -> llvalue -> llvalue -> llvalue = "LLVMConstSelect" + +(** [const_extractelement vec i] returns the constant [i]th element of + constant vector [vec]. [i] must be a constant [i32] value unsigned less than + the size of the vector. + See the method [llvm::ConstantExpr::getExtractElement]. **) external const_extractelement : llvalue -> llvalue -> llvalue = "LLVMConstExtractElement" + +(** [const_insertelement vec v i] returns the constant vector with the same + elements as constant vector [v] but the [i]th element replaced by the + constant [v]. [v] must be a constant value with the type of the vector + elements. [i] must be a constant [i32] value unsigned less than the size + of the vector. + See the method [llvm::ConstantExpr::getInsertElement]. **) external const_insertelement : llvalue -> llvalue -> llvalue -> llvalue = "LLVMConstInsertElement" + +(** [const_shufflevector a b mask] returns a constant [shufflevector]. + See the LLVM Language Reference for details on the [sufflevector] + instruction. + See the method [llvm::ConstantExpr::getShuffleVector]. **) external const_shufflevector : llvalue -> llvalue -> llvalue -> llvalue = "LLVMConstShuffleVector" (*--... Operations on global variables, functions, and aliases (globals) ...--*) + +(** [is_declaration g] returns [true] if the global value [g] is a declaration + only. Returns [false] otherwise. + See the method [llvm::GlobalValue::isDeclaration]. **) external is_declaration : llvalue -> bool = "llvm_is_declaration" + +(** [linkage g] returns the linkage of the global value [g]. + See the method [llvm::GlobalValue::getLinkage]. **) external linkage : llvalue -> linkage = "llvm_linkage" + +(** [set_linkage l g] sets the linkage of the global value [g] to [l]. + See the method [llvm::GlobalValue::setLinkage]. **) external set_linkage : linkage -> llvalue -> unit = "llvm_set_linkage" + +(** [section g] returns the linker section of the global value [g]. + See the method [llvm::GlobalValue::getSection]. **) external section : llvalue -> string = "llvm_section" + +(** [set_section s g] sets the linker section of the global value [g] to [s]. + See the method [llvm::GlobalValue::setSection]. **) external set_section : string -> llvalue -> unit = "llvm_set_section" + +(** [visibility g] returns the linker visibility of the global value [g]. + See the method [llvm::GlobalValue::getVisibility]. **) external visibility : llvalue -> visibility = "llvm_visibility" + +(** [set_visibility v g] sets the linker visibility of the global value [g] to + [v]. See the method [llvm::GlobalValue::setVisibility]. **) external set_visibility : visibility -> llvalue -> unit = "llvm_set_visibility" + +(** [alignment g] returns the required alignment of the global value [g]. + See the method [llvm::GlobalValue::getAlignment]. **) external alignment : llvalue -> int = "llvm_alignment" + +(** [set_alignment n g] sets the required alignment of the global value [g] to + [n] bytes. See the method [llvm::GlobalValue::setAlignment]. **) external set_alignment : int -> llvalue -> unit = "llvm_set_alignment" -external is_global_constant : llvalue -> bool = "llvm_is_global_constant" -external set_global_constant : bool -> llvalue -> unit - = "llvm_set_global_constant" (*--... Operations on global variables .....................................--*) + +(** [declare_global ty name m] returns a new global variable of type [ty] and + with name [name] in module [m]. If such a global variable already exists, + it is returned. If the type of the existing global differs, then a bitcast + to [ty] is returned. **) external declare_global : lltype -> string -> llmodule -> llvalue = "llvm_declare_global" + +(** [define_global name init m] returns a new global with name [name] and + initializer [init] in module [m]. If the named global already exists, it is + renamed. + See the constructor of [llvm::GlobalVariable]. **) external define_global : string -> llvalue -> llmodule -> llvalue = "llvm_define_global" + +(** [lookup_global name m] returns [Some g] if a global variable with name + [name] exists in module [m]. If no such global exists, returns [None]. + See the [llvm::GlobalVariable] constructor. **) external lookup_global : string -> llmodule -> llvalue option = "llvm_lookup_global" + +(** [delete_global gv] destroys the global variable [gv]. + See the method [llvm::GlobalVariable::eraseFromParent]. **) external delete_global : llvalue -> unit = "llvm_delete_global" + +(** [is_global_constant gv] returns [true] if the global variabile [gv] is a + constant. Returns [false] otherwise. + See the method [llvm::GlobalVariable::isConstant]. **) +external is_global_constant : llvalue -> bool = "llvm_is_global_constant" + +(** [set_global_constant c gv] sets the global variable [gv] to be a constant if + [c] is [true] and not if [c] is [false]. + See the method [llvm::GlobalVariable::setConstant]. **) +external set_global_constant : bool -> llvalue -> unit + = "llvm_set_global_constant" + +(** [has_initializer gv] returns [true] if the global variable [gv] has an + initializer and [false] otherwise. + See the method [llvm::GlobalVariable::hasInitializer]. **) +external has_initializer : llvalue -> bool = "llvm_has_initializer" + +(** [global_initializer gv] returns the initializer for the global variable + [gv]. See the method [llvm::GlobalVariable::getInitializer]. **) external global_initializer : llvalue -> llvalue = "LLVMGetInitializer" + +(** [set_initializer c gv] sets the initializer for the global variable + [gv] to the constant [c]. + See the method [llvm::GlobalVariable::setInitializer]. **) external set_initializer : llvalue -> llvalue -> unit = "llvm_set_initializer" + +(** [remove_initializer gv] unsets the initializer for the global variable + [gv]. + See the method [llvm::GlobalVariable::setInitializer]. **) external remove_initializer : llvalue -> unit = "llvm_remove_initializer" + +(** [is_thread_local gv] returns [true] if the global variable [gv] is + thread-local and [false] otherwise. + See the method [llvm::GlobalVariable::isThreadLocal]. **) external is_thread_local : llvalue -> bool = "llvm_is_thread_local" + +(** [set_thread_local c gv] sets the global variable [gv] to be thread local if + [c] is [true] and not otherwise. + See the method [llvm::GlobalVariable::setThreadLocal]. **) external set_thread_local : bool -> llvalue -> unit = "llvm_set_thread_local" (*--... Operations on functions ............................................--*) + +(** [declare_function name ty m] returns a new function of type [ty] and + with name [name] in module [m]. If such a function already exists, + it is returned. If the type of the existing function differs, then a bitcast + to [ty] is returned. **) external declare_function : string -> lltype -> llmodule -> llvalue = "llvm_declare_function" + +(** [define_function name ty m] creates a new function with name [name] and + type [ty] in module [m]. If the named function already exists, it is + renamed. An entry basic block is created in the function. + See the constructor of [llvm::GlobalVariable]. **) external define_function : string -> lltype -> llmodule -> llvalue = "llvm_define_function" + +(** [lookup_function name m] returns [Some f] if a function with name + [name] exists in module [m]. If no such function exists, returns [None]. + See the method [llvm::Module] constructor. **) external lookup_function : string -> llmodule -> llvalue option = "llvm_lookup_function" + +(** [delete_function f] destroys the function [f]. + See the method [llvm::Function::eraseFromParent]. **) external delete_function : llvalue -> unit = "llvm_delete_function" + +(** [params f] returns the parameters of function [f]. + See the method [llvm::Function::getArgumentList]. **) external params : llvalue -> llvalue array = "llvm_params" + +(** [param f n] returns the [n]th parameter of function [f]. + See the method [llvm::Function::getArgumentList]. **) external param : llvalue -> int -> llvalue = "llvm_param" + +(** [is_intrinsic f] returns true if the function [f] is an intrinsic. + See the method [llvm::Function::isIntrinsic]. **) external is_intrinsic : llvalue -> bool = "llvm_is_intrinsic" + +(** [function_call_conv f] returns the calling convention of the function [f]. + See the method [llvm::Function::getCallingConv]. **) external function_call_conv : llvalue -> int = "llvm_function_call_conv" + +(** [set_function_call_conv cc f] sets the calling convention of the function + [f] to the calling convention numbered [cc]. + See the method [llvm::Function::setCallingConv]. **) external set_function_call_conv : int -> llvalue -> unit = "llvm_set_function_call_conv" (*--... Operations on basic blocks .........................................--*) + +(** [basic_blocks fn] returns the basic blocks of the function [f]. + See the method [llvm::Function::getBasicBlockList]. **) external basic_blocks : llvalue -> llbasicblock array = "llvm_basic_blocks" + +(** [entry_block fn] returns the entry basic block of the function [f]. + See the method [llvm::Function::getEntryBlock]. **) external entry_block : llvalue -> llbasicblock = "LLVMGetEntryBasicBlock" + +(** [delete_block bb] deletes the basic block [bb]. + See the method [llvm::BasicBlock::eraseFromParent]. **) external delete_block : llbasicblock -> unit = "llvm_delete_block" + +(** [append_block name f] creates a new basic block named [name] at the end of + function [f]. + See the constructor of [llvm::BasicBlock]. **) external append_block : string -> llvalue -> llbasicblock = "llvm_append_block" + +(** [insert_block name bb] creates a new basic block named [name] before the + basic block [bb]. + See the constructor of [llvm::BasicBlock]. **) external insert_block : string -> llbasicblock -> llbasicblock = "llvm_insert_block" + +(** [value_of_block bb] losslessly casts [bb] to an [llvalue]. **) external value_of_block : llbasicblock -> llvalue = "LLVMBasicBlockAsValue" + +(** [value_is_block v] returns [true] if the value [v] is a basic block and + [false] otherwise. + Similar to [llvm::isa]. **) external value_is_block : llvalue -> bool = "llvm_value_is_block" + +(** [block_of_value v] losslessly casts [v] to an [llbasicblock]. **) external block_of_value : llvalue -> llbasicblock = "LLVMValueAsBasicBlock" (*--... Operations on phi nodes ............................................--*) + +(** [add_incoming (v, bb) pn] adds the value [v] to the phi node [pn] for use + with branches from [bb]. See the method [llvm::PHINode::addIncoming]. **) external add_incoming : (llvalue * llbasicblock) -> llvalue -> unit = "llvm_add_incoming" + +(** [incoming pn] returns the list of value-block pairs for phi node [pn]. + See the method [llvm::PHINode::getIncomingValue]. **) external incoming : llvalue -> (llvalue * llbasicblock) list = "llvm_incoming" (*===-- Instruction builders ----------------------------------------------===*) + +(** [builder_before ins] creates an instruction builder positioned before the + instruction [isn]. See the constructor for [llvm::LLVMBuilder]. **) external builder_before : llvalue -> llbuilder = "llvm_builder_before" + +(** [builder_at_end bb] creates an instruction builder positioned at the end of + the basic block [bb]. See the constructor for [llvm::LLVMBuilder]. **) external builder_at_end : llbasicblock -> llbuilder = "llvm_builder_at_end" + +(** [position_before ins b] moves the instruction builder [b] to before the + instruction [isn]. See the method [llvm::LLVMBuilder::SetInsertPoint]. **) external position_before : llvalue -> llbuilder -> unit = "llvm_position_before" + +(** [position_at_end bb b] moves the instruction builder [b] to the end of the + basic block [bb]. See the method [llvm::LLVMBuilder::SetInsertPoint]. **) external position_at_end : llbasicblock -> llbuilder -> unit = "llvm_position_at_end" (*--... Terminators ........................................................--*) + +(** [build_ret_void b] creates a + [ret void] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateRetVoid]. **) external build_ret_void : llbuilder -> llvalue = "llvm_build_ret_void" + +(** [build_ret v b] creates a + [ret %v] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateRet]. **) external build_ret : llvalue -> llbuilder -> llvalue = "llvm_build_ret" + +(** [build_br bb b] creates a + [b %bb] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateBr]. **) external build_br : llbasicblock -> llbuilder -> llvalue = "llvm_build_br" + +(** [build_cond_br cond tbb fbb b] creates a + [b %cond, %tbb, %fbb] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateCondBr]. **) external build_cond_br : llvalue -> llbasicblock -> llbasicblock -> llbuilder -> llvalue = "llvm_build_cond_br" + +(** [build_switch case elsebb b] creates an empty + [switch %case, %elsebb] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateSwitch]. **) external build_switch : llvalue -> llbasicblock -> int -> llbuilder -> llvalue = "llvm_build_switch" + +(** [build_invoke fn args tobb unwindbb name b] creates an + [%name = invoke %fn(args) to %tobb unwind %unwindbb] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateInvoke]. **) external build_invoke : llvalue -> llvalue array -> llbasicblock -> llbasicblock -> string -> llbuilder -> llvalue = "llvm_build_invoke_bc" "llvm_build_invoke_nat" + +(** [build_unwind b] creates an + [unwind] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateUnwind]. **) external build_unwind : llbuilder -> llvalue = "llvm_build_unwind" + +(** [build_unreachable b] creates an + [unreachable] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateUnwind]. **) external build_unreachable : llbuilder -> llvalue = "llvm_build_unreachable" (*--... Arithmetic .........................................................--*) + +(** [build_add x y name b] creates a + [%name = add %x, %y] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateAdd]. **) external build_add : llvalue -> llvalue -> string -> llbuilder -> llvalue = "llvm_build_add" + +(** [build_sub x y name b] creates a + [%name = sub %x, %y] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateSub]. **) external build_sub : llvalue -> llvalue -> string -> llbuilder -> llvalue = "llvm_build_sub" + +(** [build_mul x y name b] creates a + [%name = mul %x, %y] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateMul]. **) external build_mul : llvalue -> llvalue -> string -> llbuilder -> llvalue = "llvm_build_mul" + +(** [build_udiv x y name b] creates a + [%name = udiv %x, %y] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateUDiv]. **) external build_udiv : llvalue -> llvalue -> string -> llbuilder -> llvalue = "llvm_build_udiv" + +(** [build_sdiv x y name b] creates a + [%name = sdiv %x, %y] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateSDiv]. **) external build_sdiv : llvalue -> llvalue -> string -> llbuilder -> llvalue = "llvm_build_sdiv" + +(** [build_fdiv x y name b] creates a + [%name = fdiv %x, %y] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateFDiv]. **) external build_fdiv : llvalue -> llvalue -> string -> llbuilder -> llvalue = "llvm_build_fdiv" + +(** [build_urem x y name b] creates a + [%name = urem %x, %y] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateURem]. **) external build_urem : llvalue -> llvalue -> string -> llbuilder -> llvalue = "llvm_build_urem" + +(** [build_SRem x y name b] creates a + [%name = srem %x, %y] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateSRem]. **) external build_srem : llvalue -> llvalue -> string -> llbuilder -> llvalue = "llvm_build_srem" + +(** [build_frem x y name b] creates a + [%name = frem %x, %y] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateFRem]. **) external build_frem : llvalue -> llvalue -> string -> llbuilder -> llvalue = "llvm_build_frem" + +(** [build_shl x y name b] creates a + [%name = shl %x, %y] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateShl]. **) external build_shl : llvalue -> llvalue -> string -> llbuilder -> llvalue = "llvm_build_shl" + +(** [build_lshr x y name b] creates a + [%name = lshr %x, %y] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateLShr]. **) external build_lshr : llvalue -> llvalue -> string -> llbuilder -> llvalue = "llvm_build_lshr" + +(** [build_ashr x y name b] creates a + [%name = ashr %x, %y] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateAShr]. **) external build_ashr : llvalue -> llvalue -> string -> llbuilder -> llvalue = "llvm_build_ashr" + +(** [build_and x y name b] creates a + [%name = and %x, %y] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateAnd]. **) external build_and : llvalue -> llvalue -> string -> llbuilder -> llvalue = "llvm_build_and" + +(** [build_or x y name b] creates a + [%name = or %x, %y] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateOr]. **) external build_or : llvalue -> llvalue -> string -> llbuilder -> llvalue = "llvm_build_or" + +(** [build_xor x y name b] creates a + [%name = xor %x, %y] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateXor]. **) external build_xor : llvalue -> llvalue -> string -> llbuilder -> llvalue = "llvm_build_xor" + +(** [build_neg x name b] creates a + [%name = sub 0, %x] + instruction at the position specified by the instruction builder [b]. + [-0.0] is used for floating point types to compute the correct sign. + See the method [llvm::LLVMBuilder::CreateNeg]. **) external build_neg : llvalue -> string -> llbuilder -> llvalue = "llvm_build_neg" + +(** [build_xor x name b] creates a + [%name = xor %x, -1] + instruction at the position specified by the instruction builder [b]. + [-1] is the correct "all ones" value for the type of [x]. + See the method [llvm::LLVMBuilder::CreateXor]. **) external build_not : llvalue -> string -> llbuilder -> llvalue = "llvm_build_not" (*--... Memory .............................................................--*) + +(** [build_malloc ty name b] creates a + [%name = malloc %ty] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateAlloca]. **) external build_malloc : lltype -> string -> llbuilder -> llvalue = "llvm_build_malloc" + +(** [build_array_malloc ty n name b] creates a + [%name = malloc %ty, %n] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateMalloc]. **) external build_array_malloc : lltype -> llvalue -> string -> llbuilder -> llvalue = "llvm_build_array_malloc" + +(** [build_alloca ty name b] creates a + [%name = alloca %ty] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateAlloca]. **) external build_alloca : lltype -> string -> llbuilder -> llvalue = "llvm_build_alloca" + +(** [build_array_alloca ty n name b] creates a + [%name = alloca %ty, %n] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateAlloca]. **) external build_array_alloca : lltype -> llvalue -> string -> llbuilder -> llvalue = "llvm_build_array_alloca" + +(** [build_free v b] creates a + [free %v] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateFree]. **) external build_free : llvalue -> llbuilder -> llvalue = "llvm_build_free" + +(** [build_load v name b] creates a + [%name = load %v] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateLoad]. **) external build_load : llvalue -> string -> llbuilder -> llvalue = "llvm_build_load" + +(** [build_store v p b] creates a + [store %v, %p] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateStore]. **) external build_store : llvalue -> llvalue -> llbuilder -> llvalue = "llvm_build_store" + +(** [build_store p indices name b] creates a + [%name = gep %p, indices...] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateGetElementPtr]. **) external build_gep : llvalue -> llvalue array -> string -> llbuilder -> llvalue = "llvm_build_gep" (*--... Casts ..............................................................--*) + +(** [build_trunc v ty name b] creates a + [%name = trunc %p to %ty] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateTrunc]. **) external build_trunc : llvalue -> lltype -> string -> llbuilder -> llvalue = "llvm_build_trunc" + +(** [build_zext v ty name b] creates a + [%name = zext %p to %ty] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateZExt]. **) external build_zext : llvalue -> lltype -> string -> llbuilder -> llvalue = "llvm_build_zext" + +(** [build_sext v ty name b] creates a + [%name = sext %p to %ty] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateSExt]. **) external build_sext : llvalue -> lltype -> string -> llbuilder -> llvalue = "llvm_build_sext" + +(** [build_fptoui v ty name b] creates a + [%name = fptoui %p to %ty] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateFPToUI]. **) external build_fptoui : llvalue -> lltype -> string -> llbuilder -> llvalue = "llvm_build_fptoui" + +(** [build_fptosi v ty name b] creates a + [%name = fptosi %p to %ty] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateFPToSI]. **) external build_fptosi : llvalue -> lltype -> string -> llbuilder -> llvalue = "llvm_build_fptosi" + +(** [build_uitofp v ty name b] creates a + [%name = uitofp %p to %ty] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateUIToFP]. **) external build_uitofp : llvalue -> lltype -> string -> llbuilder -> llvalue = "llvm_build_uitofp" + +(** [build_sitofp v ty name b] creates a + [%name = sitofp %p to %ty] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateSIToFP]. **) external build_sitofp : llvalue -> lltype -> string -> llbuilder -> llvalue = "llvm_build_sitofp" + +(** [build_fptrunc v ty name b] creates a + [%name = fptrunc %p to %ty] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateFPTrunc]. **) external build_fptrunc : llvalue -> lltype -> string -> llbuilder -> llvalue = "llvm_build_fptrunc" + +(** [build_fpext v ty name b] creates a + [%name = fpext %p to %ty] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateFPExt]. **) external build_fpext : llvalue -> lltype -> string -> llbuilder -> llvalue = "llvm_build_fpext" + +(** [build_ptrtoint v ty name b] creates a + [%name = prtotint %p to %ty] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreatePtrToInt]. **) external build_ptrtoint : llvalue -> lltype -> string -> llbuilder -> llvalue = "llvm_build_prttoint" + +(** [build_inttoptr v ty name b] creates a + [%name = inttoptr %p to %ty] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateIntToPtr]. **) external build_inttoptr : llvalue -> lltype -> string -> llbuilder -> llvalue = "llvm_build_inttoptr" + +(** [build_bitcast v ty name b] creates a + [%name = bitcast %p to %ty] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateBitcast]. **) external build_bitcast : llvalue -> lltype -> string -> llbuilder -> llvalue = "llvm_build_bitcast" (*--... Comparisons ........................................................--*) + +(** [build_icmp pred x y name b] creates a + [%name = icmp %pred %x, %y] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateICmp]. **) external build_icmp : int_predicate -> llvalue -> llvalue -> string -> llbuilder -> llvalue = "llvm_build_icmp" + +(** [build_fcmp pred x y name b] creates a + [%name = fcmp %pred %x, %y] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateFCmp]. **) external build_fcmp : real_predicate -> llvalue -> llvalue -> string -> llbuilder -> llvalue = "llvm_build_fcmp" (*--... Miscellaneous instructions .........................................--*) + +(** [build_phi incoming name b] creates a + [%name = phi %incoming] + instruction at the position specified by the instruction builder [b]. + [incoming] is a list of [(llvalue, llbasicblock)] tuples. + See the method [llvm::LLVMBuilder::CreatePHI]. **) external build_phi : (llvalue * llbasicblock) list -> string -> llbuilder -> llvalue = "llvm_build_phi" + +(** [build_call fn args name b] creates a + [%name = call %fn(args...)] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateCall]. **) external build_call : llvalue -> llvalue array -> string -> llbuilder -> llvalue = "llvm_build_call" + +(** [build_select cond thenv elsev name b] creates a + [%name = select %cond, %thenv, %elsev] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateSelect]. **) external build_select : llvalue -> llvalue -> llvalue -> string -> llbuilder -> llvalue = "llvm_build_select" + +(** [build_va_arg valist argty name b] creates a + [%name = va_arg %valist, %argty] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateVAArg]. **) external build_va_arg : llvalue -> lltype -> string -> llbuilder -> llvalue = "llvm_build_va_arg" + +(** [build_extractelement vec i name b] creates a + [%name = extractelement %vec, %i] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateExtractElement]. **) external build_extractelement : llvalue -> llvalue -> string -> llbuilder -> llvalue = "llvm_build_extractelement" + +(** [build_insertelement vec elt i name b] creates a + [%name = insertelement %vec, %elt, %i] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateInsertElement]. **) external build_insertelement : llvalue -> llvalue -> llvalue -> string -> llbuilder -> llvalue = "llvm_build_insertelement" + +(** [build_shufflevector veca vecb mask name b] creates a + [%name = shufflevector %veca, %vecb, %mask] + instruction at the position specified by the instruction builder [b]. + See the method [llvm::LLVMBuilder::CreateShuffleVector]. **) external build_shufflevector : llvalue -> llvalue -> llvalue -> string -> llbuilder -> llvalue = "llvm_build_shufflevector" Modified: llvm/trunk/bindings/ocaml/llvm/llvm_ocaml.c URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/ocaml/llvm/llvm_ocaml.c?rev=44494&r1=44493&r2=44494&view=diff ============================================================================== --- llvm/trunk/bindings/ocaml/llvm/llvm_ocaml.c (original) +++ llvm/trunk/bindings/ocaml/llvm/llvm_ocaml.c Sat Dec 1 15:01:15 2007 @@ -57,13 +57,6 @@ return Val_int(LLVMGetTypeKind(Ty)); } -/* lltype -> lltype -> unit */ -CAMLprim value llvm_refine_abstract_type(LLVMTypeRef ConcreteTy, - LLVMTypeRef AbstractTy) { - LLVMRefineAbstractType(AbstractTy, ConcreteTy); - return Val_unit; -} - /*--... Operations on integer types ........................................--*/ /* unit -> lltype */ From evan.cheng at apple.com Sun Dec 2 02:30:39 2007 From: evan.cheng at apple.com (Evan Cheng) Date: Sun, 02 Dec 2007 08:30:39 -0000 Subject: [llvm-commits] [llvm] r44517 - in /llvm/trunk: include/llvm/CodeGen/ include/llvm/Target/ lib/CodeGen/ lib/Target/ARM/ lib/Target/Alpha/ lib/Target/Mips/ lib/Target/PowerPC/ lib/Target/Sparc/ lib/Target/X86/ Message-ID: <200712020830.lB28Ueke027116@zion.cs.uiuc.edu> Author: evancheng Date: Sun Dec 2 02:30:39 2007 New Revision: 44517 URL: http://llvm.org/viewvc/llvm-project?rev=44517&view=rev Log: Remove redundant foldMemoryOperand variants and other code clean up. Modified: llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h llvm/trunk/include/llvm/Target/MRegisterInfo.h llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp llvm/trunk/lib/CodeGen/RegAllocBigBlock.cpp llvm/trunk/lib/CodeGen/RegAllocLocal.cpp llvm/trunk/lib/CodeGen/VirtRegMap.cpp llvm/trunk/lib/CodeGen/VirtRegMap.h llvm/trunk/lib/Target/ARM/ARMRegisterInfo.cpp llvm/trunk/lib/Target/ARM/ARMRegisterInfo.h llvm/trunk/lib/Target/Alpha/AlphaRegisterInfo.cpp llvm/trunk/lib/Target/Alpha/AlphaRegisterInfo.h llvm/trunk/lib/Target/Mips/MipsRegisterInfo.cpp llvm/trunk/lib/Target/Mips/MipsRegisterInfo.h llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.cpp llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.h llvm/trunk/lib/Target/Sparc/SparcRegisterInfo.cpp llvm/trunk/lib/Target/Sparc/SparcRegisterInfo.h llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp llvm/trunk/lib/Target/X86/X86RegisterInfo.h Modified: llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h?rev=44517&r1=44516&r2=44517&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h (original) +++ llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h Sun Dec 2 02:30:39 2007 @@ -275,8 +275,7 @@ /// returns true. bool tryFoldMemoryOperand(MachineInstr* &MI, VirtRegMap &vrm, MachineInstr *DefMI, unsigned InstrIdx, - unsigned OpIdx, - SmallVector &UseOps, + SmallVector &Ops, bool isSS, int Slot, unsigned Reg); /// anyKillInMBBAfterIdx - Returns true if there is a kill of the specified Modified: llvm/trunk/include/llvm/Target/MRegisterInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/MRegisterInfo.h?rev=44517&r1=44516&r2=44517&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/MRegisterInfo.h (original) +++ llvm/trunk/include/llvm/Target/MRegisterInfo.h Sun Dec 2 02:30:39 2007 @@ -533,20 +533,13 @@ const MachineInstr *Orig) const = 0; /// foldMemoryOperand - Attempt to fold a load or store of the specified stack - /// slot into the specified machine instruction for the specified operand. If - /// this is possible, a new instruction is returned with the specified operand - /// folded, otherwise NULL is returned. The client is responsible for removing - /// the old instruction and adding the new one in the instruction stream + /// slot into the specified machine instruction for the specified operand(s). + /// If this is possible, a new instruction is returned with the specified + /// operand folded, otherwise NULL is returned. The client is responsible for + /// removing the old instruction and adding the new one in the instruction + /// stream. virtual MachineInstr* foldMemoryOperand(MachineInstr* MI, - unsigned OpNum, - int FrameIndex) const { - return 0; - } - - /// foldMemoryOperand - Same as previous except it tries to fold instruction - /// with multiple uses of the same register. - virtual MachineInstr* foldMemoryOperand(MachineInstr* MI, - SmallVectorImpl &UseOps, + SmallVectorImpl &Ops, int FrameIndex) const { return 0; } @@ -555,15 +548,7 @@ /// of any load and store from / to any address, not just from a specific /// stack slot. virtual MachineInstr* foldMemoryOperand(MachineInstr* MI, - unsigned OpNum, - MachineInstr* LoadMI) const { - return 0; - } - - /// foldMemoryOperand - Same as previous except it tries to fold instruction - /// with multiple uses of the same register. - virtual MachineInstr* foldMemoryOperand(MachineInstr* MI, - SmallVectorImpl &UseOps, + SmallVectorImpl &Ops, MachineInstr* LoadMI) const { return 0; } Modified: llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp?rev=44517&r1=44516&r2=44517&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp (original) +++ llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Sun Dec 2 02:30:39 2007 @@ -643,28 +643,32 @@ /// returns true. bool LiveIntervals::tryFoldMemoryOperand(MachineInstr* &MI, VirtRegMap &vrm, MachineInstr *DefMI, - unsigned InstrIdx, unsigned OpIdx, - SmallVector &UseOps, + unsigned InstrIdx, + SmallVector &Ops, bool isSS, int Slot, unsigned Reg) { - // FIXME: fold subreg use - if (MI->getOperand(OpIdx).getSubReg()) - return false; - - MachineInstr *fmi = NULL; - - if (UseOps.size() < 2) - fmi = isSS ? mri_->foldMemoryOperand(MI, OpIdx, Slot) - : mri_->foldMemoryOperand(MI, OpIdx, DefMI); - else { - if (OpIdx != UseOps[0]) - // Must be two-address instruction + one more use. Not going to fold. + unsigned MRInfo = 0; + const TargetInstrDescriptor *TID = MI->getInstrDescriptor(); + SmallVector FoldOps; + for (unsigned i = 0, e = Ops.size(); i != e; ++i) { + unsigned OpIdx = Ops[i]; + // FIXME: fold subreg use. + if (MI->getOperand(OpIdx).getSubReg()) return false; - // It may be possible to fold load when there are multiple uses. - // e.g. On x86, TEST32rr r, r -> CMP32rm [mem], 0 - fmi = isSS ? mri_->foldMemoryOperand(MI, UseOps, Slot) - : mri_->foldMemoryOperand(MI, UseOps, DefMI); + if (MI->getOperand(OpIdx).isDef()) + MRInfo |= (unsigned)VirtRegMap::isMod; + else { + // Filter out two-address use operand(s). + if (TID->getOperandConstraint(OpIdx, TOI::TIED_TO) != -1) { + MRInfo = VirtRegMap::isModRef; + continue; + } + MRInfo |= (unsigned)VirtRegMap::isRef; + } + FoldOps.push_back(OpIdx); } + MachineInstr *fmi = isSS ? mri_->foldMemoryOperand(MI, FoldOps, Slot) + : mri_->foldMemoryOperand(MI, FoldOps, DefMI); if (fmi) { // Attempt to fold the memory reference into the instruction. If // we can do this, we don't need to insert spill code. @@ -674,7 +678,7 @@ LiveVariables::transferKillDeadInfo(MI, fmi, mri_); MachineBasicBlock &MBB = *MI->getParent(); if (isSS && !mf_->getFrameInfo()->isFixedObjectIndex(Slot)) - vrm.virtFolded(Reg, MI, OpIdx, fmi); + vrm.virtFolded(Reg, MI, fmi, (VirtRegMap::ModRef)MRInfo); vrm.transferSpillPts(MI, fmi); vrm.transferRestorePts(MI, fmi); mi2iMap_.erase(MI); @@ -775,28 +779,25 @@ HasUse = mop.isUse(); HasDef = mop.isDef(); - SmallVector UseOps; - if (HasUse) - UseOps.push_back(i); - std::vector UpdateOps; + SmallVector Ops; + Ops.push_back(i); for (unsigned j = i+1, e = MI->getNumOperands(); j != e; ++j) { - if (!MI->getOperand(j).isRegister()) + const MachineOperand &MOj = MI->getOperand(j); + if (!MOj.isRegister()) continue; - unsigned RegJ = MI->getOperand(j).getReg(); + unsigned RegJ = MOj.getReg(); if (RegJ == 0 || MRegisterInfo::isPhysicalRegister(RegJ)) continue; if (RegJ == RegI) { - UpdateOps.push_back(j); - if (MI->getOperand(j).isUse()) - UseOps.push_back(j); - HasUse |= MI->getOperand(j).isUse(); - HasDef |= MI->getOperand(j).isDef(); + Ops.push_back(j); + HasUse |= MOj.isUse(); + HasDef |= MOj.isDef(); } } if (TryFold && - tryFoldMemoryOperand(MI, vrm, ReMatDefMI, index, i, - UseOps, FoldSS, FoldSlot, Reg)) { + tryFoldMemoryOperand(MI, vrm, ReMatDefMI, index, + Ops, FoldSS, FoldSlot, Reg)) { // Folding the load/store can completely change the instruction in // unpredictable ways, rescan it from the beginning. HasUse = false; @@ -814,8 +815,8 @@ mop.setReg(NewVReg); // Reuse NewVReg for other reads. - for (unsigned j = 0, e = UpdateOps.size(); j != e; ++j) - MI->getOperand(UpdateOps[j]).setReg(NewVReg); + for (unsigned j = 0, e = Ops.size(); j != e; ++j) + MI->getOperand(Ops[j]).setReg(NewVReg); if (CreatedNewVReg) { if (DefIsReMat) { @@ -1226,7 +1227,7 @@ if (!TrySplit) return NewLIs; - SmallVector UseOps; + SmallVector Ops; if (NeedStackSlot) { int Id = SpillMBBs.find_first(); while (Id != -1) { @@ -1236,41 +1237,43 @@ unsigned VReg = spills[i].vreg; bool isReMat = vrm.isReMaterialized(VReg); MachineInstr *MI = getInstructionFromIndex(index); - int OpIdx = -1; - UseOps.clear(); + bool CanFold = false; + bool FoundUse = false; + Ops.clear(); if (spills[i].canFold) { + CanFold = true; for (unsigned j = 0, ee = MI->getNumOperands(); j != ee; ++j) { MachineOperand &MO = MI->getOperand(j); if (!MO.isRegister() || MO.getReg() != VReg) continue; - if (MO.isDef()) { - OpIdx = (int)j; + + Ops.push_back(j); + if (MO.isDef()) continue; - } - // Can't fold if it's two-address code and the use isn't the - // first and only use. - if (isReMat || - (UseOps.empty() && !alsoFoldARestore(Id, index, VReg, - RestoreMBBs, RestoreIdxes))) { - OpIdx = -1; + if (isReMat || + (!FoundUse && !alsoFoldARestore(Id, index, VReg, + RestoreMBBs, RestoreIdxes))) { + // MI has two-address uses of the same register. If the use + // isn't the first and only use in the BB, then we can't fold + // it. FIXME: Move this to rewriteInstructionsForSpills. + CanFold = false; break; } - UseOps.push_back(j); + FoundUse = true; } } // Fold the store into the def if possible. bool Folded = false; - if (OpIdx != -1) { - if (tryFoldMemoryOperand(MI, vrm, NULL, index, OpIdx, UseOps, - true, Slot, VReg)) { - if (!UseOps.empty()) - // Folded a two-address instruction, do not issue a load. - eraseRestoreInfo(Id, index, VReg, RestoreMBBs, RestoreIdxes); + if (CanFold && !Ops.empty()) { + if (tryFoldMemoryOperand(MI, vrm, NULL, index, Ops, true, Slot,VReg)){ Folded = true; + if (FoundUse > 0) + // Also folded uses, do not issue a load. + eraseRestoreInfo(Id, index, VReg, RestoreMBBs, RestoreIdxes); } } - // Else tell the spiller to issue a store for us. + // Else tell the spiller to issue a spill. if (!Folded) vrm.addSpillPoint(VReg, MI); } @@ -1287,41 +1290,40 @@ continue; unsigned VReg = restores[i].vreg; MachineInstr *MI = getInstructionFromIndex(index); - int OpIdx = -1; - UseOps.clear(); + bool CanFold = false; + Ops.clear(); if (restores[i].canFold) { + CanFold = true; for (unsigned j = 0, ee = MI->getNumOperands(); j != ee; ++j) { MachineOperand &MO = MI->getOperand(j); if (!MO.isRegister() || MO.getReg() != VReg) continue; + if (MO.isDef()) { - // Can't fold if it's two-address code and it hasn't already - // been folded. - OpIdx = -1; + // If this restore were to be folded, it would have been folded + // already. + CanFold = false; break; } - if (UseOps.empty()) - // Use the first use index. - OpIdx = (int)j; - UseOps.push_back(j); + Ops.push_back(j); } } // Fold the load into the use if possible. bool Folded = false; - if (OpIdx != -1) { - if (vrm.isReMaterialized(VReg)) { + if (CanFold && !Ops.empty()) { + if (!vrm.isReMaterialized(VReg)) + Folded = tryFoldMemoryOperand(MI, vrm, NULL,index,Ops,true,Slot,VReg); + else { MachineInstr *ReMatDefMI = vrm.getReMaterializedMI(VReg); int LdSlot = 0; bool isLoadSS = tii_->isLoadFromStackSlot(ReMatDefMI, LdSlot); // If the rematerializable def is a load, also try to fold it. if (isLoadSS || (ReMatDefMI->getInstrDescriptor()->Flags & M_LOAD_FLAG)) - Folded = tryFoldMemoryOperand(MI, vrm, ReMatDefMI, index, OpIdx, - UseOps, isLoadSS, LdSlot, VReg); - } else - Folded = tryFoldMemoryOperand(MI, vrm, NULL, index, OpIdx, UseOps, - true, Slot, VReg); + Folded = tryFoldMemoryOperand(MI, vrm, ReMatDefMI, index, + Ops, isLoadSS, LdSlot, VReg); + } } // If folding is not possible / failed, then tell the spiller to issue a // load / rematerialization for us. Modified: llvm/trunk/lib/CodeGen/RegAllocBigBlock.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/RegAllocBigBlock.cpp?rev=44517&r1=44516&r2=44517&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/RegAllocBigBlock.cpp (original) +++ llvm/trunk/lib/CodeGen/RegAllocBigBlock.cpp Sun Dec 2 02:30:39 2007 @@ -520,7 +520,9 @@ assignVirtToPhysReg(VirtReg, PhysReg); } else { // no free registers available. // try to fold the spill into the instruction - if(MachineInstr* FMI = RegInfo->foldMemoryOperand(MI, OpNum, FrameIndex)) { + SmallVector Ops; + Ops.push_back(OpNum); + if(MachineInstr* FMI = RegInfo->foldMemoryOperand(MI, Ops, FrameIndex)) { ++NumFolded; // Since we changed the address of MI, make sure to update live variables // to know that the new instruction has the properties of the old one. Modified: llvm/trunk/lib/CodeGen/RegAllocLocal.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/RegAllocLocal.cpp?rev=44517&r1=44516&r2=44517&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/RegAllocLocal.cpp (original) +++ llvm/trunk/lib/CodeGen/RegAllocLocal.cpp Sun Dec 2 02:30:39 2007 @@ -473,7 +473,9 @@ assignVirtToPhysReg(VirtReg, PhysReg); } else { // No registers available. // If we can fold this spill into this instruction, do so now. - if (MachineInstr* FMI = RegInfo->foldMemoryOperand(MI, OpNum, FrameIndex)){ + SmallVector Ops; + Ops.push_back(OpNum); + if (MachineInstr* FMI = RegInfo->foldMemoryOperand(MI, Ops, FrameIndex)) { ++NumFolded; // Since we changed the address of MI, make sure to update live variables // to know that the new instruction has the properties of the old one. Modified: llvm/trunk/lib/CodeGen/VirtRegMap.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/VirtRegMap.cpp?rev=44517&r1=44516&r2=44517&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/VirtRegMap.cpp (original) +++ llvm/trunk/lib/CodeGen/VirtRegMap.cpp Sun Dec 2 02:30:39 2007 @@ -115,7 +115,7 @@ } void VirtRegMap::virtFolded(unsigned VirtReg, MachineInstr *OldMI, - unsigned OpNo, MachineInstr *NewMI) { + MachineInstr *NewMI, ModRef MRInfo) { // Move previous memory references folded to new instruction. MI2VirtMapTy::iterator IP = MI2VirtMap.lower_bound(NewMI); for (MI2VirtMapTy::iterator I = MI2VirtMap.lower_bound(OldMI), @@ -124,18 +124,6 @@ MI2VirtMap.erase(I++); } - ModRef MRInfo; - const TargetInstrDescriptor *TID = OldMI->getInstrDescriptor(); - if (TID->getOperandConstraint(OpNo, TOI::TIED_TO) != -1 || - TID->findTiedToSrcOperand(OpNo) != -1) { - // Folded a two-address operand. - MRInfo = isModRef; - } else if (OldMI->getOperand(OpNo).isDef()) { - MRInfo = isMod; - } else { - MRInfo = isRef; - } - // add new memory reference MI2VirtMap.insert(IP, std::make_pair(NewMI, std::make_pair(VirtReg, MRInfo))); } @@ -830,7 +818,9 @@ NewMIs.clear(); int Idx = NewMI->findRegisterUseOperandIdx(VirtReg); assert(Idx != -1); - MachineInstr *FoldedMI = MRI->foldMemoryOperand(NewMI, Idx, SS); + SmallVector Ops; + Ops.push_back(Idx); + MachineInstr *FoldedMI = MRI->foldMemoryOperand(NewMI, Ops, SS); if (FoldedMI) { if (!VRM.hasPhys(UnfoldVR)) VRM.assignVirt2Phys(UnfoldVR, UnfoldPR); Modified: llvm/trunk/lib/CodeGen/VirtRegMap.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/VirtRegMap.h?rev=44517&r1=44516&r2=44517&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/VirtRegMap.h (original) +++ llvm/trunk/lib/CodeGen/VirtRegMap.h Sun Dec 2 02:30:39 2007 @@ -280,10 +280,9 @@ } /// @brief Updates information about the specified virtual register's value - /// folded into newMI machine instruction. The OpNum argument indicates the - /// operand number of OldMI that is folded. - void virtFolded(unsigned VirtReg, MachineInstr *OldMI, unsigned OpNum, - MachineInstr *NewMI); + /// folded into newMI machine instruction. + void virtFolded(unsigned VirtReg, MachineInstr *OldMI, MachineInstr *NewMI, + ModRef MRInfo); /// @brief Updates information about the specified virtual register's value /// folded into the specified machine instruction. Modified: llvm/trunk/lib/Target/ARM/ARMRegisterInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMRegisterInfo.cpp?rev=44517&r1=44516&r2=44517&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/ARMRegisterInfo.cpp (original) +++ llvm/trunk/lib/Target/ARM/ARMRegisterInfo.cpp Sun Dec 2 02:30:39 2007 @@ -347,7 +347,11 @@ } MachineInstr *ARMRegisterInfo::foldMemoryOperand(MachineInstr *MI, - unsigned OpNum, int FI) const { + SmallVectorImpl &Ops, + int FI) const { + if (Ops.size() != 1) return NULL; + + unsigned OpNum = Ops[0]; unsigned Opc = MI->getOpcode(); MachineInstr *NewMI = NULL; switch (Opc) { Modified: llvm/trunk/lib/Target/ARM/ARMRegisterInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMRegisterInfo.h?rev=44517&r1=44516&r2=44517&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/ARMRegisterInfo.h (original) +++ llvm/trunk/lib/Target/ARM/ARMRegisterInfo.h Sun Dec 2 02:30:39 2007 @@ -74,22 +74,12 @@ void reMaterialize(MachineBasicBlock &MBB, MachineBasicBlock::iterator MI, unsigned DestReg, const MachineInstr *Orig) const; - MachineInstr* foldMemoryOperand(MachineInstr* MI, unsigned OpNum, - int FrameIndex) const; - MachineInstr* foldMemoryOperand(MachineInstr* MI, - SmallVectorImpl &UseOps, - int FrameIndex) const { - return 0; - } - - MachineInstr* foldMemoryOperand(MachineInstr* MI, unsigned OpNum, - MachineInstr* LoadMI) const { - return 0; - } + SmallVectorImpl &Ops, + int FrameIndex) const; MachineInstr* foldMemoryOperand(MachineInstr* MI, - SmallVectorImpl &UseOps, + SmallVectorImpl &Ops, MachineInstr* LoadMI) const { return 0; } Modified: llvm/trunk/lib/Target/Alpha/AlphaRegisterInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Alpha/AlphaRegisterInfo.cpp?rev=44517&r1=44516&r2=44517&view=diff ============================================================================== --- llvm/trunk/lib/Target/Alpha/AlphaRegisterInfo.cpp (original) +++ llvm/trunk/lib/Target/Alpha/AlphaRegisterInfo.cpp Sun Dec 2 02:30:39 2007 @@ -153,8 +153,10 @@ } MachineInstr *AlphaRegisterInfo::foldMemoryOperand(MachineInstr *MI, - unsigned OpNum, + SmallVectorImpl &Ops, int FrameIndex) const { + if (Ops.size() != 1) return NULL; + // Make sure this is a reg-reg copy. unsigned Opc = MI->getOpcode(); @@ -166,7 +168,7 @@ case Alpha::CPYSS: case Alpha::CPYST: if (MI->getOperand(1).getReg() == MI->getOperand(2).getReg()) { - if (OpNum == 0) { // move -> store + if (Ops[0] == 0) { // move -> store unsigned InReg = MI->getOperand(1).getReg(); Opc = (Opc == Alpha::BISr) ? Alpha::STQ : ((Opc == Alpha::CPYSS) ? Alpha::STS : Alpha::STT); Modified: llvm/trunk/lib/Target/Alpha/AlphaRegisterInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Alpha/AlphaRegisterInfo.h?rev=44517&r1=44516&r2=44517&view=diff ============================================================================== --- llvm/trunk/lib/Target/Alpha/AlphaRegisterInfo.h (original) +++ llvm/trunk/lib/Target/Alpha/AlphaRegisterInfo.h Sun Dec 2 02:30:39 2007 @@ -48,22 +48,12 @@ const TargetRegisterClass *RC, SmallVectorImpl &NewMIs) const; - MachineInstr* foldMemoryOperand(MachineInstr *MI, unsigned OpNum, - int FrameIndex) const; - MachineInstr* foldMemoryOperand(MachineInstr* MI, - SmallVectorImpl &UseOps, - int FrameIndex) const { - return 0; - } - - MachineInstr* foldMemoryOperand(MachineInstr* MI, unsigned OpNum, - MachineInstr* LoadMI) const { - return 0; - } + SmallVectorImpl &Ops, + int FrameIndex) const; MachineInstr* foldMemoryOperand(MachineInstr* MI, - SmallVectorImpl &UseOps, + SmallVectorImpl &Ops, MachineInstr* LoadMI) const { return 0; } Modified: llvm/trunk/lib/Target/Mips/MipsRegisterInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsRegisterInfo.cpp?rev=44517&r1=44516&r2=44517&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsRegisterInfo.cpp (original) +++ llvm/trunk/lib/Target/Mips/MipsRegisterInfo.cpp Sun Dec 2 02:30:39 2007 @@ -176,8 +176,11 @@ } MachineInstr *MipsRegisterInfo:: -foldMemoryOperand(MachineInstr* MI, unsigned OpNum, int FI) const +foldMemoryOperand(MachineInstr* MI, + SmallVectorImpl &Ops, int FI) const { + if (Ops.size() != 1) return NULL; + MachineInstr *NewMI = NULL; switch (MI->getOpcode()) @@ -188,10 +191,10 @@ (MI->getOperand(1).getReg() == Mips::ZERO) && (MI->getOperand(2).isRegister())) { - if (OpNum == 0) // COPY -> STORE + if (Ops[0] == 0) // COPY -> STORE NewMI = BuildMI(TII.get(Mips::SW)).addFrameIndex(FI) .addImm(0).addReg(MI->getOperand(2).getReg()); - else // COPY -> LOAD + else // COPY -> LOAD NewMI = BuildMI(TII.get(Mips::LW), MI->getOperand(0) .getReg()).addImm(0).addFrameIndex(FI); } Modified: llvm/trunk/lib/Target/Mips/MipsRegisterInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsRegisterInfo.h?rev=44517&r1=44516&r2=44517&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsRegisterInfo.h (original) +++ llvm/trunk/lib/Target/Mips/MipsRegisterInfo.h Sun Dec 2 02:30:39 2007 @@ -55,22 +55,12 @@ void reMaterialize(MachineBasicBlock &MBB, MachineBasicBlock::iterator MI, unsigned DestReg, const MachineInstr *Orig) const; - MachineInstr* foldMemoryOperand(MachineInstr* MI, unsigned OpNum, - int FrameIndex) const; - MachineInstr* foldMemoryOperand(MachineInstr* MI, - SmallVectorImpl &UseOps, - int FrameIndex) const { - return 0; - } - - MachineInstr* foldMemoryOperand(MachineInstr* MI, unsigned OpNum, - MachineInstr* LoadMI) const { - return 0; - } + SmallVectorImpl &Ops, + int FrameIndex) const; MachineInstr* foldMemoryOperand(MachineInstr* MI, - SmallVectorImpl &UseOps, + SmallVectorImpl &Ops, MachineInstr* LoadMI) const { return 0; } Modified: llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.cpp?rev=44517&r1=44516&r2=44517&view=diff ============================================================================== --- llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.cpp (original) +++ llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.cpp Sun Dec 2 02:30:39 2007 @@ -555,11 +555,14 @@ /// foldMemoryOperand - PowerPC (like most RISC's) can only fold spills into /// copy instructions, turning them into load/store instructions. MachineInstr *PPCRegisterInfo::foldMemoryOperand(MachineInstr *MI, - unsigned OpNum, - int FrameIndex) const { + SmallVectorImpl &Ops, + int FrameIndex) const { + if (Ops.size() != 1) return NULL; + // Make sure this is a reg-reg copy. Note that we can't handle MCRF, because // it takes more than one instruction to store it. unsigned Opc = MI->getOpcode(); + unsigned OpNum = Ops[0]; MachineInstr *NewMI = NULL; if ((Opc == PPC::OR && Modified: llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.h?rev=44517&r1=44516&r2=44517&view=diff ============================================================================== --- llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.h (original) +++ llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.h Sun Dec 2 02:30:39 2007 @@ -65,22 +65,12 @@ /// foldMemoryOperand - PowerPC (like most RISC's) can only fold spills into /// copy instructions, turning them into load/store instructions. - virtual MachineInstr* foldMemoryOperand(MachineInstr* MI, unsigned OpNum, - int FrameIndex) const; - virtual MachineInstr* foldMemoryOperand(MachineInstr* MI, - SmallVectorImpl &UseOps, - int FrameIndex) const { - return 0; - } - - virtual MachineInstr* foldMemoryOperand(MachineInstr* MI, unsigned OpNum, - MachineInstr* LoadMI) const { - return 0; - } + SmallVectorImpl &Ops, + int FrameIndex) const; virtual MachineInstr* foldMemoryOperand(MachineInstr* MI, - SmallVectorImpl &UseOps, + SmallVectorImpl &Ops, MachineInstr* LoadMI) const { return 0; } Modified: llvm/trunk/lib/Target/Sparc/SparcRegisterInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/SparcRegisterInfo.cpp?rev=44517&r1=44516&r2=44517&view=diff ============================================================================== --- llvm/trunk/lib/Target/Sparc/SparcRegisterInfo.cpp (original) +++ llvm/trunk/lib/Target/Sparc/SparcRegisterInfo.cpp Sun Dec 2 02:30:39 2007 @@ -148,8 +148,11 @@ } MachineInstr *SparcRegisterInfo::foldMemoryOperand(MachineInstr* MI, - unsigned OpNum, - int FI) const { + SmallVectorImpl &Ops, + int FI) const { + if (Ops.size() != 1) return NULL; + + unsigned OpNum = Ops[0]; bool isFloat = false; MachineInstr *NewMI = NULL; switch (MI->getOpcode()) { Modified: llvm/trunk/lib/Target/Sparc/SparcRegisterInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/SparcRegisterInfo.h?rev=44517&r1=44516&r2=44517&view=diff ============================================================================== --- llvm/trunk/lib/Target/Sparc/SparcRegisterInfo.h (original) +++ llvm/trunk/lib/Target/Sparc/SparcRegisterInfo.h Sun Dec 2 02:30:39 2007 @@ -59,23 +59,11 @@ unsigned DestReg, const MachineInstr *Orig) const; virtual MachineInstr* foldMemoryOperand(MachineInstr* MI, - unsigned OpNum, + SmallVectorImpl &Ops, int FrameIndex) const; virtual MachineInstr* foldMemoryOperand(MachineInstr* MI, - SmallVectorImpl &UseOps, - int FrameIndex) const { - return 0; - } - - virtual MachineInstr* foldMemoryOperand(MachineInstr* MI, - unsigned OpNum, - MachineInstr* LoadMI) const { - return 0; - } - - virtual MachineInstr* foldMemoryOperand(MachineInstr* MI, - SmallVectorImpl &UseOps, + SmallVectorImpl &Ops, MachineInstr* LoadMI) const { return 0; } Modified: llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp?rev=44517&r1=44516&r2=44517&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp (original) +++ llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp Sun Dec 2 02:30:39 2007 @@ -1140,73 +1140,58 @@ } -MachineInstr* X86RegisterInfo::foldMemoryOperand(MachineInstr *MI, unsigned OpNum, - int FrameIndex) const { - // Check switch flag - if (NoFusing) return NULL; - SmallVector MOs; - MOs.push_back(MachineOperand::CreateFrameIndex(FrameIndex)); - return foldMemoryOperand(MI, OpNum, MOs); -} - MachineInstr* X86RegisterInfo::foldMemoryOperand(MachineInstr *MI, - SmallVectorImpl &UseOps, + SmallVectorImpl &Ops, int FrameIndex) const { // Check switch flag if (NoFusing) return NULL; - if (UseOps.size() == 1) - return foldMemoryOperand(MI, UseOps[0], FrameIndex); - else if (UseOps.size() != 2 || UseOps[0] != 0 && UseOps[1] != 1) + if (Ops.size() == 2 && Ops[0] == 0 && Ops[1] == 1) { + unsigned NewOpc = 0; + switch (MI->getOpcode()) { + default: return NULL; + case X86::TEST8rr: NewOpc = X86::CMP8ri; break; + case X86::TEST16rr: NewOpc = X86::CMP16ri; break; + case X86::TEST32rr: NewOpc = X86::CMP32ri; break; + case X86::TEST64rr: NewOpc = X86::CMP64ri32; break; + } + // Change to CMPXXri r, 0 first. + MI->setInstrDescriptor(TII.get(NewOpc)); + MI->getOperand(1).ChangeToImmediate(0); + } else if (Ops.size() != 1) return NULL; - unsigned NewOpc = 0; - switch (MI->getOpcode()) { - default: return NULL; - case X86::TEST8rr: NewOpc = X86::CMP8ri; break; - case X86::TEST16rr: NewOpc = X86::CMP16ri; break; - case X86::TEST32rr: NewOpc = X86::CMP32ri; break; - case X86::TEST64rr: NewOpc = X86::CMP64ri32; break; - } - // Change to CMPXXri r, 0 first. - MI->setInstrDescriptor(TII.get(NewOpc)); - MI->getOperand(1).ChangeToImmediate(0); - return foldMemoryOperand(MI, 0, FrameIndex); -} - -MachineInstr* X86RegisterInfo::foldMemoryOperand(MachineInstr *MI, unsigned OpNum, - MachineInstr *LoadMI) const { - // Check switch flag - if (NoFusing) return NULL; SmallVector MOs; - unsigned NumOps = TII.getNumOperands(LoadMI->getOpcode()); - for (unsigned i = NumOps - 4; i != NumOps; ++i) - MOs.push_back(LoadMI->getOperand(i)); - return foldMemoryOperand(MI, OpNum, MOs); + MOs.push_back(MachineOperand::CreateFrameIndex(FrameIndex)); + return foldMemoryOperand(MI, Ops[0], MOs); } MachineInstr* X86RegisterInfo::foldMemoryOperand(MachineInstr *MI, - SmallVectorImpl &UseOps, + SmallVectorImpl &Ops, MachineInstr *LoadMI) const { // Check switch flag if (NoFusing) return NULL; - if (UseOps.size() == 1) - return foldMemoryOperand(MI, UseOps[0], LoadMI); - else if (UseOps.size() != 2 || UseOps[0] != 0 && UseOps[1] != 1) + if (Ops.size() == 2 && Ops[0] == 0 && Ops[1] == 1) { + unsigned NewOpc = 0; + switch (MI->getOpcode()) { + default: return NULL; + case X86::TEST8rr: NewOpc = X86::CMP8ri; break; + case X86::TEST16rr: NewOpc = X86::CMP16ri; break; + case X86::TEST32rr: NewOpc = X86::CMP32ri; break; + case X86::TEST64rr: NewOpc = X86::CMP64ri32; break; + } + // Change to CMPXXri r, 0 first. + MI->setInstrDescriptor(TII.get(NewOpc)); + MI->getOperand(1).ChangeToImmediate(0); + } else if (Ops.size() != 1) return NULL; - unsigned NewOpc = 0; - switch (MI->getOpcode()) { - default: return NULL; - case X86::TEST8rr: NewOpc = X86::CMP8ri; break; - case X86::TEST16rr: NewOpc = X86::CMP16ri; break; - case X86::TEST32rr: NewOpc = X86::CMP32ri; break; - case X86::TEST64rr: NewOpc = X86::CMP64ri32; break; - } - // Change to CMPXXri r, 0 first. - MI->setInstrDescriptor(TII.get(NewOpc)); - MI->getOperand(1).ChangeToImmediate(0); - return foldMemoryOperand(MI, 0, LoadMI); + + SmallVector MOs; + unsigned NumOps = TII.getNumOperands(LoadMI->getOpcode()); + for (unsigned i = NumOps - 4; i != NumOps; ++i) + MOs.push_back(LoadMI->getOperand(i)); + return foldMemoryOperand(MI, Ops[0], MOs); } Modified: llvm/trunk/lib/Target/X86/X86RegisterInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86RegisterInfo.h?rev=44517&r1=44516&r2=44517&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86RegisterInfo.h (original) +++ llvm/trunk/lib/Target/X86/X86RegisterInfo.h Sun Dec 2 02:30:39 2007 @@ -133,32 +133,19 @@ /// foldMemoryOperand - If this target supports it, fold a load or store of /// the specified stack slot into the specified machine instruction for the - /// specified operand. If this is possible, the target should perform the + /// specified operand(s). If this is possible, the target should perform the /// folding and return true, otherwise it should return false. If it folds /// the instruction, it is likely that the MachineInstruction the iterator /// references has been changed. MachineInstr* foldMemoryOperand(MachineInstr* MI, - unsigned OpNum, - int FrameIndex) const; - - /// foldMemoryOperand - Same as previous except it tries to fold instruction - /// with multiple uses of the same register. - MachineInstr* foldMemoryOperand(MachineInstr* MI, - SmallVectorImpl &UseOps, + SmallVectorImpl &Ops, int FrameIndex) const; /// foldMemoryOperand - Same as the previous version except it allows folding /// of any load and store from / to any address, not just from a specific /// stack slot. MachineInstr* foldMemoryOperand(MachineInstr* MI, - unsigned OpNum, - MachineInstr* LoadMI) const; - - /// foldMemoryOperand - Same as the previous version except it allows folding - /// of any load and store from / to any address, not just from a specific - /// stack slot. - MachineInstr* foldMemoryOperand(MachineInstr* MI, - SmallVectorImpl &UseOps, + SmallVectorImpl &Ops, MachineInstr* LoadMI) const; /// getOpcodeAfterMemoryFold - Returns the opcode of the would be new From pawel.kunio at gmail.com Sun Dec 2 05:07:22 2007 From: pawel.kunio at gmail.com (pawel kunio) Date: Sun, 2 Dec 2007 12:07:22 +0100 Subject: [llvm-commits] PR889 final version Message-ID: Hello, Here comes the more or less final and complete version of patch for PR889. The coding standard enforced by Chris. I added the asserts as checks for Value-inherited classes without destroyThis. Should it be accepted, please submit as it seems, I havent got the proper rights to do so. Best regards, Pawel -------------- next part -------------- A non-text attachment was scrubbed... Name: llvm PR889-try3.patch Type: application/octet-stream Size: 58288 bytes Desc: not available Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20071202/10772baf/attachment.obj From sabre at nondot.org Sun Dec 2 16:46:02 2007 From: sabre at nondot.org (Chris Lattner) Date: Sun, 02 Dec 2007 22:46:02 -0000 Subject: [llvm-commits] [llvm] r44522 - in /llvm/trunk/docs/tutorial: LangImpl1.html LangImpl2.html LangImpl3.html LangImpl4.html LangImpl5.html LangImpl6.html LangImpl7.html Message-ID: <200712022246.lB2Mk2SJ029835@zion.cs.uiuc.edu> Author: lattner Date: Sun Dec 2 16:46:01 2007 New Revision: 44522 URL: http://llvm.org/viewvc/llvm-project?rev=44522&view=rev Log: fix typo noticed by Joshua Pennington Modified: llvm/trunk/docs/tutorial/LangImpl1.html llvm/trunk/docs/tutorial/LangImpl2.html llvm/trunk/docs/tutorial/LangImpl3.html llvm/trunk/docs/tutorial/LangImpl4.html llvm/trunk/docs/tutorial/LangImpl5.html llvm/trunk/docs/tutorial/LangImpl6.html llvm/trunk/docs/tutorial/LangImpl7.html Modified: llvm/trunk/docs/tutorial/LangImpl1.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/tutorial/LangImpl1.html?rev=44522&r1=44521&r2=44522&view=diff ============================================================================== --- llvm/trunk/docs/tutorial/LangImpl1.html (original) +++ llvm/trunk/docs/tutorial/LangImpl1.html Sun Dec 2 16:46:01 2007 @@ -293,7 +293,7 @@ if (LastChar == '#') { // Comment until end of line. do LastChar = getchar(); - while (LastChar != EOF && LastChar != '\n' & LastChar != '\r'); + while (LastChar != EOF && LastChar != '\n' && LastChar != '\r'); if (LastChar != EOF) return gettok(); Modified: llvm/trunk/docs/tutorial/LangImpl2.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/tutorial/LangImpl2.html?rev=44522&r1=44521&r2=44522&view=diff ============================================================================== --- llvm/trunk/docs/tutorial/LangImpl2.html (original) +++ llvm/trunk/docs/tutorial/LangImpl2.html Sun Dec 2 16:46:01 2007 @@ -870,7 +870,7 @@ if (LastChar == '#') { // Comment until end of line. do LastChar = getchar(); - while (LastChar != EOF && LastChar != '\n' & LastChar != '\r'); + while (LastChar != EOF && LastChar != '\n' && LastChar != '\r'); if (LastChar != EOF) return gettok(); Modified: llvm/trunk/docs/tutorial/LangImpl3.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/tutorial/LangImpl3.html?rev=44522&r1=44521&r2=44522&view=diff ============================================================================== --- llvm/trunk/docs/tutorial/LangImpl3.html (original) +++ llvm/trunk/docs/tutorial/LangImpl3.html Sun Dec 2 16:46:01 2007 @@ -735,7 +735,7 @@ if (LastChar == '#') { // Comment until end of line. do LastChar = getchar(); - while (LastChar != EOF && LastChar != '\n' & LastChar != '\r'); + while (LastChar != EOF && LastChar != '\n' && LastChar != '\r'); if (LastChar != EOF) return gettok(); Modified: llvm/trunk/docs/tutorial/LangImpl4.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/tutorial/LangImpl4.html?rev=44522&r1=44521&r2=44522&view=diff ============================================================================== --- llvm/trunk/docs/tutorial/LangImpl4.html (original) +++ llvm/trunk/docs/tutorial/LangImpl4.html Sun Dec 2 16:46:01 2007 @@ -583,7 +583,7 @@ if (LastChar == '#') { // Comment until end of line. do LastChar = getchar(); - while (LastChar != EOF && LastChar != '\n' & LastChar != '\r'); + while (LastChar != EOF && LastChar != '\n' && LastChar != '\r'); if (LastChar != EOF) return gettok(); Modified: llvm/trunk/docs/tutorial/LangImpl5.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/tutorial/LangImpl5.html?rev=44522&r1=44521&r2=44522&view=diff ============================================================================== --- llvm/trunk/docs/tutorial/LangImpl5.html (original) +++ llvm/trunk/docs/tutorial/LangImpl5.html Sun Dec 2 16:46:01 2007 @@ -974,7 +974,7 @@ if (LastChar == '#') { // Comment until end of line. do LastChar = getchar(); - while (LastChar != EOF && LastChar != '\n' & LastChar != '\r'); + while (LastChar != EOF && LastChar != '\n' && LastChar != '\r'); if (LastChar != EOF) return gettok(); Modified: llvm/trunk/docs/tutorial/LangImpl6.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/tutorial/LangImpl6.html?rev=44522&r1=44521&r2=44522&view=diff ============================================================================== --- llvm/trunk/docs/tutorial/LangImpl6.html (original) +++ llvm/trunk/docs/tutorial/LangImpl6.html Sun Dec 2 16:46:01 2007 @@ -899,7 +899,7 @@ if (LastChar == '#') { // Comment until end of line. do LastChar = getchar(); - while (LastChar != EOF && LastChar != '\n' & LastChar != '\r'); + while (LastChar != EOF && LastChar != '\n' && LastChar != '\r'); if (LastChar != EOF) return gettok(); Modified: llvm/trunk/docs/tutorial/LangImpl7.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/tutorial/LangImpl7.html?rev=44522&r1=44521&r2=44522&view=diff ============================================================================== --- llvm/trunk/docs/tutorial/LangImpl7.html (original) +++ llvm/trunk/docs/tutorial/LangImpl7.html Sun Dec 2 16:46:01 2007 @@ -1085,7 +1085,7 @@ if (LastChar == '#') { // Comment until end of line. do LastChar = getchar(); - while (LastChar != EOF && LastChar != '\n' & LastChar != '\r'); + while (LastChar != EOF && LastChar != '\n' && LastChar != '\r'); if (LastChar != EOF) return gettok(); From sabre at nondot.org Sun Dec 2 18:36:20 2007 From: sabre at nondot.org (Chris Lattner) Date: Mon, 03 Dec 2007 00:36:20 -0000 Subject: [llvm-commits] [llvm] r44524 - /llvm/trunk/docs/DeveloperPolicy.html Message-ID: <200712030036.lB30aKgs002410@zion.cs.uiuc.edu> Author: lattner Date: Sun Dec 2 18:36:20 2007 New Revision: 44524 URL: http://llvm.org/viewvc/llvm-project?rev=44524&view=rev Log: explain what I need to grant commit access. Modified: llvm/trunk/docs/DeveloperPolicy.html Modified: llvm/trunk/docs/DeveloperPolicy.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/DeveloperPolicy.html?rev=44524&r1=44523&r2=44524&view=diff ============================================================================== --- llvm/trunk/docs/DeveloperPolicy.html (original) +++ llvm/trunk/docs/DeveloperPolicy.html Sun Dec 2 18:36:20 2007 @@ -227,10 +227,32 @@

    We grant commit access to contributors with a track record of submitting high -quality patches. If you would like commit access, please send an email to the -LLVM oversight group.

    +quality patches. If you would like commit access, please send an email to +Chris with the following information:

    + +
      +
    1. The user name you want to commit with, e.g. "sabre".
      2. +
    2. The full name and email address you want message to llvm-commits to come + from, e.g. "Chris Lattner <sabre at nondot.org>".
      3. +
    3. A "password hash" of the password you want to use, e.g. "2ACR96qjUqsyM". + Note that you don't ever tell us what your password is, you just give it + to us in an encrypted form. To get this, run "htpasswd" (a utility that + comes with apache) in crypt mode (often enabled with "-d"), or find a web + page that will do it for you.
      4. +
    + +

    Once you've been granted commit access, you should be able to check out an + LLVM tree with an SVN URL of "https://username at llvm.org/..." instead of the + normal anonymous URL of "http://llvm.org/...". The first time you commit + you'll have to type in your password. Note that you may get a warning from + SVN about an untrusted key, you can ignore this. To verify that your commit + access works, please do a test commit (e.g. change a comment or add a blank + line). Your first commit to a repository may require the autogenerated email + to be approved by a mailing list. This is normal, and will be done when + the mailing list owner has time.

    If you have recently been granted commit access, these policies apply:

    +
    1. You are granted commit-after-approval to all parts of LLVM. To get approval, submit a patch to From nicholas at mxc.ca Sun Dec 2 19:52:52 2007 From: nicholas at mxc.ca (Nick Lewycky) Date: Mon, 03 Dec 2007 01:52:52 -0000 Subject: [llvm-commits] [llvm] r44526 - /llvm/trunk/docs/ProgrammersManual.html Message-ID: <200712030152.lB31qrIB005362@zion.cs.uiuc.edu> Author: nicholas Date: Sun Dec 2 19:52:52 2007 New Revision: 44526 URL: http://llvm.org/viewvc/llvm-project?rev=44526&view=rev Log: Type::IntTy hasn't existed for a while. Just sub in Type::Int32Ty. Modified: llvm/trunk/docs/ProgrammersManual.html Modified: llvm/trunk/docs/ProgrammersManual.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/ProgrammersManual.html?rev=44526&r1=44525&r2=44526&view=diff ============================================================================== --- llvm/trunk/docs/ProgrammersManual.html (original) +++ llvm/trunk/docs/ProgrammersManual.html Sun Dec 2 19:52:52 2007 @@ -1742,7 +1742,7 @@ 
      -AllocaInst* ai = new AllocaInst(Type::IntTy);
+AllocaInst* ai = new AllocaInst(Type::Int32Ty);
      @@ -1770,7 +1770,7 @@ 
      -AllocaInst* pa = new AllocaInst(Type::IntTy, 0, "indexLoc");
+AllocaInst* pa = new AllocaInst(Type::Int32Ty, 0, "indexLoc");
      @@ -1922,7 +1922,7 @@ BasicBlock::iterator ii(instToReplace); ReplaceInstWithValue(instToReplace->getParent()->getInstList(), ii, - Constant::getNullValue(PointerType::get(Type::IntTy))); + Constant::getNullValue(PointerType::get(Type::Int32Ty)));
    2. ReplaceInstWithInst @@ -1937,7 +1937,7 @@ BasicBlock::iterator ii(instToReplace); ReplaceInstWithInst(instToReplace->getParent()->getInstList(), ii, - new AllocaInst(Type::IntTy, 0, "ptrToReplacedInt")); + new AllocaInst(Type::Int32Ty, 0, "ptrToReplacedInt"));
      3. @@ -2056,7 +2056,7 @@ PATypeHolder StructTy = OpaqueType::get(); std::vector<const Type*> Elts; Elts.push_back(PointerType::get(StructTy)); -Elts.push_back(Type::IntTy); +Elts.push_back(Type::Int32Ty); StructType *NewSTy = StructType::get(Elts); // At this point, NewSTy = "{ opaque*, i32 }". Tell VMCore that From nicholas at mxc.ca Sun Dec 2 19:58:01 2007 From: nicholas at mxc.ca (Nick Lewycky) Date: Mon, 03 Dec 2007 01:58:01 -0000 Subject: [llvm-commits] [llvm] r44527 - /llvm/trunk/docs/GettingStarted.html Message-ID: <200712030158.lB31w12S005651@zion.cs.uiuc.edu> Author: nicholas Date: Sun Dec 2 19:58:01 2007 New Revision: 44527 URL: http://llvm.org/viewvc/llvm-project?rev=44527&view=rev Log: lli -trace was removed back in 2003. Modified: llvm/trunk/docs/GettingStarted.html Modified: llvm/trunk/docs/GettingStarted.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/GettingStarted.html?rev=44527&r1=44526&r2=44527&view=diff ============================================================================== --- llvm/trunk/docs/GettingStarted.html (original) +++ llvm/trunk/docs/GettingStarted.html Sun Dec 2 19:58:01 2007 @@ -1380,13 +1380,10 @@
      lli
      lli is the LLVM interpreter, which - can directly execute LLVM bitcode (although very slowly...). In addition - to a simple interpreter, lli also has a tracing mode (entered by - specifying -trace on the command line). Finally, for - architectures that support it (currently x86, Sparc, and PowerPC), by default, - lli will function as a Just-In-Time compiler (if the - functionality was compiled in), and will execute the code much - faster than the interpreter.
      + can directly execute LLVM bitcode (although very slowly...). For architectures + that support it (currently x86, Sparc, and PowerPC), by default, lli + will function as a Just-In-Time compiler (if the functionality was compiled + in), and will execute the code much faster than the interpreter.
      llc
      llc is the LLVM backend compiler, which From zhousheng00 at gmail.com Sun Dec 2 20:13:41 2007 From: zhousheng00 at gmail.com (Zhou Sheng) Date: Mon, 3 Dec 2007 10:13:41 +0800 Subject: [llvm-commits] [llvm] r44353 - Re: [llvm] r44353 /llvm/trunk/test/CFrontend/2005-02-20-AggregateSAVEEXPR.c Message-ID: <8abe0dc60712021813k2b4b9155r826baa22a1749f94@mail.gmail.com> > > Message: 3 > Date: Thu, 29 Nov 2007 13:02:39 -0800 > From: Eric Christopher > Subject: Re: [llvm-commits] [llvm] r44353 - > /llvm/trunk/test/CFrontend/2005-02-20-AggregateSAVEEXPR.c > To: CVS Commit Messages for LLVM repository > Message-ID: > Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes > > > On Nov 27, 2007, at 1:22 AM, Eric Christopher wrote: > > >>> > >> This pretty much looks like cygwin-related stuff. Actually it needs > >> to > >> store two sets of headers - "native" and mingw, thus such directory. > >> > >> My mingw32 installation has complex.h, not mingw/complex.h. > >> However, I > >> don't understand, why cygwin doesn't have it's complex.h and test > >> should > >> use mingw-provided one. > > > > Agreed, I thought it did. It has been a while since I've had a cygwin > > box though. I can ask those guys tomorrow though. > > Anyhow, I talked to some of the cygwin guys and there's no complex > support > really at all so the test should probably be disabled for cygwin right > now Although cygwin has no its own complex support, it does integrate the mingw's complex into itself. Why not just use it? (or xfailed so that it starts xpassing when/if someone turns on complex > support). > > -eric > > > ------------------------------ > > -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20071203/eea01529/attachment.html From asl at math.spbu.ru Sun Dec 2 23:30:41 2007 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Mon, 03 Dec 2007 05:30:41 -0000 Subject: [llvm-commits] [llvm] r44528 - /llvm/trunk/lib/System/DynamicLibrary.cpp Message-ID: <200712030530.lB35UfEj013743@zion.cs.uiuc.edu> Author: asl Date: Sun Dec 2 23:30:41 2007 New Revision: 44528 URL: http://llvm.org/viewvc/llvm-project?rev=44528&view=rev Log: Provide hook for _alloca to make JITing on Cygwin slightly happier :) Modified: llvm/trunk/lib/System/DynamicLibrary.cpp Modified: llvm/trunk/lib/System/DynamicLibrary.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/System/DynamicLibrary.cpp?rev=44528&r1=44527&r2=44528&view=diff ============================================================================== --- llvm/trunk/lib/System/DynamicLibrary.cpp (original) +++ llvm/trunk/lib/System/DynamicLibrary.cpp Sun Dec 2 23:30:41 2007 @@ -138,14 +138,15 @@ return ptr; } +#define EXPLICIT_SYMBOL(SYM) \ + extern void *SYM; if (!strcmp(symbolName, #SYM)) return &SYM + // If this is darwin, it has some funky issues, try to solve them here. Some // important symbols are marked 'private external' which doesn't allow // SearchForAddressOfSymbol to find them. As such, we special case them here, // there is only a small handful of them. #ifdef __APPLE__ -#define EXPLICIT_SYMBOL(SYM) \ - extern void *SYM; if (!strcmp(symbolName, #SYM)) return &SYM { EXPLICIT_SYMBOL(__ashldi3); EXPLICIT_SYMBOL(__ashrdi3); @@ -163,9 +164,16 @@ EXPLICIT_SYMBOL(__udivdi3); EXPLICIT_SYMBOL(__umoddi3); } -#undef EXPLICIT_SYMBOL #endif +#ifdef __CYGWIN__ + { + EXPLICIT_SYMBOL(_alloca); + } +#endif + +#undef EXPLICIT_SYMBOL + // This macro returns the address of a well-known, explicit symbol #define EXPLICIT_SYMBOL(SYM) \ if (!strcmp(symbolName, #SYM)) return &SYM