From clattner at apple.com  Mon Sep 22 00:03:05 2008
From: clattner at apple.com (Chris Lattner)
Date: Sun, 21 Sep 2008 22:03:05 -0700
Subject: [llvm-commits] [llvm] r56341 - in /llvm/trunk: include/llvm/
	include/llvm/Transforms/ lib/Transforms/IPO/
	test/Analysis/GlobalsModRef/ test/Transforms/AddReadAttrs/
In-Reply-To: <200809190817.m8J8H6I8010267@zion.cs.uiuc.edu>
References: <200809190817.m8J8H6I8010267@zion.cs.uiuc.edu>
Message-ID: <E24D5FCF-90AA-434F-85D2-613478F9B73E@apple.com>


On Sep 19, 2008, at 1:17 AM, Duncan Sands wrote:

> Author: baldrick
> Date: Fri Sep 19 03:17:05 2008
> New Revision: 56341
>
> URL: http://llvm.org/viewvc/llvm-project?rev=56341&view=rev
> Log:
> Add a new pass AddReadAttrs which works out which functions
> can get the readnone/readonly attributes, and gives them it.
> The plan is to remove markmodref (which did the same thing
> by querying GlobalsModRef) and delete the analogous
> functionality from GlobalsModRef.

Ok.  Here are some thoughts:

   CallGraph &CG = getAnalysis<CallGraph>();

   // Check if any of the functions in the SCC read or write memory.
   // If they write memory then just give up.

...

This pass can only do something if the SCC is not already readnone.   
Does it make sense to do an initial check to see if the function is  
already readnone?  Since it doesn't have to be a perfect check, how  
about something like:

if (SCC.size() == 1 && SCC[0]->getFunction() &&
     SCC[0]->getFunction()->doesNotAccessMemory())
   return false;  // already readnone

Alternatively, maybe this should be handled by the 'already perfect'  
case you already have.


     // Definitions with weak linkage may be overridden at linktime with
     // something that writes memory, so treat them like declarations.
     if (F->isDeclaration() || F->hasWeakLinkage()) {

This should also handle linkonce linkage.

       // Ignore calls to functions in the same SCC.
       if (CS.getInstruction() &&
           std::find(SCC.begin(), SCC.end(),  
CG[CS.getCalledFunction()]) !=
           SCC.end())
         continue;

This will be really slow for large SCCs.  I think that some apps (like  
176.gcc) have scc's with hundreds of nodes in them.  Instead of using  
std::find, please dump the contents of the SCC into a SmallPtrSet at  
the start of the function, and query that instead.


       if (II->mayWriteToMemory())
         return false;

Please add a comment: "If this may write to memory, then we can't set  
either readnone or readonly, just give up." or something like that.

Otherwise, the pass looks very nice Duncan!

-Chris


-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20080921/2b52bfed/attachment.html 

From clattner at apple.com  Mon Sep 22 00:04:23 2008
From: clattner at apple.com (Chris Lattner)
Date: Sun, 21 Sep 2008 22:04:23 -0700
Subject: [llvm-commits] [llvm] r56342 - in /llvm/trunk:
	include/llvm/LinkAllPasses.h include/llvm/Transforms/Scalar.h
	lib/Transforms/Scalar/MarkModRef.cpp
	test/Analysis/GlobalsModRef/2008-09-03-WrongRecords.ll
	win32/Transforms/Transforms.vcproj
In-Reply-To: <200809190823.m8J8Nic6010477@zion.cs.uiuc.edu>
References: <200809190823.m8J8Nic6010477@zion.cs.uiuc.edu>
Message-ID: <FD20C958-FB71-4CD0-9A99-9FA278D035CA@apple.com>


On Sep 19, 2008, at 1:23 AM, Duncan Sands wrote:

> Author: baldrick
> Date: Fri Sep 19 03:23:44 2008
> New Revision: 56342
>
> URL: http://llvm.org/viewvc/llvm-project?rev=56342&view=rev
> Log:
> Remove the MarkModRef pass (use AddReadAttrs instead).
> Unfortunately this means removing one regression test
> of GlobalsModRef because I couldn't work out how to
> perform it without MarkModRef.

What is the issue?  Also, why doesn't your AddReadAttrs pass use  
AliasAnalysis?

-Chris


From kremenek at apple.com  Mon Sep 22 00:10:52 2008
From: kremenek at apple.com (Ted Kremenek)
Date: Mon, 22 Sep 2008 05:10:52 -0000
Subject: [llvm-commits] [llvm] r56428 - /llvm/tags/checker/checker-95/
Message-ID: <200809220510.m8M5Aqx9027237@zion.cs.uiuc.edu>

Author: kremenek
Date: Mon Sep 22 00:10:51 2008
New Revision: 56428

URL: http://llvm.org/viewvc/llvm-project?rev=56428&view=rev
Log:
Tagging checker-95.

Added:
    llvm/tags/checker/checker-95/
      - copied from r56427, llvm/trunk/



From clattner at apple.com  Mon Sep 22 01:02:45 2008
From: clattner at apple.com (Chris Lattner)
Date: Sun, 21 Sep 2008 23:02:45 -0700
Subject: [llvm-commits] [llvm] r55696 - in /llvm/trunk:
	lib/Analysis/IPA/GlobalsModRef.cpp
	test/Analysis/GlobalsModRef/2008-09-03-Mutual.ll
	test/Analysis/GlobalsModRef/2008-09-03-ReadGlobals.ll
	test/Analysis/GlobalsModRef/2008-09-03-ReadOnly.ll
In-Reply-To: <200809031255.m83CtiI8031031@zion.cs.uiuc.edu>
References: <200809031255.m83CtiI8031031@zion.cs.uiuc.edu>
Message-ID: <4FC0A26E-21F6-4375-BD62-7B84CE946A4E@apple.com>

On Sep 3, 2008, at 5:55 AM, Duncan Sands wrote:
> URL: http://llvm.org/viewvc/llvm-project?rev=55696&view=rev
> Log:
> Cleanup GlobalsModRef a bit.  When analysing the
> callgraph, when one member of a SCC calls another
> then the analysis would drop to mod-ref because
> there is (usually) no function info for the callee
> yet; fix this.  Teach the analysis about function
> attributes, in particular the readonly attribute
> (which requires being careful about globals).

Hey Duncan,

Very nice.  Do you have a specific interest/goal for GlobalsModRef, or  
is this just something you've notice that we do more poorly than we  
could?  Better alias analysis helps everything, so it's great to see  
progress in this area!

You've made a bunch of improvements to GlobalsModRef now and in the  
past, so I'm just going to go through and re-review it completely if  
that's ok with you.  Well I guess it doesn't matter if it's ok or not,  
because I just did it. :)  If you don't want to tackle something, let  
me know and I can add it to my queue.

   struct VISIBILITY_HIDDEN FunctionRecord {
     /// GlobalInfo - Maintain mod/ref info for all of the globals  
without
     /// addresses taken that are read or written (transitively) by this
     /// function.
     std::map<GlobalValue*, unsigned> GlobalInfo;

     /// MayReadAnyGlobal - May read global variables, but it is not  
known which.
     bool MayReadAnyGlobal;

...

     /// FunctionEffect - Capture whether or not this function reads  
or writes to
     /// ANY memory.  If not, we can do a lot of aggressive analysis  
on it.
     unsigned FunctionEffect;


Please keep the instance variables in the class together by moving  
getInfoForGlobal down, preferably after the ctor.

Also, can you shrink FunctionEffect to a 'char'?  That will reduce the  
size of FunctionRecord by a word, packing it next to the bool.


As far as efficiency goes, GlobalInfo is mysterious: it is really  
horrible as a std::map (one allocation per insertion) but making it a  
densemap wouldn't be any better (tons of fragmentation).  I think the  
best thing would be to eliminate it from FunctionRecord, and add a  
single unified DenseMap to the pass:

DenseMap<std::pair<Function*, GlobalVariable*>, unsigned>  
PerFunctionGlobalMRInfo;

This would work just fine for almost all uses and is the best of both  
worlds, the one problem would be the 'Incorporate callee's effects on  
globals into our info.' loop.  A solution to this would be to keep  
around the "per global" mod ref info for just the callees of the  
current SCC.  What do you think?



   class VISIBILITY_HIDDEN GlobalsModRef
       : public ModulePass, public AliasAnalysis {

Could this be a CallGraphSCCPass now?


NonAddressTakenGlobals/IndirectGlobals should really be SmallPtrSet's,  
and AllocsForIndirectGlobals should be a densemap.



    virtual ModRefBehavior getModRefBehavior(Function *F, CallSite CS,
                                           
std::vector<PointerAccessInfo> *Info) {
       if (FunctionRecord *FR = getFunctionInfo(F)) {
         if (FR->FunctionEffect == 0)
           return DoesNotAccessMemory;
         else if ((FR->FunctionEffect & Mod) == 0)
           return OnlyReadsMemory;
       }
       return AliasAnalysis::getModRefBehavior(F, CS, Info);
     }

Just because we think the function is readonly doesn't mean that a  
smarter analysis couldn't find that it is readnone.  How about:

         else if ((FR->FunctionEffect & Mod) == 0)
           return AliasAnalysis::getModRefBehavior(F, CS, Info) &  
OnlyReadsMemory;

?


/// getUnderlyingObject - This traverses the use chain to figure out  
what object
/// the specified value points to.  If the value points to, or is  
derived from,
/// a global object, return it.
static Value *getUnderlyingObject(Value *V) {

I think this is an exact dupe of Value::stripPointerCasts now:  
getUnderlyingObject(V) == V->stripPointerCasts();

If it needs to stay for some reason, then this statement is not needed:

   // If we are at some type of object... return it.
   if (GlobalValue *GV = dyn_cast<GlobalValue>(V)) return GV;


/// AnalyzeGlobals - Scan through the users of all of the internal
/// GlobalValue's in the program.  If none of them have their "address  
taken"

"If none of them" -> "If any of them"



   for (Module::global_iterator I = M.global_begin(), E =  
M.global_end();
        I != E; ++I)
     if (I->hasInternalLinkage()) {

How about: if (!I->hasInternalLinkage()) continue;


bool GlobalsModRef::AnalyzeUsesOfPointer(Value *V,
..
     } else if (CallInst *CI = dyn_cast<CallInst>(*UI)) {
       // Make sure that this is just the function being called, not  
that it is
       // passing into the function.
       for (unsigned i = 1, e = CI->getNumOperands(); i != e; ++i)
         if (CI->getOperand(i) == V) return true;

it would be faster to check UI.getOperandNo() instead of looping,  
likewise for invoke.


       if (CE->getOpcode() == Instruction::GetElementPtr ||
           CE->getOpcode() == Instruction::BitCast) {

This code handles bitcast constant exprs but not bitcast instrs.  :)   
Please add logic for bitcast instrs.



        if (F->getName() != "calloc") return false;   // Not calloc.

This should use F->isName("calloc")


void GlobalsModRef::AnalyzeCallGraph(CallGraph &CG, Module &M) {
...

       if (F->isDeclaration()) {

This needs a comment above it, something like:  If there is a  
prototype in the SCC, then it is either an intrinsic, or an external  
function, which may do just about anything.  We need to handle this  
separately from scanning the body of the function.


         // Try to get mod/ref behaviour from function attributes.
         if (F->doesNotAccessMemory()) {

I don't think this should be checking function attributes for readonly/ 
readnone.  Instead, it should chain to another alias analysis pass  
(which would end up at basicaa).  basicaa would then be the one to  
check the attribute.



       for (CallGraphNode::iterator CI = SCC[i]->begin(), E = SCC[i]- 
 >end();
            CI != E && !KnowNothing; ++CI)

Needs a comment: loop over all of the call graph edges out of this SCC  
node: i.e. all the called functions.

         if (Function *Callee = CI->second->getFunction()) {

How about:

         Function *Callee = CI->second->getFunction();
         if (Callee == 0) {
           KnowNothing = true;
          break;
       }
      ...

           // Can't say anything about it.  However, if it is inside  
our SCC,
             // then nothing needs to be done.
             CallGraphNode *CalleeNode = CG[Callee];
             if (std::find(SCC.begin(), SCC.end(), CalleeNode) ==  
SCC.end())
               KnowNothing = true;

As before, please use SmallPtrSet instead of std::find.  This is  
quadratic on large SCCs.


     // Scan the function bodies for explicit loads or stores.
     for (unsigned i = 0, e = SCC.size(); i != e && FunctionEffect !=  
ModRef;++i)
       for (inst_iterator II = inst_begin(SCC[i]->getFunction()),
              E = inst_end(SCC[i]->getFunction());
            II != E && FunctionEffect != ModRef; ++II)

I think that this should Instruction::mayReadMemory and friends.  It  
isn't handling the vaarg instruction, for example.  Also, using these  
predicates would have handled the volatile case correctly automatically.


GlobalsModRef::getModRefInfo(CallSite CS, Value *P, unsigned Size) {
   unsigned Known = ModRef;

Shouldn't this take advantage of the FunctionEffect for the function  
as well, even if P isn't a pointer to a known global?

-Chris


From clattner at apple.com  Mon Sep 22 01:09:11 2008
From: clattner at apple.com (Chris Lattner)
Date: Sun, 21 Sep 2008 23:09:11 -0700
Subject: [llvm-commits] [llvm] r55409 - in /llvm/trunk:
	include/llvm/Support/DebugInfoBuilder.h
	lib/VMCore/DebugInfoBuilder.cpp
In-Reply-To: <200808270651.m7R6pFf1026223@zion.cs.uiuc.edu>
References: <200808270651.m7R6pFf1026223@zion.cs.uiuc.edu>
Message-ID: <1EB8BE6B-6CC8-445E-B964-BF7DE2FA7637@apple.com>


On Aug 26, 2008, at 11:51 PM, Evan Cheng wrote:

> Author: evancheng
> Date: Wed Aug 27 01:51:14 2008
> New Revision: 55409
>
> URL: http://llvm.org/viewvc/llvm-project?rev=55409&view=rev
> Log:
> Add DebugInfoBuilder. Patch by Talin!

Hi Talin,

Your DebugInfoBuilder looks very nice.  Have you had a chance to look  
at this proposal?
http://nondot.org/sabre/LLVMNotes/EmbeddedMetadata.txt

One piece of it (that is orthogonal from the rest) is the 'Debug Info  
Construction/Manipulation Helper Classes' section.  I hadn't had a  
chance to dig into your debug info builder before writing that, but I  
now see that they are very very related.

Between the two, I think that my proposal would be preferable because  
it would give better type info, and lend itself to clients that want  
to walk existing debug info, instead of just creating debug info.  The  
other advantage of my proposal is that it would insulate clients from  
changes in the debug info representation: the debug classes could be  
based on GlobalVariables today, but the implementation could change  
under the covers to use MDNodes in the future with no or little  
changes to the clients.

What are your thoughts?  If we converge on this, I'd like to convert  
clang and llvm-gcc over to use the interface we finalize on (probably  
post 2.4).

-Chris



From evan.cheng at apple.com  Mon Sep 22 01:09:48 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Sun, 21 Sep 2008 23:09:48 -0700
Subject: [llvm-commits] [llvm] r56310 -
	/llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp
In-Reply-To: <CD630625-C109-40C3-A2EE-D7B51B3425AF@apple.com>
References: <200809181822.m8IIMW2k002887@zion.cs.uiuc.edu>
	<47A144A2-3B20-467D-8EAA-FB90DF12E434@apple.com>
	<BCAE78C5-2025-4D30-B21F-52F5EC018D71@apple.com>
	<CD630625-C109-40C3-A2EE-D7B51B3425AF@apple.com>
Message-ID: <BD6FC674-2D9B-4D51-9619-6DDAC02BE402@apple.com>

Local liveness hasn't been split out from livevariables. The plan is  
for DCE to track local liveness.

Evan

On Sep 21, 2008, at 8:27 PM, Chris Lattner wrote:

>
> On Sep 21, 2008, at 7:42 PM, Evan Cheng wrote:
>
>> This happens before livevariables. Remember we don't run LV at -O0.
>
> Not even local liveness?  That would be enough to handle physregs.
>
> -Chris
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From clattner at apple.com  Mon Sep 22 01:17:36 2008
From: clattner at apple.com (Chris Lattner)
Date: Sun, 21 Sep 2008 23:17:36 -0700
Subject: [llvm-commits] [llvm] r56310 -
	/llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp
In-Reply-To: <BD6FC674-2D9B-4D51-9619-6DDAC02BE402@apple.com>
References: <200809181822.m8IIMW2k002887@zion.cs.uiuc.edu>
	<47A144A2-3B20-467D-8EAA-FB90DF12E434@apple.com>
	<BCAE78C5-2025-4D30-B21F-52F5EC018D71@apple.com>
	<CD630625-C109-40C3-A2EE-D7B51B3425AF@apple.com>
	<BD6FC674-2D9B-4D51-9619-6DDAC02BE402@apple.com>
Message-ID: <615BE1D9-7BFE-4828-B769-EB796B034932@apple.com>


On Sep 21, 2008, at 11:09 PM, Evan Cheng wrote:

> Local liveness hasn't been split out from livevariables. The plan is
> for DCE to track local liveness.

Ok! That would be great, considering it is already doing a backward  
scan.  Would the register scavenger regtracker help with this?

-Chris

>
>
> Evan
>
> On Sep 21, 2008, at 8:27 PM, Chris Lattner wrote:
>
>>
>> On Sep 21, 2008, at 7:42 PM, Evan Cheng wrote:
>>
>>> This happens before livevariables. Remember we don't run LV at -O0.
>>
>> Not even local liveness?  That would be enough to handle physregs.
>>
>> -Chris
>>
>> _______________________________________________
>> 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 evan.cheng at apple.com  Mon Sep 22 01:17:37 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Sun, 21 Sep 2008 23:17:37 -0700
Subject: [llvm-commits] [llvm] r56384 - in /llvm/trunk/lib/CodeGen:
	RegAllocLinearScan.cpp SimpleRegisterCoalescing.cpp
In-Reply-To: <8D81D6DA-8289-49E2-B352-53C6C313FDA8@apple.com>
References: <200809200203.m8K234YA013252@zion.cs.uiuc.edu>
	<4F71A860-E342-4A07-8211-0A59A1AA154D@apple.com>
	<F80F5034-326C-4AF5-A7A6-84F8C1C3AF23@apple.com>
	<8D81D6DA-8289-49E2-B352-53C6C313FDA8@apple.com>
Message-ID: <33791BFC-A09D-43EB-B4D0-6582A9243EED@apple.com>


On Sep 21, 2008, at 8:26 PM, Chris Lattner wrote:

> On Sep 21, 2008, at 7:41 PM, Evan Cheng wrote:
>>> If you model the early clobber def as starting one slot early, it
>>> will
>>> explicitly conflict with all inputs to the asm, and this can be
>>> backed
>>> out.
>>
>> While that's the correct approach, it breaks all kinds of assumptions
>> in liveintervals and the coalescer. It will make the problem much  
>> more
>> complicated. I don't think it's worth the effort.
>
> What sorts of assumptions?

That use must be 1 cycle after instruction cycle, def must be 2 cycles  
after it.

>
>
>> Besides, from uArch point of view, "early clobber" is totally bogus.
>> It should really be "no read bypass". The correct way to model it
>> would be to delay read by one cycle.
>
> It typically doesn't have anything to do with a micro architecture, it
> has to do with the fact that an inline asm has multiple instructions.
> For example if you had an inline asm with:
>
>   "$out0 = inst1 $in1, 4
>    $out1 = inst2 $in2, 142"
>
> Then you'd have to mark $out0 as being an early clobber, because it is
> stored to before $in2 is read.

Ewwww.

Evan

>
>
> -Chris
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From clattner at apple.com  Mon Sep 22 01:19:20 2008
From: clattner at apple.com (Chris Lattner)
Date: Sun, 21 Sep 2008 23:19:20 -0700
Subject: [llvm-commits] [llvm] r56384 - in /llvm/trunk/lib/CodeGen:
	RegAllocLinearScan.cpp SimpleRegisterCoalescing.cpp
In-Reply-To: <33791BFC-A09D-43EB-B4D0-6582A9243EED@apple.com>
References: <200809200203.m8K234YA013252@zion.cs.uiuc.edu>
	<4F71A860-E342-4A07-8211-0A59A1AA154D@apple.com>
	<F80F5034-326C-4AF5-A7A6-84F8C1C3AF23@apple.com>
	<8D81D6DA-8289-49E2-B352-53C6C313FDA8@apple.com>
	<33791BFC-A09D-43EB-B4D0-6582A9243EED@apple.com>
Message-ID: <ADDCBC77-DB9F-46BB-A73D-FADC943C29D7@apple.com>

On Sep 21, 2008, at 11:17 PM, Evan Cheng wrote:
>>> While that's the correct approach, it breaks all kinds of  
>>> assumptions
>>> in liveintervals and the coalescer. It will make the problem much
>>> more
>>> complicated. I don't think it's worth the effort.
>>
>> What sorts of assumptions?
>
> That use must be 1 cycle after instruction cycle, def must be 2 cycles
> after it.

What code makes this sort of assumption?  It seems fragile.

>> It typically doesn't have anything to do with a micro architecture,  
>> it
>> has to do with the fact that an inline asm has multiple instructions.
>> For example if you had an inline asm with:
>>
>>  "$out0 = inst1 $in1, 4
>>   $out1 = inst2 $in2, 142"
>>
>> Then you'd have to mark $out0 as being an early clobber, because it  
>> is
>> stored to before $in2 is read.
>
> Ewwww.

Eww what? You don't like asms with multiple instructions?  Or you  
prefer CPUs that have instructions that would require this? ;-)

-Chris


From clattner at apple.com  Mon Sep 22 01:26:17 2008
From: clattner at apple.com (Chris Lattner)
Date: Sun, 21 Sep 2008 23:26:17 -0700
Subject: [llvm-commits] [llvm] r55969 - in /llvm/trunk:
	docs/LangRef.html include/llvm/Bitcode/LLVMBitCodes.h
	include/llvm/InstrTypes.h include/llvm/Instructions.h
	lib/AsmParser/llvmAsmParser.y lib/Bitcode/Reader/BitcodeReader.cpp
	lib/Bitcode/Writer/BitcodeWriter.cpp lib/VMCore/Verifier.cpp
	test/Assembler/vbool-cmp.ll test/Assembler/vector-select.ll
In-Reply-To: <200809090102.m8912lLd009502@zion.cs.uiuc.edu>
References: <200809090102.m8912lLd009502@zion.cs.uiuc.edu>
Message-ID: <DCAA7462-9A1F-45F5-BD11-6F927E050AAB@apple.com>


On Sep 8, 2008, at 6:02 PM, Dan Gohman wrote:

> Author: djg
> Date: Mon Sep  8 20:02:47 2008
> New Revision: 55969
>
> URL: http://llvm.org/viewvc/llvm-project?rev=55969&view=rev
> Log:
> Extend the vcmp/fcmp LLVM IR instructions to take vectors as arguments
> and, if so, to return a vector of boolean as a result;

Hi Dan and Preston,

I thought the idea here was to change vicmp and vfcmp to have this  
behavior, not change icmp/fcmp to do this.  The problem with changing  
icmp/fcmp is that you'll break a lot of assumptions throughout the  
optimizer that the result of icmp/fcmp is an i1, and the code to  
handle this has already been updated for v*cmp.

>
>> The FUNC_CODE_INST_VCMP thing is a little counter-intuitive. I guess
>> it's necessary in order to remain compatible with exiting vector
>> FUNC_CODE_INST_CMP usage though, right?
>
> Correct. Since FUNC_CODE_INST_CMP with vector arguments is used for  
> the
> vfcmp and vicmp instructions, it was necessary to add
> FUNC_CODE_INST_VCMP to support the vector forms of fcmp/icmp. It would
> probably have made more sense in the bitcode reader/writer to switch
> vicmp/vfcmp to use a newly defined bitcode operator, but I did not
> because it seemed likely that it would break existing code.

Is there any reason to keep around the old v*cmp behavior of returning  
a vector of integers?  If not, please remove them (as soon as there  
are no regressions from doing this).  I don't want to have two  
different vector compare implementations floating around.

Also, LLVM 2.4 is coming up very soon now, would you be ok with  
deferring (and reverting) these changes until after 2.4 branches in a  
couple weeks?  If you'd prefer to do development on a branch until  
then that would be fine of course.

> Extend the select LLVM IR instruction to allow you to specify a result
> type which is a vector of boolean, in which case the result will be an
> element-wise selection instead of choosing one vector or the other;

Cool, this is something we've needed for quite awhile.

> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h (original)
> +++ llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h Mon Sep  8  
> 20:02:47 2008
> @@ -205,7 +205,9 @@
>     // FIXME: Remove GETRESULT in favor of EXTRACTVAL in LLVM 3.0
>     FUNC_CODE_INST_GETRESULT   = 25, // GETRESULT:  [ty, opval, n]
>     FUNC_CODE_INST_EXTRACTVAL  = 26, // EXTRACTVAL: [n x operands]
> -    FUNC_CODE_INST_INSERTVAL   = 27  // INSERTVAL:  [n x operands]
> +    FUNC_CODE_INST_INSERTVAL   = 27, // INSERTVAL:  [n x operands]
> +    // fcmp/icmp returning vector of Int1Ty, NOT for vicmp/vfcmp
> +    FUNC_CODE_INST_VCMP        = 28  // VCMP:       [opty, opval,  
> opval, pred]

Ewww.  I still think that vcmp should change into this behavior, if  
there is some reason why this would not work, please pick a better  
name than INST_VCMP for this!

> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/include/llvm/InstrTypes.h (original)
> +++ llvm/trunk/include/llvm/InstrTypes.h Mon Sep  8 20:02:47 2008
> @@ -18,6 +18,7 @@
>
> #include "llvm/Instruction.h"
> #include "llvm/OperandTraits.h"
> +#include "llvm/DerivedTypes.h"

Please move the method out of line, to avoid this #include.

> @@ -732,6 +733,13 @@
>   static inline bool classof(const Value *V) {
>     return isa<Instruction>(V) && classof(cast<Instruction>(V));
>   }
> +  /// @brief Create a result type for fcmp/icmp (but not vicmp/vfcmp)
> +  static const Type* makeCmpResultType(const Type* opnd_type) {

Instead of 'makeCmp...' please call this 'getVCmpResultType' or  
something like that.  We use 'get' for uniqued objects like types.   
Assuming that you're going to eliminate vicmp/vfcmp, this should be  
removed and you should just change its methods.

Okay, I can't review the rest of this patch without getting more  
closure on the direction we're going with the IR.  I think that  
smooshing this into icmp/fcmp is a real mistake.  We should change the  
old v[if]cmp instruction to return a vector of bool and leave icmp/ 
fcmp alone.  What do you guys think?

If you agree, please revert these patches for now.

-Chris


> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/include/llvm/Instructions.h (original)
> +++ llvm/trunk/include/llvm/Instructions.h Mon Sep  8 20:02:47 2008
> @@ -621,7 +621,8 @@
>     Value *RHS,      ///< The right-hand-side of the expression
>     const std::string &NameStr = "",  ///< Name of the instruction
>     Instruction *InsertBefore = 0  ///< Where to insert
> -  ) : CmpInst(Type::Int1Ty, Instruction::ICmp, pred, LHS, RHS,  
> NameStr,
> +  ) : CmpInst(makeCmpResultType(LHS->getType()),
> +              Instruction::ICmp, pred, LHS, RHS, NameStr,
>               InsertBefore) {
>     assert(pred >= CmpInst::FIRST_ICMP_PREDICATE &&
>            pred <= CmpInst::LAST_ICMP_PREDICATE &&
> @@ -629,7 +630,7 @@
>     assert(getOperand(0)->getType() == getOperand(1)->getType() &&
>           "Both operands to ICmp instruction are not of the same  
> type!");
>     // Check that the operands are the right type
> -    assert((getOperand(0)->getType()->isInteger() ||
> +    assert((getOperand(0)->getType()->isIntOrIntVector() ||
>             isa<PointerType>(getOperand(0)->getType())) &&
>            "Invalid operand types for ICmp instruction");
>   }
> @@ -641,7 +642,8 @@
>     Value *RHS,     ///< The right-hand-side of the expression
>     const std::string &NameStr,  ///< Name of the instruction
>     BasicBlock *InsertAtEnd   ///< Block to insert into.
> -  ) : CmpInst(Type::Int1Ty, Instruction::ICmp, pred, LHS, RHS,  
> NameStr,
> +  ) : CmpInst(makeCmpResultType(LHS->getType()),
> +              Instruction::ICmp, pred, LHS, RHS, NameStr,
>               InsertAtEnd) {
>     assert(pred >= CmpInst::FIRST_ICMP_PREDICATE &&
>            pred <= CmpInst::LAST_ICMP_PREDICATE &&
> @@ -649,7 +651,7 @@
>     assert(getOperand(0)->getType() == getOperand(1)->getType() &&
>           "Both operands to ICmp instruction are not of the same  
> type!");
>     // Check that the operands are the right type
> -    assert((getOperand(0)->getType()->isInteger() ||
> +    assert((getOperand(0)->getType()->isIntOrIntVector() ||
>             isa<PointerType>(getOperand(0)->getType())) &&
>            "Invalid operand types for ICmp instruction");
>   }
> @@ -754,6 +756,7 @@
>   static inline bool classof(const Value *V) {
>     return isa<Instruction>(V) && classof(cast<Instruction>(V));
>   }
> +
> };
>
> // 
> = 
> = 
> = 
> ----------------------------------------------------------------------= 
> ==//
> @@ -773,14 +776,15 @@
>     Value *RHS,      ///< The right-hand-side of the expression
>     const std::string &NameStr = "",  ///< Name of the instruction
>     Instruction *InsertBefore = 0  ///< Where to insert
> -  ) : CmpInst(Type::Int1Ty, Instruction::FCmp, pred, LHS, RHS,  
> NameStr,
> +  ) : CmpInst(makeCmpResultType(LHS->getType()),
> +              Instruction::FCmp, pred, LHS, RHS, NameStr,
>               InsertBefore) {
>     assert(pred <= FCmpInst::LAST_FCMP_PREDICATE &&
>            "Invalid FCmp predicate value");
>     assert(getOperand(0)->getType() == getOperand(1)->getType() &&
>            "Both operands to FCmp instruction are not of the same  
> type!");
>     // Check that the operands are the right type
> -    assert(getOperand(0)->getType()->isFloatingPoint() &&
> +    assert(getOperand(0)->getType()->isFPOrFPVector() &&
>            "Invalid operand types for FCmp instruction");
>   }
>
> @@ -791,14 +795,15 @@
>     Value *RHS,     ///< The right-hand-side of the expression
>     const std::string &NameStr,  ///< Name of the instruction
>     BasicBlock *InsertAtEnd   ///< Block to insert into.
> -  ) : CmpInst(Type::Int1Ty, Instruction::FCmp, pred, LHS, RHS,  
> NameStr,
> +  ) : CmpInst(makeCmpResultType(LHS->getType()),
> +              Instruction::FCmp, pred, LHS, RHS, NameStr,
>               InsertAtEnd) {
>     assert(pred <= FCmpInst::LAST_FCMP_PREDICATE &&
>            "Invalid FCmp predicate value");
>     assert(getOperand(0)->getType() == getOperand(1)->getType() &&
>            "Both operands to FCmp instruction are not of the same  
> type!");
>     // Check that the operands are the right type
> -    assert(getOperand(0)->getType()->isFloatingPoint() &&
> +    assert(getOperand(0)->getType()->isFPOrFPVector() &&
>            "Invalid operand types for FCmp instruction");
>   }
>
> @@ -837,6 +842,7 @@
>   static inline bool classof(const Value *V) {
>     return isa<Instruction>(V) && classof(cast<Instruction>(V));
>   }
> +
> };
>
> // 
> = 
> = 
> = 
> ----------------------------------------------------------------------= 
> ==//
>
> Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.y
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.y?rev=55969&r1=55968&r2=55969&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/AsmParser/llvmAsmParser.y (original)
> +++ llvm/trunk/lib/AsmParser/llvmAsmParser.y Mon Sep  8 20:02:47 2008
> @@ -1102,7 +1102,7 @@
> %token <BinaryOpVal> ADD SUB MUL UDIV SDIV FDIV UREM SREM FREM AND  
> OR XOR
> %token <BinaryOpVal> SHL LSHR ASHR
>
> -%token <OtherOpVal> ICMP FCMP VICMP VFCMP
> +%token <OtherOpVal> ICMP FCMP VICMP VFCMP
> %type  <IPredicate> IPredicates
> %type  <FPredicate> FPredicates
> %token  EQ NE SLT SGT SLE SGE ULT UGT ULE UGE
> @@ -3097,8 +3097,6 @@
>   | ICMP IPredicates Types ValueRef ',' ValueRef  {
>     if (!UpRefs.empty())
>       GEN_ERROR("Invalid upreference in type: " + (*$3)- 
> >getDescription());
> -    if (isa<VectorType>((*$3).get()))
> -      GEN_ERROR("Vector types not supported by icmp instruction");
>     Value* tmpVal1 = getVal(*$3, $4);
>     CHECK_FOR_ERROR
>     Value* tmpVal2 = getVal(*$3, $6);
> @@ -3111,8 +3109,6 @@
>   | FCMP FPredicates Types ValueRef ',' ValueRef  {
>     if (!UpRefs.empty())
>       GEN_ERROR("Invalid upreference in type: " + (*$3)- 
> >getDescription());
> -    if (isa<VectorType>((*$3).get()))
> -      GEN_ERROR("Vector types not supported by fcmp instruction");
>     Value* tmpVal1 = getVal(*$3, $4);
>     CHECK_FOR_ERROR
>     Value* tmpVal2 = getVal(*$3, $6);
> @@ -3133,7 +3129,7 @@
>     CHECK_FOR_ERROR
>     $$ = CmpInst::Create($1, $2, tmpVal1, tmpVal2);
>     if ($$ == 0)
> -      GEN_ERROR("icmp operator returned null");
> +      GEN_ERROR("vicmp operator returned null");
>     delete $3;
>   }
>   | VFCMP FPredicates Types ValueRef ',' ValueRef  {
> @@ -3147,7 +3143,7 @@
>     CHECK_FOR_ERROR
>     $$ = CmpInst::Create($1, $2, tmpVal1, tmpVal2);
>     if ($$ == 0)
> -      GEN_ERROR("fcmp operator returned null");
> +      GEN_ERROR("vfcmp operator returned null");
>     delete $3;
>   }
>   | CastOps ResolvedVal TO Types {
> @@ -3163,10 +3159,23 @@
>     delete $4;
>   }
>   | SELECT ResolvedVal ',' ResolvedVal ',' ResolvedVal {
> -    if ($2->getType() != Type::Int1Ty)
> -      GEN_ERROR("select condition must be boolean");
> +    if (isa<VectorType>($2->getType())) {
> +      // vector select
> +      if (!isa<VectorType>($4->getType())
> +      || !isa<VectorType>($6->getType()) )
> +        GEN_ERROR("vector select value types must be vector types");
> +      const VectorType* cond_type = cast<VectorType>($2->getType());
> +      const VectorType* select_type = cast<VectorType>($4- 
> >getType());
> +      if (cond_type->getElementType() != Type::Int1Ty)
> +        GEN_ERROR("vector select condition element type must be  
> boolean");
> +      if (cond_type->getNumElements() != select_type- 
> >getNumElements())
> +        GEN_ERROR("vector select number of elements must be the  
> same");
> +    } else {
> +      if ($2->getType() != Type::Int1Ty)
> +        GEN_ERROR("select condition must be boolean");
> +    }
>     if ($4->getType() != $6->getType())
> -      GEN_ERROR("select value types should match");
> +      GEN_ERROR("select value types must match");
>     $$ = SelectInst::Create($2, $4, $6);
>     CHECK_FOR_ERROR
>   }
>
> Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp?rev=55969&r1=55968&r2=55969&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp (original)
> +++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp Mon Sep  8  
> 20:02:47 2008
> @@ -1499,8 +1499,19 @@
>       Value *TrueVal, *FalseVal, *Cond;
>       if (getValueTypePair(Record, OpNum, NextValueNo, TrueVal) ||
>           getValue(Record, OpNum, TrueVal->getType(), FalseVal) ||
> -          getValue(Record, OpNum, Type::Int1Ty, Cond))
> +          getValue(Record, OpNum, 0 /*skip type check*/, Cond))
>         return Error("Invalid SELECT record");
> +
> +      // select condition can be either i1 or [N x i1]
> +      if (const VectorType* vector_type = dyn_cast<const  
> VectorType>(Cond->getType())) {
> +        // expect <n x i1>
> +        if (vector_type->getElementType() != Type::Int1Ty)
> +          return Error("Invalid SELECT condition type");
> +      } else {
> +        // expect i1
> +        if (Cond->getType() != Type::Int1Ty)
> +          return Error("Invalid SELECT condition type");
> +      }
>
>       I = SelectInst::Create(Cond, TrueVal, FalseVal);
>       break;
> @@ -1563,6 +1574,22 @@
>         I = new VICmpInst((ICmpInst::Predicate)Record[OpNum], LHS,  
> RHS);
>       break;
>     }
> +    case bitc::FUNC_CODE_INST_VCMP: { // VCMP: [opty, opval, opval,  
> pred]
> +      // Fcmp/ICmp returning vector of bool
> +      unsigned OpNum = 0;
> +      Value *LHS, *RHS;
> +      if (getValueTypePair(Record, OpNum, NextValueNo, LHS) ||
> +          getValue(Record, OpNum, LHS->getType(), RHS) ||
> +          OpNum+1 != Record.size())
> +        return Error("Invalid VCMP record");
> +
> +      // will always be vector
> +      if (LHS->getType()->isFPOrFPVector())
> +        I = new FCmpInst((FCmpInst::Predicate)Record[OpNum], LHS,  
> RHS);
> +      else
> +        I = new ICmpInst((ICmpInst::Predicate)Record[OpNum], LHS,  
> RHS);
> +      break;
> +    }
>     case bitc::FUNC_CODE_INST_GETRESULT: { // GETRESULT: [ty, val, n]
>       if (Record.size() != 2)
>         return Error("Invalid GETRESULT record");
>
> Modified: llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=55969&r1=55968&r2=55969&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp (original)
> +++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Mon Sep  8  
> 20:02:47 2008
> @@ -641,7 +641,14 @@
>       case Instruction::FCmp:
>       case Instruction::VICmp:
>       case Instruction::VFCmp:
> -        Code = bitc::CST_CODE_CE_CMP;
> +        if (isa<VectorType>(C->getOperand(0)->getType())
> +            && (CE->getOpcode() == Instruction::ICmp
> +                || CE->getOpcode() == Instruction::FCmp)) {
> +          // compare returning vector of Int1Ty
> +          assert(0 && "Unsupported constant!");
> +        } else {
> +          Code = bitc::CST_CODE_CE_CMP;
> +        }
>         Record.push_back(VE.getTypeID(C->getOperand(0)->getType()));
>         Record.push_back(VE.getValueID(C->getOperand(0)));
>         Record.push_back(VE.getValueID(C->getOperand(1)));
> @@ -765,7 +772,14 @@
>   case Instruction::FCmp:
>   case Instruction::VICmp:
>   case Instruction::VFCmp:
> -    Code = bitc::FUNC_CODE_INST_CMP;
> +    if (isa<VectorType>(I.getOperand(0)->getType())
> +        && (I.getOpcode() == Instruction::ICmp
> +            || I.getOpcode() == Instruction::FCmp)) {
> +      // compare returning vector of Int1Ty
> +      Code = bitc::FUNC_CODE_INST_VCMP;
> +    } else {
> +      Code = bitc::FUNC_CODE_INST_CMP;
> +    }
>     PushValueAndType(I.getOperand(0), InstID, Vals, VE);
>     Vals.push_back(VE.getValueID(I.getOperand(1)));
>     Vals.push_back(cast<CmpInst>(I).getPredicate());
>
> Modified: llvm/trunk/lib/VMCore/Verifier.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Verifier.cpp?rev=55969&r1=55968&r2=55969&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/VMCore/Verifier.cpp (original)
> +++ llvm/trunk/lib/VMCore/Verifier.cpp Mon Sep  8 20:02:47 2008
> @@ -659,8 +659,21 @@
> }
>
> void Verifier::visitSelectInst(SelectInst &SI) {
> -  Assert1(SI.getCondition()->getType() == Type::Int1Ty,
> -          "Select condition type must be bool!", &SI);
> +  if (const VectorType* vt
> +             = dyn_cast<VectorType>(SI.getCondition()->getType())) {
> +    Assert1( vt->getElementType() == Type::Int1Ty,
> +            "Select condition type must be vector of bool!", &SI);
> +    if (const VectorType* val_vt
> +             = dyn_cast<VectorType>(SI.getTrueValue()->getType())) {
> +      Assert1( vt->getNumElements() == val_vt->getNumElements(),
> +               "Select vector size != value vector size", &SI);
> +    } else {
> +      Assert1(0, "Vector select values must have vector types", &SI);
> +    }
> +  } else {
> +    Assert1(SI.getCondition()->getType() == Type::Int1Ty,
> +            "Select condition type must be bool!", &SI);
> +  }
>   Assert1(SI.getTrueValue()->getType() == SI.getFalseValue()- 
> >getType(),
>           "Select values must have identical types!", &SI);
>   Assert1(SI.getTrueValue()->getType() == SI.getType(),
> @@ -1028,7 +1041,7 @@
>   Assert1(Op0Ty == Op1Ty,
>           "Both operands to ICmp instruction are not of the same  
> type!", &IC);
>   // Check that the operands are the right type
> -  Assert1(Op0Ty->isInteger() || isa<PointerType>(Op0Ty),
> +  Assert1(Op0Ty->isIntOrIntVector() || isa<PointerType>(Op0Ty),
>           "Invalid operand types for ICmp instruction", &IC);
>   visitInstruction(IC);
> }
> @@ -1040,7 +1053,7 @@
>   Assert1(Op0Ty == Op1Ty,
>           "Both operands to FCmp instruction are not of the same  
> type!", &FC);
>   // Check that the operands are the right type
> -  Assert1(Op0Ty->isFloatingPoint(),
> +  Assert1(Op0Ty->isFPOrFPVector(),
>           "Invalid operand types for FCmp instruction", &FC);
>   visitInstruction(FC);
> }
>
> Added: llvm/trunk/test/Assembler/vbool-cmp.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/vbool-cmp.ll?rev=55969&view=auto
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/test/Assembler/vbool-cmp.ll (added)
> +++ llvm/trunk/test/Assembler/vbool-cmp.ll Mon Sep  8 20:02:47 2008
> @@ -0,0 +1,15 @@
> +; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | grep {icmp slt}
> +; rudimentary test of fcmp/icmp on vectors returning vector of bool
> +
> +define <4 x i1> @ffoo(<4 x float> %a, <4 x float> %b) nounwind {
> +entry:
> +	%cmp = fcmp olt <4 x float> %a, %b		; <4 x i1> [#uses=1]
> +	ret <4 x i1> %cmp
> +}
> +
> +define <4 x i1> @ifoo(<4 x i32> %a, <4 x i32> %b) nounwind {
> +entry:
> +	%cmp = icmp slt <4 x i32> %a, %b		; <4 x i1> [#uses=1]
> +	ret <4 x i1> %cmp
> +}
> +
>
> Added: llvm/trunk/test/Assembler/vector-select.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/vector-select.ll?rev=55969&view=auto
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/test/Assembler/vector-select.ll (added)
> +++ llvm/trunk/test/Assembler/vector-select.ll Mon Sep  8 20:02:47  
> 2008
> @@ -0,0 +1,11 @@
> +; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | grep select
> +; rudimentary test of select on vectors returning vector of bool
> +
> +define <4 x i32> @foo(<4 x i32> %a, <4 x i32> %b,
> +    <4 x i1> %cond) nounwind  {
> +entry:
> +  %cmp = select <4 x i1>  %cond, <4 x i32> %a, <4 x i32> %b
> +                             ; <4 x i32> [#uses=1]
> +  ret <4 x i32> %cmp
> +}
> +
>
>
> _______________________________________________
> 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  Mon Sep 22 01:30:38 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Sun, 21 Sep 2008 23:30:38 -0700
Subject: [llvm-commits] [llvm] r55807 - in /llvm/trunk:
	lib/Target/X86/X86CallingConv.td lib/Target/X86/X86ISelLowering.cpp
	test/CodeGen/X86/2007-08-13-SpillerReuse.ll
	test/CodeGen/X86/2008-02-22-ReMatBug.ll
	test/CodeGen/X86/coalescer-commute3.ll
	test/CodeGen/X86/combine-lds.ll test/CodeGen/X86/fastcc.ll
In-Reply-To: <484E2891-5028-440E-9C25-875007E6FC66@apple.com>
References: <200809042259.m84MxxkM017095@zion.cs.uiuc.edu>
	<484E2891-5028-440E-9C25-875007E6FC66@apple.com>
Message-ID: <4CA8151C-767A-4CE9-B712-0DDDB11F2217@apple.com>


On Sep 21, 2008, at 12:47 PM, Chris Lattner wrote:

>
> On Sep 4, 2008, at 3:59 PM, Evan Cheng wrote:
>
>> Author: evancheng
>> Date: Thu Sep  4 17:59:58 2008
>> New Revision: 55807
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=55807&view=rev
>> Log:
>> For whatever the reason, x86 CallingConv::Fast (i.e. fastcc) was  
>> not passing scalar arguments in registers. This patch defines a new  
>> fastcc CC which is slightly different from the FastCall CC. In  
>> addition to passing integer arguments in ECX and EDX, it also  
>> specify doubles are passed in 8-byte slots which are 8-byte aligned  
>> (instead of 4-byte aligned). This avoids a potential performance  
>> hazard where doubles span cacheline boundaries.
>
> Okay, cool but:
>
>> @@ -1100,6 +1100,8 @@
>>    return CC_X86_32_FastCall;
>>  else if (CC == CallingConv::Fast && PerformTailCallOpt)
>>    return CC_X86_32_TailCall;
>> +  else if (CC == CallingConv::Fast)
>> +    return CC_X86_32_FastCC;
>
> Does this mean that "PerformTailCallOpt" changes the ABI?

Looks that way. The difference is rather confusing:

TailCall:
   // Nested function trampolines are currently not supported by fastcc.

   // The first 3 integer arguments, if marked 'inreg' and if the call  
is not
   // a vararg call, are passed in integer registers.
   CCIfNotVarArg<CCIfInReg<CCIfType<[i32], CCAssignToReg<[EAX, EDX]>>>>,

FastCC:
   // The 'nest' parameter, if any, is passed in EAX.
   CCIfNest<CCAssignToReg<[EAX]>>,

   // The first 2 integer arguments are passed in ECX/EDX
   CCIfType<[i32], CCAssignToReg<[ECX, EDX]>>,

First of all, the comment about "nested function not being supported  
by fastcc" looks wrong. Secondly, it's not clear to me why the integer  
registers have to be marked inreg to be passed in registers (only EAX,  
EDX, what's the 3rd). Arnold, any ideas?

Evan




>
>
> -Chris
>



From evan.cheng at apple.com  Mon Sep 22 01:45:42 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Sun, 21 Sep 2008 23:45:42 -0700
Subject: [llvm-commits] [llvm] r56310 -
	/llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp
In-Reply-To: <615BE1D9-7BFE-4828-B769-EB796B034932@apple.com>
References: <200809181822.m8IIMW2k002887@zion.cs.uiuc.edu>
	<47A144A2-3B20-467D-8EAA-FB90DF12E434@apple.com>
	<BCAE78C5-2025-4D30-B21F-52F5EC018D71@apple.com>
	<CD630625-C109-40C3-A2EE-D7B51B3425AF@apple.com>
	<BD6FC674-2D9B-4D51-9619-6DDAC02BE402@apple.com>
	<615BE1D9-7BFE-4828-B769-EB796B034932@apple.com>
Message-ID: <AE6F9BF9-97EA-4A92-8C0F-837E396F5122@apple.com>


On Sep 21, 2008, at 11:17 PM, Chris Lattner wrote:

>
> On Sep 21, 2008, at 11:09 PM, Evan Cheng wrote:
>
>> Local liveness hasn't been split out from livevariables. The plan is
>> for DCE to track local liveness.
>
> Ok! That would be great, considering it is already doing a backward
> scan.  Would the register scavenger regtracker help with this?

That also works top down. If we really want accurate local liveness  
(and want to set kill / def markers, perhaps we can reuse  
RALocal::ComputeLocalLiveness().

Previously we thought this won't be necessary. But perhaps it's a good  
idea. If we move RALocal::ComputeLocalLiveness out to a analysis pass,  
then DCE can use and update it and that eliminate the need for local  
register allocator to run it.

Ultimately we want to split LiveVariables into local physical register  
liveness and global virtual register liveness. But this is a good step.

Evan

>
>
> -Chris
>
>>
>>
>> Evan
>>
>> On Sep 21, 2008, at 8:27 PM, Chris Lattner wrote:
>>
>>>
>>> On Sep 21, 2008, at 7:42 PM, Evan Cheng wrote:
>>>
>>>> This happens before livevariables. Remember we don't run LV at -O0.
>>>
>>> Not even local liveness?  That would be enough to handle physregs.
>>>
>>> -Chris
>>>
>>> _______________________________________________
>>> 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
>
> _______________________________________________
> 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  Mon Sep 22 01:52:10 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Sun, 21 Sep 2008 23:52:10 -0700
Subject: [llvm-commits] [llvm] r56384 - in /llvm/trunk/lib/CodeGen:
	RegAllocLinearScan.cpp SimpleRegisterCoalescing.cpp
In-Reply-To: <ADDCBC77-DB9F-46BB-A73D-FADC943C29D7@apple.com>
References: <200809200203.m8K234YA013252@zion.cs.uiuc.edu>
	<4F71A860-E342-4A07-8211-0A59A1AA154D@apple.com>
	<F80F5034-326C-4AF5-A7A6-84F8C1C3AF23@apple.com>
	<8D81D6DA-8289-49E2-B352-53C6C313FDA8@apple.com>
	<33791BFC-A09D-43EB-B4D0-6582A9243EED@apple.com>
	<ADDCBC77-DB9F-46BB-A73D-FADC943C29D7@apple.com>
Message-ID: <6AABEF56-39B2-4D47-8928-7FC4AC7AB61B@apple.com>


On Sep 21, 2008, at 11:19 PM, Chris Lattner wrote:

> On Sep 21, 2008, at 11:17 PM, Evan Cheng wrote:
>>>> While that's the correct approach, it breaks all kinds of
>>>> assumptions
>>>> in liveintervals and the coalescer. It will make the problem much
>>>> more
>>>> complicated. I don't think it's worth the effort.
>>>
>>> What sorts of assumptions?
>>
>> That use must be 1 cycle after instruction cycle, def must be 2  
>> cycles
>> after it.
>
> What code makes this sort of assumption?  It seems fragile.

It's all over the place in coalescer. I'd prefer to fix it only when  
it's necessary. Not for early clobber.

>
>
>>> It typically doesn't have anything to do with a micro architecture,
>>> it
>>> has to do with the fact that an inline asm has multiple  
>>> instructions.
>>> For example if you had an inline asm with:
>>>
>>> "$out0 = inst1 $in1, 4
>>>  $out1 = inst2 $in2, 142"
>>>
>>> Then you'd have to mark $out0 as being an early clobber, because it
>>> is
>>> stored to before $in2 is read.
>>
>> Ewwww.
>
> Eww what? You don't like asms with multiple instructions?  Or you
> prefer CPUs that have instructions that would require this? ;-)

Ewww multi- instruction asm with this horribleness.

Some in-order execution cpu's may require this. Usually it would  
require HW bypass for reads to completed early enough for def to  
target the same registers. It's quite common for some instructions to  
not have the benefit of bypass in some in-order machines.

Evan

>
>
> -Chris
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From viridia at gmail.com  Mon Sep 22 02:14:46 2008
From: viridia at gmail.com (Talin)
Date: Mon, 22 Sep 2008 00:14:46 -0700
Subject: [llvm-commits] [llvm] r55409 - in /llvm/trunk:
 include/llvm/Support/DebugInfoBuilder.h lib/VMCore/DebugInfoBuilder.cpp
In-Reply-To: <1EB8BE6B-6CC8-445E-B964-BF7DE2FA7637@apple.com>
References: <200808270651.m7R6pFf1026223@zion.cs.uiuc.edu>
	<1EB8BE6B-6CC8-445E-B964-BF7DE2FA7637@apple.com>
Message-ID: <48D745E6.8060004@gmail.com>

That all sounds good to me. I would welcome a more abstract interface to 
generating debug information.

I would be tempted to take the proposal even a step further. In the 
current system, debugging information is represented using the same data 
structures that are used to build up global constants and variables - in 
other words, the debugging info is "encoded" using non-debugging LLVM IR 
primitives. The proposal moves in the direction of having specialized 
types and data structures that are optimized for representing debug 
information. It might be possible to go even farther, and create 
specialized representations (both in text and binary form) for debugging 
primitives that do not depend on the normal non-debugging data 
structrures, allowing the debug info to be as compact, type-safe, and 
convenient to use as possible.

(I would say more but I am recovering from a wrist injury and typing is 
painful.)

Chris Lattner wrote:
>
> On Aug 26, 2008, at 11:51 PM, Evan Cheng wrote:
>
>> Author: evancheng
>> Date: Wed Aug 27 01:51:14 2008
>> New Revision: 55409
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=55409&view=rev
>> Log:
>> Add DebugInfoBuilder. Patch by Talin!
>
> Hi Talin,
>
> Your DebugInfoBuilder looks very nice.  Have you had a chance to look 
> at this proposal?
> http://nondot.org/sabre/LLVMNotes/EmbeddedMetadata.txt
>
> One piece of it (that is orthogonal from the rest) is the 'Debug Info 
> Construction/Manipulation Helper Classes' section.  I hadn't had a 
> chance to dig into your debug info builder before writing that, but I 
> now see that they are very very related.
>
> Between the two, I think that my proposal would be preferable because 
> it would give better type info, and lend itself to clients that want 
> to walk existing debug info, instead of just creating debug info.  The 
> other advantage of my proposal is that it would insulate clients from 
> changes in the debug info representation: the debug classes could be 
> based on GlobalVariables today, but the implementation could change 
> under the covers to use MDNodes in the future with no or little 
> changes to the clients.
>
> What are your thoughts?  If we converge on this, I'd like to convert 
> clang and llvm-gcc over to use the interface we finalize on (probably 
> post 2.4).
>
> -Chris
>
>



From baldrick at free.fr  Mon Sep 22 02:22:11 2008
From: baldrick at free.fr (Duncan Sands)
Date: Mon, 22 Sep 2008 09:22:11 +0200
Subject: [llvm-commits] [llvm] r55859 - in /llvm/trunk:
	include/llvm/Analysis/CallGraph.h
	lib/Analysis/IPA/CallGraph.cpp lib/Transforms/IPO/PruneEH.cpp
	lib/Transforms/Utils/InlineFunction.cpp
In-Reply-To: <359F1A29-F6E0-402E-B8ED-7E95C4EBE427@apple.com>
References: <200809052143.m85Lh5AS012722@zion.cs.uiuc.edu>
	<359F1A29-F6E0-402E-B8ED-7E95C4EBE427@apple.com>
Message-ID: <200809220922.12032.baldrick@free.fr>

> Nice!  Does this allow the patch in http://llvm.org/bugs/show_bug.cgi?id=2221 
>   to go in now?

No need for that patch - I already made the change independently!
As far as I know I resolved all the issues mentioned in that PR.

Ciao,

Duncan.


From baldrick at free.fr  Mon Sep 22 02:37:47 2008
From: baldrick at free.fr (Duncan Sands)
Date: Mon, 22 Sep 2008 09:37:47 +0200
Subject: [llvm-commits] [llvm-gcc-4.2] r55796 -
	/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
In-Reply-To: <B7ED6CA5-90F5-4532-B964-237A64B2A0D1@apple.com>
References: <200809042123.m84LNekC013647@zion.cs.uiuc.edu>
	<200809092138.09813.baldrick@free.fr>
	<B7ED6CA5-90F5-4532-B964-237A64B2A0D1@apple.com>
Message-ID: <200809220937.47428.baldrick@free.fr>

> OTOH, a flavor of this is also a front-end issue: fortran code never  
> uses errno, so it is safe (in fortran) to optimize to a representation  
> that doesn't generate errno.

Right, same with Ada.  That's why the Ada front-end marks these
kind of things 'const', causing them to end up 'readnone' in the
IR.

Ciao,

Duncan.


From baldrick at free.fr  Mon Sep 22 02:54:33 2008
From: baldrick at free.fr (Duncan Sands)
Date: Mon, 22 Sep 2008 09:54:33 +0200
Subject: [llvm-commits] [llvm] r55807 - in /llvm/trunk:
	lib/Target/X86/X86CallingConv.td lib/Target/X86/X86ISelLowering.cpp
	test/CodeGen/X86/2007-08-13-SpillerReuse.ll
	test/CodeGen/X86/2008-02-22-ReMatBug.ll
	test/CodeGen/X86/coalescer-commute3.ll
	test/CodeGen/X86/combine-lds.ll test/CodeGen/X86/fastcc.ll
In-Reply-To: <4CA8151C-767A-4CE9-B712-0DDDB11F2217@apple.com>
References: <200809042259.m84MxxkM017095@zion.cs.uiuc.edu>
	<484E2891-5028-440E-9C25-875007E6FC66@apple.com>
	<4CA8151C-767A-4CE9-B712-0DDDB11F2217@apple.com>
Message-ID: <200809220954.33916.baldrick@free.fr>

> > Does this mean that "PerformTailCallOpt" changes the ABI?

Arnold already agreed that tailcall could use the new calling convention,
i.e. be the same as fastcc.

> First of all, the comment about "nested function not being supported  
> by fastcc" looks wrong.

It is correct.  The problem is that the tailcall logic reserves a
register (ECX; would be EAX in new fastcc) for its own use.  The
trampoline stuff wants that same register to do trampoline stuff
(it's the only spare register).  If the two calling conventions are
merged (i.e. tailcall cc dropped), there would be the problem of
detecting that tailcall and trampoline are fighting for the same
register, so an error can be issued.  I think the right solution is
to explicitly represent in the td that tailcall wants the register,
in much the same way as trampoline stuff does.  Something like this:

   CCIfTailCall<CCAssignToReg<[EAX]>>,

Ciao,

Duncan.

PS: There might be other incompatibilities between tailcall and
trampolines, but I can't say because I don't know what tailcall
does exactly.


From arnold.schwaighofer at gmail.com  Mon Sep 22 04:31:22 2008
From: arnold.schwaighofer at gmail.com (Arnold Schwaighofer)
Date: Mon, 22 Sep 2008 11:31:22 +0200
Subject: [llvm-commits] [llvm] r55807 - in /llvm/trunk:
	lib/Target/X86/X86CallingConv.td lib/Target/X86/X86ISelLowering.cpp
	test/CodeGen/X86/2007-08-13-SpillerReuse.ll
	test/CodeGen/X86/2008-02-22-ReMatBug.ll
	test/CodeGen/X86/coalescer-commute3.ll test/Cod
Message-ID: <b8c6f2610809220231v6f337ed1yf61ea4c7b2754ad1@mail.gmail.com>

On Mon, Sep 22, 2008 at 9:54 AM, Duncan Sands <baldrick at free.fr> wrote:
>> > Does this mean that "PerformTailCallOpt" changes the ABI?
>
> Arnold already agreed that tailcall could use the new calling convention,
> i.e. be the same as fastcc.
>
>> First of all, the comment about "nested function not being supported
>> by fastcc" looks wrong.
>
> It is correct.  The problem is that the tailcall logic reserves a
> register (ECX; would be EAX in new fastcc) for its own use.  The
> trampoline stuff wants that same register to do trampoline stuff
> (it's the only spare register).  If the two calling conventions are
> merged (i.e. tailcall cc dropped), there would be the problem of
> detecting that tailcall and trampoline are fighting for the same
> register, so an error can be issued.  I think the right solution is
> to explicitly represent in the td that tailcall wants the register,
> in much the same way as trampoline stuff does.  Something like this:
Yes as duncan says tail call optimization requires a (caller saved)
register for a function call via a pointer. That is why tailcall
convention differs from the others. I initially created it by copying
the std convention and modifying it. That's were the wrong comment
regarding the three registers comes from it should actually read two
registers are available. There actually is no reason that prevents
CC_X86_32_TailCall from being replaced by CC_X86_32_FastCC. (eax would
be used as the function pointer register, also see discussion
<http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20080908/067075.html>).
I wanted to change that but have not come around to do it yet.

BUT there still is an ABI difference when -tailcallopt is enabled.

To support general tail call optimization (in cases where the callee
can require more room for its arguments than the caller provides) the
calling convention is changed from caller pops arguments to callee
pops arguments. This is necessary as the caller does not know how many
arguments there are to pop in cases where the called function performs
a tail call itself. (caller() calls callee(a,b) tailcalls
calleecallee(a,b,c,d), how many arguments are there to pop for caller
2 or 4)

So in cases where a library would be compiled with -tailcallopt
enabled and a the program using the library would be compiled without
-tailcallopt all hell would break loose.

Possible solutions:
- Document this fact! ;)
- Only optimize sibling tail calls (callee argument area <= caller
argument area, calller pops arguments can be used) with fastcc calls
and create a new calling convention TailCall which is always 'callee
pops arguments' even if -tailcallopt is not enabled.

regards arnold


From rafael.espindola at gmail.com  Mon Sep 22 05:06:27 2008
From: rafael.espindola at gmail.com (Rafael Espindola)
Date: Mon, 22 Sep 2008 10:06:27 -0000
Subject: [llvm-commits] [llvm] r56432 -
	/llvm/trunk/include/llvm/ADT/SmallVector.h
Message-ID: <200809221006.m8MA6SB2014517@zion.cs.uiuc.edu>

Author: rafael
Date: Mon Sep 22 05:06:26 2008
New Revision: 56432

URL: http://llvm.org/viewvc/llvm-project?rev=56432&view=rev
Log:
Add bound checks in SmallVector


Modified:
    llvm/trunk/include/llvm/ADT/SmallVector.h

Modified: llvm/trunk/include/llvm/ADT/SmallVector.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/SmallVector.h?rev=56432&r1=56431&r2=56432&view=diff

==============================================================================
--- llvm/trunk/include/llvm/ADT/SmallVector.h (original)
+++ llvm/trunk/include/llvm/ADT/SmallVector.h Mon Sep 22 05:06:26 2008
@@ -19,6 +19,7 @@
 #include <algorithm>
 #include <cstring>
 #include <memory>
+#include <cassert>
 
 #ifdef _MSC_VER
 namespace std {
@@ -116,10 +117,14 @@
   const_reverse_iterator rend() const { return const_reverse_iterator(begin());}
   
   
+  /* These asserts could be "Begin + idx < End", but there are lots of places
+     in llvm where we use &v[v.size()] instead of v.end(). */
   reference operator[](unsigned idx) {
+    assert (Begin + idx <= End);
     return Begin[idx];
   }
   const_reference operator[](unsigned idx) const {
+    assert (Begin + idx <= End);
     return Begin[idx];
   }
   




From arnold.schwaighofer at gmail.com  Mon Sep 22 06:09:21 2008
From: arnold.schwaighofer at gmail.com (Arnold Schwaighofer)
Date: Mon, 22 Sep 2008 13:09:21 +0200
Subject: [llvm-commits] [llvm] r55807 - in /llvm/trunk:
	lib/Target/X86/X86CallingConv.td lib/Target/X86/X86ISelLowering.cpp
	test/CodeGen/X86/2007-08-13-SpillerReuse.ll
	test/CodeGen/X86/2008-02-22-ReMatBug.ll
	test/CodeGen/X86/coalescer-commute3.ll test/Cod
Message-ID: <b8c6f2610809220409k5e717daevc547b8d8f0652c9d@mail.gmail.com>

> TailCall:
>  // Nested function trampolines are currently not supported by fastcc.
Should read:
Nested function trampolines are currently not supported by fastcc when
-tailcallopt is enabled because i don't know the implications of
trampolines.

>  // The first 3 integer arguments, if marked 'inreg' and if the call is not
>  // a vararg call, are passed in integer registers.
>  CCIfNotVarArg<CCIfInReg<CCIfType<[i32], CCAssignToReg<[EAX, EDX]>>>>,
Should read:
// the first 2
> FastCC:
>  // The 'nest' parameter, if any, is passed in EAX.
>  CCIfNest<CCAssignToReg<[EAX]>>,
>
>  // The first 2 integer arguments are passed in ECX/EDX
>  CCIfType<[i32], CCAssignToReg<[ECX, EDX]>>,
>
> First of all, the comment about "nested function not being supported by
> fastcc" looks wrong. Secondly, it's not clear to me why the integer
> registers have to be marked inreg to be passed in registers (only EAX, EDX,
> what's the 3rd). Arnold, any ideas?
The only 'reason' is that the calling convention was a copy of the std
convention.


From baldrick at free.fr  Mon Sep 22 06:32:54 2008
From: baldrick at free.fr (Duncan Sands)
Date: Mon, 22 Sep 2008 13:32:54 +0200
Subject: [llvm-commits] [llvm] r55807 - in /llvm/trunk:
	lib/Target/X86/X86CallingConv.td lib/Target/X86/X86ISelLowering.cpp
	test/CodeGen/X86/2007-08-13-SpillerReuse.ll
	test/CodeGen/X86/2008-02-22-ReMatBug.ll
	test/CodeGen/X86/coalescer-commute3.ll test/Cod
In-Reply-To: <b8c6f2610809220409k5e717daevc547b8d8f0652c9d@mail.gmail.com>
References: <b8c6f2610809220409k5e717daevc547b8d8f0652c9d@mail.gmail.com>
Message-ID: <200809221332.54305.baldrick@free.fr>

Hi Arnold,

> Nested function trampolines are currently not supported by fastcc when
> -tailcallopt is enabled because i don't know the implications of
> trampolines.

trampolines work like this.  Suppose you have a function
  i32 @f(i8* nest, i32, i32)
Then a trampoline lets you call it as if it didn't take
the first parameter (the one marked with the nest attribute),
i.e. as if it looked like this:
  i32 @f_tramp(i32, i32)
The value V to be passed as the i8* is specified when you
create the trampoline.  The trampoline intrinsic hands
you a pointer P to a i32(i32, i32) function.  If someone
does a call i32(i32, i32)* P(i32 x, i32 y) then the trampoline
magic splices in the value for V, and the effect is as if you
called @f(i8* V, i32 x, i32 y).  Yes, this is actually useful :)

How is this implemented?  The code generators create a bit
of executable code on the stack that does:

  load V into ecx <= register reserved by trampoline
  jump to @f

The pointer P returned by the trampoline intrinsic points
to the "load V into ecx" instruction on the stack.  A call
to P then results in a call to @f with V held in ecx.  And
that's it.  I have no idea how this interacts with tail
calls.  Since the call to the trampoline is always an indirect
call, maybe it never gets turned into a tail call?

Ciao,

Duncan.


From baldrick at free.fr  Mon Sep 22 09:46:39 2008
From: baldrick at free.fr (Duncan Sands)
Date: Mon, 22 Sep 2008 16:46:39 +0200
Subject: [llvm-commits] [llvm] r56337 - in /llvm/trunk:
	test/Analysis/CallGraph/2008-09-09-DirectCall.ll
	test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll
	test/Other/2002-01-31-CallGraph.ll tools/opt/AnalysisWrappers.cpp
In-Reply-To: <0EE8C571-DA8D-4C9A-BE3F-F63486A77CB8@apple.com>
References: <200809190757.m8J7vA0C007167@zion.cs.uiuc.edu>
	<0EE8C571-DA8D-4C9A-BE3F-F63486A77CB8@apple.com>
Message-ID: <200809221646.39541.baldrick@free.fr>

Hi Devang,

> How about renaming -callgraph as -dump-callgraph ?

opt has the following options that print info.

    -callgraph                            - Print a call graph
    -callscc                              - Print SCCs of the Call Graph
    -cfgscc                               - Print SCCs of each function CFG
    -externalfnconstants                  - Print external fn callsites passed constants
    -print                                - Print function to stderr
    -print-alias-sets                     - Alias Set Printer
    -print-callgraph                      - Print Call Graph to 'dot' file
    -print-cfg                            - Print CFG of function to 'dot' file
    -print-cfg-only                       - Print CFG of function to 'dot' file (with no function bodies)
    -print-dom-info                       - Dominator Info Printer
    -printm                               - Print module to stderr
    -printusedtypes                       - Find Used Types

It seems a bit of a mess.  What do you think of the following changes:

    -callgraph => print-callgraph
    -callscc   => print-callgraph-sccs
    -cfgscc    => print-cfg-sccs
    -externalfnconstants => print-externalfnconstants
    -print               => print-function
    -print-alias-sets (no change)
    -print-callgraph     => dot-callgraph
    -print-cfg           => dot-cfg
    -print-cfg-only      => dot-cfg-only
    -print-dom-info (no change)
    -printm              => print-module
    -printusedtypes      => print-used-types

?

Ciao,

Duncan.


From arnold.schwaighofer at gmail.com  Mon Sep 22 09:50:07 2008
From: arnold.schwaighofer at gmail.com (Arnold Schwaighofer)
Date: Mon, 22 Sep 2008 14:50:07 -0000
Subject: [llvm-commits] [llvm] r56436 - in /llvm/trunk:
 lib/Target/X86/X86CallingConv.td lib/Target/X86/X86FastISel.cpp
 lib/Target/X86/X86ISelLowering.cpp test/CodeGen/X86/tailcall-stackalign.ll
 test/CodeGen/X86/tailcallbyval.ll test/CodeGen/X86/tailcallfp2.ll
Message-ID: <200809221450.m8MEo8Tc003842@zion.cs.uiuc.edu>

Author: arnolds
Date: Mon Sep 22 09:50:07 2008
New Revision: 56436

URL: http://llvm.org/viewvc/llvm-project?rev=56436&view=rev
Log:
Change the calling convention used when tail call optimization is enabled from CC_X86_32_TailCall to CC_X86_32_FastCC.

Modified:
    llvm/trunk/lib/Target/X86/X86CallingConv.td
    llvm/trunk/lib/Target/X86/X86FastISel.cpp
    llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
    llvm/trunk/test/CodeGen/X86/tailcall-stackalign.ll
    llvm/trunk/test/CodeGen/X86/tailcallbyval.ll
    llvm/trunk/test/CodeGen/X86/tailcallfp2.ll

Modified: llvm/trunk/lib/Target/X86/X86CallingConv.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86CallingConv.td?rev=56436&r1=56435&r2=56436&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86CallingConv.td (original)
+++ llvm/trunk/lib/Target/X86/X86CallingConv.td Mon Sep 22 09:50:07 2008
@@ -312,22 +312,6 @@
   CCDelegateTo<CC_X86_32_Common>
 ]>;
 
-/// Same as C calling convention except for non-free ECX which is used for storing 
-/// a potential pointer to the tail called function.
-def CC_X86_32_TailCall : CallingConv<[
-  // Promote i8/i16 arguments to i32.
-  CCIfType<[i8, i16], CCPromoteToType<i32>>,
-
-  // Nested function trampolines are currently not supported by fastcc.
-  
-  // The first 3 integer arguments, if marked 'inreg' and if the call is not
-  // a vararg call, are passed in integer registers.
-  CCIfNotVarArg<CCIfInReg<CCIfType<[i32], CCAssignToReg<[EAX, EDX]>>>>,
-
-  // Otherwise, same as everything else.
-  CCDelegateTo<CC_X86_32_Common>
-]>;
-
 def CC_X86_32_FastCall : CallingConv<[
   // Promote i8/i16 arguments to i32.
   CCIfType<[i8, i16], CCPromoteToType<i32>>,

Modified: llvm/trunk/lib/Target/X86/X86FastISel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86FastISel.cpp?rev=56436&r1=56435&r2=56436&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86FastISel.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86FastISel.cpp Mon Sep 22 09:50:07 2008
@@ -142,8 +142,6 @@
 
   if (CC == CallingConv::X86_FastCall)
     return CC_X86_32_FastCall;
-  else if (CC == CallingConv::Fast && isTaillCall)
-    return CC_X86_32_TailCall;
   else if (CC == CallingConv::Fast)
     return CC_X86_32_FastCC;
   else

Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=56436&r1=56435&r2=56436&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Mon Sep 22 09:50:07 2008
@@ -890,7 +890,7 @@
     SDValue TargetAddress = TailCall.getOperand(1);
     SDValue StackAdjustment = TailCall.getOperand(2);
     assert(((TargetAddress.getOpcode() == ISD::Register &&
-               (cast<RegisterSDNode>(TargetAddress)->getReg() == X86::ECX ||
+               (cast<RegisterSDNode>(TargetAddress)->getReg() == X86::EAX ||
                 cast<RegisterSDNode>(TargetAddress)->getReg() == X86::R9)) ||
               TargetAddress.getOpcode() == ISD::TargetExternalSymbol ||
               TargetAddress.getOpcode() == ISD::TargetGlobalAddress) && 
@@ -1098,8 +1098,6 @@
 
   if (CC == CallingConv::X86_FastCall)
     return CC_X86_32_FastCall;
-  else if (CC == CallingConv::Fast && PerformTailCallOpt)
-    return CC_X86_32_TailCall;
   else if (CC == CallingConv::Fast)
     return CC_X86_32_FastCC;
   else
@@ -1700,7 +1698,7 @@
   } else if (ExternalSymbolSDNode *S = dyn_cast<ExternalSymbolSDNode>(Callee)) {
     Callee = DAG.getTargetExternalSymbol(S->getSymbol(), getPointerTy());
   } else if (IsTailCall) {
-    unsigned Opc = Is64Bit ? X86::R9 : X86::ECX;
+    unsigned Opc = Is64Bit ? X86::R9 : X86::EAX;
 
     Chain = DAG.getCopyToReg(Chain, 
                              DAG.getRegister(Opc, getPointerTy()), 

Modified: llvm/trunk/test/CodeGen/X86/tailcall-stackalign.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/tailcall-stackalign.ll?rev=56436&r1=56435&r2=56436&view=diff

==============================================================================
--- llvm/trunk/test/CodeGen/X86/tailcall-stackalign.ll (original)
+++ llvm/trunk/test/CodeGen/X86/tailcall-stackalign.ll Mon Sep 22 09:50:07 2008
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc  -mtriple=i686-unknown-linux  -tailcallopt | grep -A 1 call | grep -A 1 tailcaller | grep subl | grep 20
+; RUN: llvm-as < %s | llc  -mtriple=i686-unknown-linux  -tailcallopt | grep -A 1 call | grep -A 1 tailcaller | grep subl | grep 12
 ; Linux has 8 byte alignment so the params cause stack size 20 when tailcallopt
 ; is enabled, ensure that a normal fastcc call has matching stack size
 

Modified: llvm/trunk/test/CodeGen/X86/tailcallbyval.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/tailcallbyval.ll?rev=56436&r1=56435&r2=56436&view=diff

==============================================================================
--- llvm/trunk/test/CodeGen/X86/tailcallbyval.ll (original)
+++ llvm/trunk/test/CodeGen/X86/tailcallbyval.ll Mon Sep 22 09:50:07 2008
@@ -1,6 +1,6 @@
 ; RUN: llvm-as < %s | llc -march=x86 -tailcallopt | grep TAILCALL
 ; check for the 2 byval moves
-; RUN: llvm-as < %s | llc -march=x86 -tailcallopt | grep rep | wc -l | grep 2
+; RUN: llvm-as < %s | llc -march=x86 -tailcallopt | grep movl | grep ecx | grep eax | wc -l | grep 1
 %struct.s = type {i32, i32, i32, i32, i32, i32, i32, i32,
                   i32, i32, i32, i32, i32, i32, i32, i32,
                   i32, i32, i32, i32, i32, i32, i32, i32 }

Modified: llvm/trunk/test/CodeGen/X86/tailcallfp2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/tailcallfp2.ll?rev=56436&r1=56435&r2=56436&view=diff

==============================================================================
--- llvm/trunk/test/CodeGen/X86/tailcallfp2.ll (original)
+++ llvm/trunk/test/CodeGen/X86/tailcallfp2.ll Mon Sep 22 09:50:07 2008
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -tailcallopt | grep {jmp} | grep {\\*%ecx}
+; RUN: llvm-as < %s | llc -march=x86 -tailcallopt | grep {jmp} | grep {\\*%eax}
 
 declare i32 @putchar(i32)
 




From clattner at apple.com  Mon Sep 22 10:43:40 2008
From: clattner at apple.com (Chris Lattner)
Date: Mon, 22 Sep 2008 08:43:40 -0700
Subject: [llvm-commits] [llvm] r55807 - in /llvm/trunk:
	lib/Target/X86/X86CallingConv.td lib/Target/X86/X86ISelLowering.cpp
	test/CodeGen/X86/2007-08-13-SpillerReuse.ll
	test/CodeGen/X86/2008-02-22-ReMatBug.ll
	test/CodeGen/X86/coalescer-commute3.ll
	test/CodeGen/X86/combine-lds.ll test/CodeGen/X86/fastcc.ll
In-Reply-To: <4CA8151C-767A-4CE9-B712-0DDDB11F2217@apple.com>
References: <200809042259.m84MxxkM017095@zion.cs.uiuc.edu>
	<484E2891-5028-440E-9C25-875007E6FC66@apple.com>
	<4CA8151C-767A-4CE9-B712-0DDDB11F2217@apple.com>
Message-ID: <D140DCC7-D1A7-45C5-9321-9DF7972B17B7@apple.com>


On Sep 21, 2008, at 11:30 PM, Evan Cheng wrote:

>  Secondly, it's not clear to me why the integer registers have to be  
> marked inreg to be passed in registers (only EAX, EDX, what's the  
> 3rd). Arnold, any ideas?

I thought that this was how the normal x86-32 calling conv worked:   
Integer values are passed on the stack unless -mregparm (or attribute)  
is used, which tags the arguments with 'inreg'

-Chris


From clattner at apple.com  Mon Sep 22 10:45:46 2008
From: clattner at apple.com (Chris Lattner)
Date: Mon, 22 Sep 2008 08:45:46 -0700
Subject: [llvm-commits] [llvm] r56384 - in /llvm/trunk/lib/CodeGen:
	RegAllocLinearScan.cpp SimpleRegisterCoalescing.cpp
In-Reply-To: <6AABEF56-39B2-4D47-8928-7FC4AC7AB61B@apple.com>
References: <200809200203.m8K234YA013252@zion.cs.uiuc.edu>
	<4F71A860-E342-4A07-8211-0A59A1AA154D@apple.com>
	<F80F5034-326C-4AF5-A7A6-84F8C1C3AF23@apple.com>
	<8D81D6DA-8289-49E2-B352-53C6C313FDA8@apple.com>
	<33791BFC-A09D-43EB-B4D0-6582A9243EED@apple.com>
	<ADDCBC77-DB9F-46BB-A73D-FADC943C29D7@apple.com>
	<6AABEF56-39B2-4D47-8928-7FC4AC7AB61B@apple.com>
Message-ID: <73CDDC9A-1C75-4A15-9931-12DDC51EABCB@apple.com>

On Sep 21, 2008, at 11:52 PM, Evan Cheng wrote:
> On Sep 21, 2008, at 11:19 PM, Chris Lattner wrote:
>> On Sep 21, 2008, at 11:17 PM, Evan Cheng wrote:
>>>>> While that's the correct approach, it breaks all kinds of
>>>>> assumptions
>>>>> in liveintervals and the coalescer. It will make the problem much
>>>>> more
>>>>> complicated. I don't think it's worth the effort.
>>>>
>>>> What sorts of assumptions?
>>>
>>> That use must be 1 cycle after instruction cycle, def must be 2
>>> cycles
>>> after it.
>>
>> What code makes this sort of assumption?  It seems fragile.
>
> It's all over the place in coalescer. I'd prefer to fix it only when
> it's necessary. Not for early clobber.

Can you give me an example?  It sounds like these sorts of assumptions  
are exactly what we want: you can only coalesce a def/use of a copy if  
the live ranges exactly line up.  Overlapping by one slot is a *good*  
thing because we want to prevent coalescing.

>>>> Then you'd have to mark $out0 as being an early clobber, because it
>>>> is
>>>> stored to before $in2 is read.
>>>
>>> Ewwww.
>>
>> Eww what? You don't like asms with multiple instructions?  Or you
>> prefer CPUs that have instructions that would require this? ;-)
>
> Ewww multi- instruction asm with this horribleness.
>
> Some in-order execution cpu's may require this. Usually it would
> require HW bypass for reads to completed early enough for def to
> target the same registers. It's quite common for some instructions to
> not have the benefit of bypass in some in-order machines.

Can earlyclobber operands be used to model the armv4 "mul" register  
weirdness where the input and output regs can't be the same?

-Chris


From clattner at apple.com  Mon Sep 22 10:46:44 2008
From: clattner at apple.com (Chris Lattner)
Date: Mon, 22 Sep 2008 08:46:44 -0700
Subject: [llvm-commits] [llvm] r55859 - in /llvm/trunk:
	include/llvm/Analysis/CallGraph.h
	lib/Analysis/IPA/CallGraph.cpp lib/Transforms/IPO/PruneEH.cpp
	lib/Transforms/Utils/InlineFunction.cpp
In-Reply-To: <200809220922.12032.baldrick@free.fr>
References: <200809052143.m85Lh5AS012722@zion.cs.uiuc.edu>
	<359F1A29-F6E0-402E-B8ED-7E95C4EBE427@apple.com>
	<200809220922.12032.baldrick@free.fr>
Message-ID: <02B8AE29-ECD2-473E-82CE-7E54A142D65B@apple.com>


On Sep 22, 2008, at 12:22 AM, Duncan Sands wrote:

>> Nice!  Does this allow the patch in http://llvm.org/bugs/show_bug.cgi?id=2221
>>  to go in now?
>
> No need for that patch - I already made the change independently!
> As far as I know I resolved all the issues mentioned in that PR.

Woo, even better.  Thanks Duncan!

-Chris


From clattner at apple.com  Mon Sep 22 10:50:43 2008
From: clattner at apple.com (Chris Lattner)
Date: Mon, 22 Sep 2008 08:50:43 -0700
Subject: [llvm-commits] [llvm] r55807 - in /llvm/trunk:
	lib/Target/X86/X86CallingConv.td lib/Target/X86/X86ISelLowering.cpp
	test/CodeGen/X86/2007-08-13-SpillerReuse.ll
	test/CodeGen/X86/2008-02-22-ReMatBug.ll	test/CodeGen/X86/coalescer-commute3.ll
	test/Cod
In-Reply-To: <b8c6f2610809220231v6f337ed1yf61ea4c7b2754ad1@mail.gmail.com>
References: <b8c6f2610809220231v6f337ed1yf61ea4c7b2754ad1@mail.gmail.com>
Message-ID: <C38F7563-1695-4EBA-AA57-6A7BB34D2387@apple.com>


On Sep 22, 2008, at 2:31 AM, Arnold Schwaighofer wrote:

> On Mon, Sep 22, 2008 at 9:54 AM, Duncan Sands <baldrick at free.fr>  
> wrote:
>>>> Does this mean that "PerformTailCallOpt" changes the ABI?
>>
>> Arnold already agreed that tailcall could use the new calling  
>> convention,
>> i.e. be the same as fastcc.

> BUT there still is an ABI difference when -tailcallopt is enabled.

>
> So in cases where a library would be compiled with -tailcallopt
> enabled and a the program using the library would be compiled without
> -tailcallopt all hell would break loose.

After sleeping on it, I think that this is actually ok.  We reserve  
the right to change the 'fastcc' ABI across LLVM releases anyway,  
which means that it isn't a stable thing that people can depend on.   
The optimizers only introduce it when it knows all callers of a  
function, thus it should be safe to do whatever we want within a  
model, so long as it is consistent within that module.

Front-end authors that are using this should know that -tailcallopt  
affects the fastcc ABI and not use it if possible.

However, isn't the plan to eventually remove -tailcallopt, enabling it  
all the time?

-Chris



From clattner at apple.com  Mon Sep 22 10:51:21 2008
From: clattner at apple.com (Chris Lattner)
Date: Mon, 22 Sep 2008 08:51:21 -0700
Subject: [llvm-commits] [llvm] r56337 - in /llvm/trunk:
	test/Analysis/CallGraph/2008-09-09-DirectCall.ll
	test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll
	test/Other/2002-01-31-CallGraph.ll tools/opt/AnalysisWrappers.cpp
In-Reply-To: <200809221646.39541.baldrick@free.fr>
References: <200809190757.m8J7vA0C007167@zion.cs.uiuc.edu>
	<0EE8C571-DA8D-4C9A-BE3F-F63486A77CB8@apple.com>
	<200809221646.39541.baldrick@free.fr>
Message-ID: <EC71A909-8284-4E65-99D7-20F2AEA9580B@apple.com>

On Sep 22, 2008, at 7:46 AM, Duncan Sands wrote:
> Hi Devang,
>
>> How about renaming -callgraph as -dump-callgraph ?
>
> opt has the following options that print info.
> It seems a bit of a mess.  What do you think of the following changes:

Works for me!

-Chris

>
>
>    -callgraph => print-callgraph
>    -callscc   => print-callgraph-sccs
>    -cfgscc    => print-cfg-sccs
>    -externalfnconstants => print-externalfnconstants
>    -print               => print-function
>    -print-alias-sets (no change)
>    -print-callgraph     => dot-callgraph
>    -print-cfg           => dot-cfg
>    -print-cfg-only      => dot-cfg-only
>    -print-dom-info (no change)
>    -printm              => print-module
>    -printusedtypes      => print-used-types
>
> ?
>
> Ciao,
>
> Duncan.
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From arnold.schwaighofer at gmail.com  Mon Sep 22 11:20:13 2008
From: arnold.schwaighofer at gmail.com (Arnold Schwaighofer)
Date: Mon, 22 Sep 2008 18:20:13 +0200
Subject: [llvm-commits] [llvm] r55807 - in /llvm/trunk:
	lib/Target/X86/X86CallingConv.td lib/Target/X86/X86ISelLowering.cpp
	test/CodeGen/X86/2007-08-13-SpillerReuse.ll
	test/CodeGen/X86/2008-02-22-ReMatBug.ll
	test/CodeGen/X86/coalescer-commute3.ll test/Cod
In-Reply-To: <C38F7563-1695-4EBA-AA57-6A7BB34D2387@apple.com>
References: <b8c6f2610809220231v6f337ed1yf61ea4c7b2754ad1@mail.gmail.com>
	<C38F7563-1695-4EBA-AA57-6A7BB34D2387@apple.com>
Message-ID: <b8c6f2610809220920n7a515923p3c0a6d4965324bb6@mail.gmail.com>

On Mon, Sep 22, 2008 at 5:50 PM, Chris Lattner <clattner at apple.com> wrote:
>> So in cases where a library would be compiled with -tailcallopt
>> enabled and a the program using the library would be compiled without
>> -tailcallopt all hell would break loose.
>
> After sleeping on it, I think that this is actually ok.  We reserve
> the right to change the 'fastcc' ABI across LLVM releases anyway,
> which means that it isn't a stable thing that people can depend on.
> The optimizers only introduce it when it knows all callers of a
> function, thus it should be safe to do whatever we want within a
> model, so long as it is consistent within that module.
Yes after thinking about it i remembered that i brought this problem
up when i first introduced -tailcallopt and something along the lines
of the above was the conclusion.
> Front-end authors that are using this should know that -tailcallopt
> affects the fastcc ABI and not use it if possible.
Yes maybe i should add this somewhere to the documentation.
<http://llvm.org/docs/CodeGenerator.html#targetimpls> might be a good
place. Stating something along the lines:

NOTE: If -tailcallopt is enabled the ABI of fastcc changes. Modules
compiled with -tailcallopt will not work together with modules
compiled without it.

> However, isn't the plan to eventually remove -tailcallopt, enabling it
> all the time?
The last time (a while ago :) i checked (by running the testsuite) the
performance was worse. There could be 4 reasons.
1.) fastcc + -tailcallopt results in an additional 'subl %esp
ncallee_pops_arg_cnt' after every call site.
  (if you have a sequence of tailcalls this is not bad since you pay
only for the first call, but if all calls are normal calls this might
get expensive)
2.) fastcc + -tailcallopt passed no arguments in registers while
fastcc without -tailcallopt enabled did
3.) due to lowering of arguments onto the callers arguments additional
moves to the stack might be introduced.
4.) something else i have not thought of ;)

When i did the performance testing i tried another version where only
sibling tail calls were optimized so i could follow a caller pops
arguments convention and performance still was worse compared to when
-tailcallopt was disabled. Whether and why i didn't think of 2 and the
obvious solution i don't remember. I guess i will do another round of
testing. To see what happens now e.g after
<http://llvm.org/viewvc/llvm-project?rev=56436&view=rev>.

regards


From evan.cheng at apple.com  Mon Sep 22 11:57:11 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Mon, 22 Sep 2008 09:57:11 -0700
Subject: [llvm-commits] [llvm] r55807 - in /llvm/trunk:
	lib/Target/X86/X86CallingConv.td lib/Target/X86/X86ISelLowering.cpp
	test/CodeGen/X86/2007-08-13-SpillerReuse.ll
	test/CodeGen/X86/2008-02-22-ReMatBug.ll	test/CodeGen/X86/coalescer-commute3.ll
	test/Cod
In-Reply-To: <b8c6f2610809220920n7a515923p3c0a6d4965324bb6@mail.gmail.com>
References: <b8c6f2610809220231v6f337ed1yf61ea4c7b2754ad1@mail.gmail.com>
	<C38F7563-1695-4EBA-AA57-6A7BB34D2387@apple.com>
	<b8c6f2610809220920n7a515923p3c0a6d4965324bb6@mail.gmail.com>
Message-ID: <5EF9AA59-E096-42C0-A0DC-413B15440AFE@apple.com>


On Sep 22, 2008, at 9:20 AM, Arnold Schwaighofer wrote:

>
>
>> However, isn't the plan to eventually remove -tailcallopt, enabling  
>> it
>> all the time?
> The last time (a while ago :) i checked (by running the testsuite) the
> performance was worse. There could be 4 reasons.
> 1.) fastcc + -tailcallopt results in an additional 'subl %esp
> ncallee_pops_arg_cnt' after every call site.
>  (if you have a sequence of tailcalls this is not bad since you pay
> only for the first call, but if all calls are normal calls this might
> get expensive)
> 2.) fastcc + -tailcallopt passed no arguments in registers while
> fastcc without -tailcallopt enabled did

I don't think that was the case. For whatever the reason, fastcc was  
not passing arguments in registers. I fixed that recently.


>
> 3.) due to lowering of arguments onto the callers arguments additional
> moves to the stack might be introduced.
> 4.) something else i have not thought of ;)
>
> When i did the performance testing i tried another version where only
> sibling tail calls were optimized so i could follow a caller pops
> arguments convention and performance still was worse compared to when
> -tailcallopt was disabled. Whether and why i didn't think of 2 and the
> obvious solution i don't remember. I guess i will do another round of
> testing. To see what happens now e.g after
> <http://llvm.org/viewvc/llvm-project?rev=56436&view=rev>.

Thanks.

Evan

>
>
> regards
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From gohman at apple.com  Mon Sep 22 12:05:58 2008
From: gohman at apple.com (Dan Gohman)
Date: Mon, 22 Sep 2008 10:05:58 -0700 (PDT)
Subject: [llvm-commits] [llvm] r55969 - in /llvm/trunk:
 docs/LangRef.html include/llvm/Bitcode/LLVMBitCodes.h
 include/llvm/InstrTypes.h include/llvm/Instructions.h
 lib/AsmParser/llvmAsmParser.y lib/Bitcode/Reader/BitcodeReader.cpp
 lib/Bitcode/Writer/BitcodeWriter.cpp lib/VMCore/Verifier.cpp
 test/Assembler/vbool-cmp.ll test/Assembler/vector-select.ll
In-Reply-To: <DCAA7462-9A1F-45F5-BD11-6F927E050AAB@apple.com>
References: <200809090102.m8912lLd009502@zion.cs.uiuc.edu>
	<DCAA7462-9A1F-45F5-BD11-6F927E050AAB@apple.com>
Message-ID: <43603.76.220.41.203.1222103158.squirrel@webmail.apple.com>

On Sun, September 21, 2008 11:26 pm, Chris Lattner wrote:
>
> On Sep 8, 2008, at 6:02 PM, Dan Gohman wrote:
>
>> Author: djg
>> Date: Mon Sep  8 20:02:47 2008
>> New Revision: 55969
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=55969&view=rev
>> Log:
>> Extend the vcmp/fcmp LLVM IR instructions to take vectors as arguments
>> and, if so, to return a vector of boolean as a result;
>
> Hi Dan and Preston,
>
> I thought the idea here was to change vicmp and vfcmp to have this
> behavior, not change icmp/fcmp to do this.  The problem with changing
> icmp/fcmp is that you'll break a lot of assumptions throughout the
> optimizer that the result of icmp/fcmp is an i1, and the code to
> handle this has already been updated for v*cmp.

Hi Chris,

Overloading plain icmp/fcmp is consistent with how many other
operators are overloaded for vector and scalar. It's a
longer-term goal here is to eventually obviate v*cmp. This
patch is merely a first step, and a prerequisite for much of
the remaining steps.

The optimizers can be made to check for i1 when necessary. This
was included in the vector comparison plan. None of the LLVM
front-ends currently produce vector comparisons, so this doesn't
need to be addressed immediately.

>
>>
>>> The FUNC_CODE_INST_VCMP thing is a little counter-intuitive. I guess
>>> it's necessary in order to remain compatible with exiting vector
>>> FUNC_CODE_INST_CMP usage though, right?
>>
>> Correct. Since FUNC_CODE_INST_CMP with vector arguments is used for
>> the
>> vfcmp and vicmp instructions, it was necessary to add
>> FUNC_CODE_INST_VCMP to support the vector forms of fcmp/icmp. It would
>> probably have made more sense in the bitcode reader/writer to switch
>> vicmp/vfcmp to use a newly defined bitcode operator, but I did not
>> because it seemed likely that it would break existing code.
>
> Is there any reason to keep around the old v*cmp behavior of returning
> a vector of integers?  If not, please remove them (as soon as there
> are no regressions from doing this).  I don't want to have two
> different vector compare implementations floating around.

{i,f}cmp are not yet ready to replace v*cmp. Currently,
codegen cannot effectively handle vectors of i1 on current
targets. The goal is to improve codegen and eventually make
v*cmp unnecessary, but it'll take some time, and until then
we don't want to pull the rug out from people using v*cmp.

> Also, LLVM 2.4 is coming up very soon now, would you be ok with
> deferring (and reverting) these changes until after 2.4 branches in a
> couple weeks?  If you'd prefer to do development on a branch until
> then that would be fine of course.

I view vector {i,f}cmp support as having relatively low risk, since
no front-end or optimizer in tree is producing them. I'd be fine
with adding a disclaimer to LangRef, or even removing them from
LangRef, to help avert misunderstanding.

>> --- llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h (original)
>> +++ llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h Mon Sep  8
>> 20:02:47 2008
>> @@ -205,7 +205,9 @@
>>     // FIXME: Remove GETRESULT in favor of EXTRACTVAL in LLVM 3.0
>>     FUNC_CODE_INST_GETRESULT   = 25, // GETRESULT:  [ty, opval, n]
>>     FUNC_CODE_INST_EXTRACTVAL  = 26, // EXTRACTVAL: [n x operands]
>> -    FUNC_CODE_INST_INSERTVAL   = 27  // INSERTVAL:  [n x operands]
>> +    FUNC_CODE_INST_INSERTVAL   = 27, // INSERTVAL:  [n x operands]
>> +    // fcmp/icmp returning vector of Int1Ty, NOT for vicmp/vfcmp
>> +    FUNC_CODE_INST_VCMP        = 28  // VCMP:       [opty, opval,
>> opval, pred]
>
> Ewww.  I still think that vcmp should change into this behavior, if
> there is some reason why this would not work, please pick a better
> name than INST_VCMP for this!

It's already renamed in TOT :-). Oops, the comment isn't updated,
but the code is. I'll fix that.

>> --- llvm/trunk/include/llvm/InstrTypes.h (original)
>> +++ llvm/trunk/include/llvm/InstrTypes.h Mon Sep  8 20:02:47 2008
>> @@ -18,6 +18,7 @@
>>
>> #include "llvm/Instruction.h"
>> #include "llvm/OperandTraits.h"
>> +#include "llvm/DerivedTypes.h"
>
> Please move the method out of line, to avoid this #include.

Ok.

>> @@ -732,6 +733,13 @@
>>   static inline bool classof(const Value *V) {
>>     return isa<Instruction>(V) && classof(cast<Instruction>(V));
>>   }
>> +  /// @brief Create a result type for fcmp/icmp (but not vicmp/vfcmp)
>> +  static const Type* makeCmpResultType(const Type* opnd_type) {
>
> Instead of 'makeCmp...' please call this 'getVCmpResultType' or
> something like that.  We use 'get' for uniqued objects like types.
> Assuming that you're going to eliminate vicmp/vfcmp, this should be
> removed and you should just change its methods.

I'm a little confused here. For "make" vs "get", I agree that
"get" might be a little more consistent. As for the insertion
of the V, it's not just for vector types. And as for
removing it and changing all the methods, it's used in
four places, which seems enough to justify having this code
refactored out into a helper function.

>
> Okay, I can't review the rest of this patch without getting more
> closure on the direction we're going with the IR.  I think that
> smooshing this into icmp/fcmp is a real mistake.  We should change the
> old v[if]cmp instruction to return a vector of bool and leave icmp/
> fcmp alone.  What do you guys think?
>
> If you agree, please revert these patches for now.

I disagree. In the short term, we can't simply change v*cmp
because that would break existing users, and overloading
{i,f}cmp is relatively low-risk. In the long term we don't
want comparisons to be inconsistent with the rest of the IR.

Dan




From evan.cheng at apple.com  Mon Sep 22 12:10:30 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Mon, 22 Sep 2008 10:10:30 -0700
Subject: [llvm-commits] [llvm] r55807 - in /llvm/trunk:
	lib/Target/X86/X86CallingConv.td lib/Target/X86/X86ISelLowering.cpp
	test/CodeGen/X86/2007-08-13-SpillerReuse.ll
	test/CodeGen/X86/2008-02-22-ReMatBug.ll
	test/CodeGen/X86/coalescer-commute3.ll
	test/CodeGen/X86/combine-lds.ll test/CodeGen/X86/fastcc.ll
In-Reply-To: <D140DCC7-D1A7-45C5-9321-9DF7972B17B7@apple.com>
References: <200809042259.m84MxxkM017095@zion.cs.uiuc.edu>
	<484E2891-5028-440E-9C25-875007E6FC66@apple.com>
	<4CA8151C-767A-4CE9-B712-0DDDB11F2217@apple.com>
	<D140DCC7-D1A7-45C5-9321-9DF7972B17B7@apple.com>
Message-ID: <A75AC0BB-4F63-452A-82A5-504C1674095B@apple.com>


On Sep 22, 2008, at 8:43 AM, Chris Lattner wrote:

>
> On Sep 21, 2008, at 11:30 PM, Evan Cheng wrote:
>
>> Secondly, it's not clear to me why the integer registers have to be  
>> marked inreg to be passed in registers (only EAX, EDX, what's the  
>> 3rd). Arnold, any ideas?
>
> I thought that this was how the normal x86-32 calling conv worked:   
> Integer values are passed on the stack unless -mregparm (or  
> attribute) is used, which tags the arguments with 'inreg'

Tailcall cc is based on fastcc, no? Is it not possible to pass  
arguments in registers for tailcalls?

Evan

>
>
> -Chris



From evan.cheng at apple.com  Mon Sep 22 12:10:27 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Mon, 22 Sep 2008 10:10:27 -0700
Subject: [llvm-commits] [llvm] r56326 - in /llvm/trunk:
	include/llvm/CodeGen/LiveInterval.h
	include/llvm/CodeGen/LiveIntervalAnalysis.h	lib/CodeGen/LiveInterval.cpp
	lib/CodeGen/LiveIntervalAnalysis.cpp	lib/CodeGen/RegAllocLinearScan.cpp
In-Reply-To: <195CE7BA-AB94-40AC-B4E6-EB01AC814EE6@apple.com>
References: <200809190102.m8J12ZW2019167@zion.cs.uiuc.edu>
	<51666910-CAA2-47A5-9F26-809138EE0E5F@apple.com>
	<10574389-E3FC-4024-AD0D-A462B01F39B4@apple.com>
	<5C7E7977-A85C-44DB-8D61-5A8AF02E9C6A@apple.com>
	<21171FE7-D099-4281-B86A-F0944DD07C4B@apple.com>
	<195CE7BA-AB94-40AC-B4E6-EB01AC814EE6@apple.com>
Message-ID: <5DFE9C90-C5BF-4A4C-B153-931CE13CECCE@apple.com>


On Sep 21, 2008, at 6:07 PM, Chris Lattner wrote:

> On Sep 19, 2008, at 11:26 AM, Dale Johannesen wrote:
>>>> On Sep 19, 2008, at 10:48 AMPDT, Evan Cheng wrote:
>>>>>>
>>>>>> float weight;        // weight of this interval
>>>>>> +    bool isEarlyClobber;
>>>>>> +    bool overlapsEarlyClobber;
>>>>>
>>>>> Hi Dale,
>>>>>
>>>>> I don't think we want two bits. I'd rather go with one bit and  
>>>>> have
>>>>> register allocator look at both use and def operands. What do you
>>>>> think?
>>>>
>>>> The comment explains why I don't want to do this:
>>>
>>> Sorry, I don't follow. Can you provide an example?
>>
>> void foo (int x, int y) {
>>  int z=x+y;
>>  int w=x+y;
>>  int t;
>>  asm volatile ("%0 %1 %2" : "=&r"(t) : "r"(z), "r"(w));
>> }
>>
>> %1 and %2 can share a register, but if there is no way to distinguish
>> between earlyclobber and overlaps-earlyclobber, we can't do this.
>> In theory this is a matter of correctness, it is possible to  
>> construct
>> cases where you run out of registers if you don't share.
>
> I don't get this at all.  How can a *live interval* be an
> earlyclobber?  It seems that the easy and natural way to model this is
> that the def starts one notch earlier in the use slot of an
> instruction, instead of it's normal place (the def slot).
>
> In other words, I don't understand why this needs to be modeled
> explicitly in live intervals, the construction of live intervals
> should just handle the early clobber def as starting one slot early.

As I said in another email, that's the right solution except it breaks  
liveintervalanalysis and coalescer assumptions. It's possible to try  
that approach but we don't have enough test coverage for early clobber.

Evan

>
>
> -Chris
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From dalej at apple.com  Mon Sep 22 12:13:42 2008
From: dalej at apple.com (Dale Johannesen)
Date: Mon, 22 Sep 2008 10:13:42 -0700
Subject: [llvm-commits] [llvm] r55973 - in /llvm/trunk:
	include/llvm/Target/TargetAsmInfo.h	lib/CodeGen/AsmPrinter/AsmPrinter.cpp
	lib/Target/ARM/ARMTargetAsmInfo.cpp	lib/Target/PowerPC/PPCTargetAsmInfo.cpp
	lib/Target/TargetAsmInfo.cpp lib/Target/X86/X86Ta
In-Reply-To: <2A05C955-ABA9-4034-A828-BA867682CF6F@apple.com>
References: <b087fca00809090102h79518ff2t96cc692984eb6291@mail.gmail.com>
	<7461877A-130F-4172-A3B7-D606E513FBA0@apple.com>
	<2A05C955-ABA9-4034-A828-BA867682CF6F@apple.com>
Message-ID: <C011C997-BFD6-4CED-828D-1F84A3027331@apple.com>


On Sep 21, 2008, at 12:00 PMPDT, Chris Lattner wrote:

> On Sep 9, 2008, at 11:19 AM, Dale Johannesen wrote:
>> On Sep 9, 2008, at 1:02 AMPDT, Anton Korobeynikov wrote:
>>> Hi, Dale
>>>
>>>> the magic 'l' prefix for symbols on Darwin which are
>>>> to be passed through the assembler, then removed at
>>>> linktime (previously all references to this had been
>>>> hidden in the ObjC FE code, oh well).
>>> Sorry for bothering you again, but changing semantics of llvm.used  
>>> in
>>> such target- and language- specific way is a bit... uhm...
>>> questionable.
>>
>> The underlying problem is that two different characteristics are
>> involved:  "the compiler must not delete this symbol", and "the
>> compiler must emit something special to affect assembly- or link-  
>> time
>> behavior".   Currently both these key off llvm.used, which is not so
>> good because they are not the same thing and do not always apply to
>> the same symbols.  I have been patching the existing mechanism to  
>> make
>> it work, but I could be persuaded that a new mechanism is better.
>
> Ok, it sounds like overloading llvm.used like this is the problem.
> Maybe the issues is that we need two different "used" lists? One that
> is "must be in the assembler output" and "one that must be in the
> linker output".  The current used list would be the later, and ObjC
> could use the former?


Two lists would probably be a better design, although the semantics you
give here are not right.  At the moment, everything works in this  
area, so
it isn't urgent.



From clattner at apple.com  Mon Sep 22 12:19:03 2008
From: clattner at apple.com (Chris Lattner)
Date: Mon, 22 Sep 2008 10:19:03 -0700
Subject: [llvm-commits] [llvm] r56326 - in /llvm/trunk:
	include/llvm/CodeGen/LiveInterval.h
	include/llvm/CodeGen/LiveIntervalAnalysis.h	lib/CodeGen/LiveInterval.cpp
	lib/CodeGen/LiveIntervalAnalysis.cpp	lib/CodeGen/RegAllocLinearScan.cpp
In-Reply-To: <5DFE9C90-C5BF-4A4C-B153-931CE13CECCE@apple.com>
References: <200809190102.m8J12ZW2019167@zion.cs.uiuc.edu>
	<51666910-CAA2-47A5-9F26-809138EE0E5F@apple.com>
	<10574389-E3FC-4024-AD0D-A462B01F39B4@apple.com>
	<5C7E7977-A85C-44DB-8D61-5A8AF02E9C6A@apple.com>
	<21171FE7-D099-4281-B86A-F0944DD07C4B@apple.com>
	<195CE7BA-AB94-40AC-B4E6-EB01AC814EE6@apple.com>
	<5DFE9C90-C5BF-4A4C-B153-931CE13CECCE@apple.com>
Message-ID: <82130F26-42EC-4B2C-BD9D-8E270AE8D46B@apple.com>

On Sep 22, 2008, at 10:10 AM, Evan Cheng wrote:
>>> %1 and %2 can share a register, but if there is no way to  
>>> distinguish
>>> between earlyclobber and overlaps-earlyclobber, we can't do this.
>>> In theory this is a matter of correctness, it is possible to
>>> construct
>>> cases where you run out of registers if you don't share.
>>
>> I don't get this at all.  How can a *live interval* be an
>> earlyclobber?  It seems that the easy and natural way to model this  
>> is
>> that the def starts one notch earlier in the use slot of an
>> instruction, instead of it's normal place (the def slot).
>>
>> In other words, I don't understand why this needs to be modeled
>> explicitly in live intervals, the construction of live intervals
>> should just handle the early clobber def as starting one slot early.
>
> As I said in another email, that's the right solution except it breaks
> liveintervalanalysis and coalescer assumptions.

Ok, which assumptions?  Can you please point out an example in the code?

> It's possible to try
> that approach but we don't have enough test coverage for early  
> clobber.

We actually have quite a bit of code that uses earlyclobber asms (and  
have even found bugs in apps that didn't use earlyclobber where it was  
supposed to), it is just that they are mostly correctly handled by the  
hacky code in sdisel.  Once that code is removed, early clobber  
support will start getting more testing.

-Chris 


From dalej at apple.com  Mon Sep 22 12:21:38 2008
From: dalej at apple.com (Dale Johannesen)
Date: Mon, 22 Sep 2008 10:21:38 -0700
Subject: [llvm-commits] [llvm-gcc-4.2] r55650 -
	/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
In-Reply-To: <2ABEF97F-1856-4090-B2C8-BE9EC57B2A0E@apple.com>
References: <200809022118.m82LIJeg019335@zion.cs.uiuc.edu>
	<2ABEF97F-1856-4090-B2C8-BE9EC57B2A0E@apple.com>
Message-ID: <295D58A1-2BF8-4B8B-8E3C-C4660992F2F4@apple.com>


On Sep 21, 2008, at 12:17 PMPDT, Chris Lattner wrote:

> On Sep 2, 2008, at 2:18 PM, Dale Johannesen wrote:
>> URL: http://llvm.org/viewvc/llvm-project?rev=55650&view=rev
>> Log:
>> Don't convert atomics that aren't supported by the target.
>> This gets us undefined functions at linktime instead of
>> crashes in llvm, which is what gcc does.
>
> Hi Dale,
>
>> +++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Tue Sep  2 16:18:19 2008
>> @@ -4590,82 +4590,113 @@
>>    return true;
>>  }
>>  case BUILT_IN_BOOL_COMPARE_AND_SWAP_8: {
>> +#if defined(TARGET_POWERPC)
>> +    if (!TARGET_64BIT)
>> +      return false;
>> +#endif
>>    Result = BuildCmpAndSwapAtomicBuiltin(exp,
>> long_long_unsigned_type_node,
>>                                          true);
>
> llvm-convert.cpp is target independent code.

No, it's not; there's lots of #ifdef TARGET_LLVM's in here.  (If  
you're saying it's not target-dependent because it's using some  
abstraction rather than TARGET_POWERPC, I strongly disagree.)

> Checking for
> TARGET_POWERPC here is not right.

That may be, but I didn't introduce the target dependency; this whole
block is wrapped in
#if defined(TARGET_ALPHA) || defined(TARGET_386) ||  
defined(TARGET_POWERPC)

> Why not just check TARGET_64BIT or
> something like that?  Does this happen on x86-32 as well?  If not,
> maybe there some be some new LLVM_BUILTIN_ATOMIC_OK(...) macro, which
> PPC defines.


Implementing 64-bit atomic intrinsics on ppc32 makes no sense, because  
there is no hardware 64-bit atomic operation; these cannot work.  In  
contrast, there is a 64-bit atomic operation on x86-32, although I  
haven't hooked it up yet.



From dalej at apple.com  Mon Sep 22 12:26:33 2008
From: dalej at apple.com (Dale Johannesen)
Date: Mon, 22 Sep 2008 10:26:33 -0700
Subject: [llvm-commits] [llvm] r56326 - in /llvm/trunk:
	include/llvm/CodeGen/LiveInterval.h
	include/llvm/CodeGen/LiveIntervalAnalysis.h	lib/CodeGen/LiveInterval.cpp
	lib/CodeGen/LiveIntervalAnalysis.cpp	lib/CodeGen/RegAllocLinearScan.cpp
In-Reply-To: <195CE7BA-AB94-40AC-B4E6-EB01AC814EE6@apple.com>
References: <200809190102.m8J12ZW2019167@zion.cs.uiuc.edu>
	<51666910-CAA2-47A5-9F26-809138EE0E5F@apple.com>
	<10574389-E3FC-4024-AD0D-A462B01F39B4@apple.com>
	<5C7E7977-A85C-44DB-8D61-5A8AF02E9C6A@apple.com>
	<21171FE7-D099-4281-B86A-F0944DD07C4B@apple.com>
	<195CE7BA-AB94-40AC-B4E6-EB01AC814EE6@apple.com>
Message-ID: <784F5EFD-0E3E-4B44-9C61-068B330BB066@apple.com>


On Sep 21, 2008, at 6:07 PMPDT, Chris Lattner wrote:
>
> In other words, I don't understand why this needs to be modeled
> explicitly in live intervals, the construction of live intervals
> should just handle the early clobber def as starting one slot early.

That was my first reaction but Evan was strongly of the opinion this  
would not work.  I see you've been discussing details with him, let me  
know what you come up with...



From evan.cheng at apple.com  Mon Sep 22 12:28:04 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Mon, 22 Sep 2008 10:28:04 -0700
Subject: [llvm-commits] [llvm] r56384 - in /llvm/trunk/lib/CodeGen:
	RegAllocLinearScan.cpp SimpleRegisterCoalescing.cpp
In-Reply-To: <73CDDC9A-1C75-4A15-9931-12DDC51EABCB@apple.com>
References: <200809200203.m8K234YA013252@zion.cs.uiuc.edu>
	<4F71A860-E342-4A07-8211-0A59A1AA154D@apple.com>
	<F80F5034-326C-4AF5-A7A6-84F8C1C3AF23@apple.com>
	<8D81D6DA-8289-49E2-B352-53C6C313FDA8@apple.com>
	<33791BFC-A09D-43EB-B4D0-6582A9243EED@apple.com>
	<ADDCBC77-DB9F-46BB-A73D-FADC943C29D7@apple.com>
	<6AABEF56-39B2-4D47-8928-7FC4AC7AB61B@apple.com>
	<73CDDC9A-1C75-4A15-9931-12DDC51EABCB@apple.com>
Message-ID: <C661BBE3-98E2-461C-BD90-5CA12268A65C@apple.com>


On Sep 22, 2008, at 8:45 AM, Chris Lattner wrote:

> On Sep 21, 2008, at 11:52 PM, Evan Cheng wrote:
>> On Sep 21, 2008, at 11:19 PM, Chris Lattner wrote:
>>> On Sep 21, 2008, at 11:17 PM, Evan Cheng wrote:
>>>>>> While that's the correct approach, it breaks all kinds of
>>>>>> assumptions
>>>>>> in liveintervals and the coalescer. It will make the problem much
>>>>>> more
>>>>>> complicated. I don't think it's worth the effort.
>>>>>
>>>>> What sorts of assumptions?
>>>>
>>>> That use must be 1 cycle after instruction cycle, def must be 2
>>>> cycles
>>>> after it.
>>>
>>> What code makes this sort of assumption?  It seems fragile.
>>
>> It's all over the place in coalescer. I'd prefer to fix it only when
>> it's necessary. Not for early clobber.
>
> Can you give me an example?  It sounds like these sorts of assumptions
> are exactly what we want: you can only coalesce a def/use of a copy if
> the live ranges exactly line up.  Overlapping by one slot is a *good*
> thing because we want to prevent coalescing.

e.g.
       // Figure out the value # from the RHS.
       LHSValsDefinedFromRHS[VNI]=RHS.getLiveRangeContaining(VNI- 
 >def-1)->valno;

Ok, so most of the assertions are for copies:

   LiveInterval::iterator BLR = IntB.FindLiveRangeContaining(CopyIdx);
   if (BLR == IntB.end()) // Should never happen!
     return false;
   VNInfo *BValNo = BLR->valno;

   // Get the location that B is defined at.  Two options: either this  
value has
   // an unknown definition point or it is defined at CopyIdx.  If  
unknown, we
   // can't process it.
   if (!BValNo->copy) return false;
   assert(BValNo->def == CopyIdx && "Copy doesn't define the value?");

But it is possible modeling the def this way will *just work*. I doubt  
it, but it's worth experimenting.

>
>
>>>>> Then you'd have to mark $out0 as being an early clobber, because  
>>>>> it
>>>>> is
>>>>> stored to before $in2 is read.
>>>>
>>>> Ewwww.
>>>
>>> Eww what? You don't like asms with multiple instructions?  Or you
>>> prefer CPUs that have instructions that would require this? ;-)
>>
>> Ewww multi- instruction asm with this horribleness.
>>
>> Some in-order execution cpu's may require this. Usually it would
>> require HW bypass for reads to completed early enough for def to
>> target the same registers. It's quite common for some instructions to
>> not have the benefit of bypass in some in-order machines.
>
> Can earlyclobber operands be used to model the armv4 "mul" register
> weirdness where the input and output regs can't be the same?

We could, but the correct way to model it is to push the use down one  
cycle, not def up one cycle. The problem with early clobber is the def  
cannot overlap any of the uses (both Rm and Rs). In the ARM mul case,  
the def cannot overlap Rm only.

Evan

>
>
> -Chris
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From clattner at apple.com  Mon Sep 22 12:38:16 2008
From: clattner at apple.com (Chris Lattner)
Date: Mon, 22 Sep 2008 10:38:16 -0700
Subject: [llvm-commits] [llvm] r56384 - in /llvm/trunk/lib/CodeGen:
	RegAllocLinearScan.cpp SimpleRegisterCoalescing.cpp
In-Reply-To: <C661BBE3-98E2-461C-BD90-5CA12268A65C@apple.com>
References: <200809200203.m8K234YA013252@zion.cs.uiuc.edu>
	<4F71A860-E342-4A07-8211-0A59A1AA154D@apple.com>
	<F80F5034-326C-4AF5-A7A6-84F8C1C3AF23@apple.com>
	<8D81D6DA-8289-49E2-B352-53C6C313FDA8@apple.com>
	<33791BFC-A09D-43EB-B4D0-6582A9243EED@apple.com>
	<ADDCBC77-DB9F-46BB-A73D-FADC943C29D7@apple.com>
	<6AABEF56-39B2-4D47-8928-7FC4AC7AB61B@apple.com>
	<73CDDC9A-1C75-4A15-9931-12DDC51EABCB@apple.com>
	<C661BBE3-98E2-461C-BD90-5CA12268A65C@apple.com>
Message-ID: <AAA125E9-8897-4B47-A405-CDFA1C83E8DA@apple.com>

On Sep 22, 2008, at 10:28 AM, Evan Cheng wrote:
>> Can you give me an example?  It sounds like these sorts of  
>> assumptions
>> are exactly what we want: you can only coalesce a def/use of a copy  
>> if
>> the live ranges exactly line up.  Overlapping by one slot is a *good*
>> thing because we want to prevent coalescing.
>
> e.g.
>       // Figure out the value # from the RHS.
>       LHSValsDefinedFromRHS[VNI]=RHS.getLiveRangeContaining(VNI-
>> def-1)->valno;
>
> Ok, so most of the assertions are for copies:
> But it is possible modeling the def this way will *just work*. I doubt
> it, but it's worth experimenting.

I would strongly prefer this.  Even if there are cases that don't  
"just work", I think this is the correct way to model it, and the  
right long-term answer.

>> Can earlyclobber operands be used to model the armv4 "mul" register
>> weirdness where the input and output regs can't be the same?
>
> We could, but the correct way to model it is to push the use down one
> cycle, not def up one cycle. The problem with early clobber is the def
> cannot overlap any of the uses (both Rm and Rs). In the ARM mul case,
> the def cannot overlap Rm only.

Sure, I agree with that.  This is also true of most inline asms with  
multiple instructions (like the example I gave).  Using earlyclobber  
should be a conservative but correct solution (and much better than  
using the 'multiply fixer' pass that used to exist).

This would also make it easier to test that earlyclobber is working  
right (multiplies are more frequent than & in asms), which is why I  
brought it up. :)

-Chris



From dalej at apple.com  Mon Sep 22 12:39:07 2008
From: dalej at apple.com (Dale Johannesen)
Date: Mon, 22 Sep 2008 10:39:07 -0700
Subject: [llvm-commits] [llvm] r55781 -
	/llvm/trunk/lib/Transforms/Scalar/SimplifyLibCalls.cpp
In-Reply-To: <7C829F8E-2755-408C-986D-3545AFDEBF80@apple.com>
References: <200809041830.m84IUmxP007821@zion.cs.uiuc.edu>
	<7C829F8E-2755-408C-986D-3545AFDEBF80@apple.com>
Message-ID: <A57AB168-860E-4019-A772-5642C8262BAA@apple.com>


On Sep 21, 2008, at 12:42 PMPDT, Chris Lattner wrote:

>
> On Sep 4, 2008, at 11:30 AM, Dale Johannesen wrote:
>
>> Author: johannes
>> Date: Thu Sep  4 13:30:46 2008
>> New Revision: 55781
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=55781&view=rev
>> Log:
>> Add intrinsic forms of pow and exp2.  The non-intrinsic
>> forms remain to handle older IR files, but will go away soon.
>
> You want to remove handling of "powf" and only handle  
> "llvm.pow.f32"?  Why?
>
> -Chris

Because I don't think the BE should be sensitive to the source language.

>> That said, I think it is useful to distinguish between
>> SimplifyLibcalls (SLC) and the rest of the compiler.
>
> Yes, SLC is specific to code that is using the standard C library.   
> If you were writing a compiler for some language which had 'sin'  
> mean something unusual, you'd just not run it.

I don't think this makes sense.  What about languages that have some  
of the standard C functions but not all of them?  This code should be  
language-independent, with any semantic information (such as errno  
usage) encoded in the intrinisic; then the BE can apply semantics  
appropriately.   (This, rarely enough, is a case where gcc got the  
design right.)



From clattner at apple.com  Mon Sep 22 12:45:34 2008
From: clattner at apple.com (Chris Lattner)
Date: Mon, 22 Sep 2008 10:45:34 -0700
Subject: [llvm-commits] [llvm] r56384 - in /llvm/trunk/lib/CodeGen:
	RegAllocLinearScan.cpp SimpleRegisterCoalescing.cpp
In-Reply-To: <AAA125E9-8897-4B47-A405-CDFA1C83E8DA@apple.com>
References: <200809200203.m8K234YA013252@zion.cs.uiuc.edu>
	<4F71A860-E342-4A07-8211-0A59A1AA154D@apple.com>
	<F80F5034-326C-4AF5-A7A6-84F8C1C3AF23@apple.com>
	<8D81D6DA-8289-49E2-B352-53C6C313FDA8@apple.com>
	<33791BFC-A09D-43EB-B4D0-6582A9243EED@apple.com>
	<ADDCBC77-DB9F-46BB-A73D-FADC943C29D7@apple.com>
	<6AABEF56-39B2-4D47-8928-7FC4AC7AB61B@apple.com>
	<73CDDC9A-1C75-4A15-9931-12DDC51EABCB@apple.com>
	<C661BBE3-98E2-461C-BD90-5CA12268A65C@apple.com>
	<AAA125E9-8897-4B47-A405-CDFA1C83E8DA@apple.com>
Message-ID: <8B6A9F9F-E41A-48A8-BCD4-E173DA07841C@apple.com>


On Sep 22, 2008, at 10:38 AM, Chris Lattner wrote:

>>> Can earlyclobber operands be used to model the armv4 "mul" register
>>> weirdness where the input and output regs can't be the same?
>>
>> We could, but the correct way to model it is to push the use down one
>> cycle, not def up one cycle. The problem with early clobber is the  
>> def
>> cannot overlap any of the uses (both Rm and Rs). In the ARM mul case,
>> the def cannot overlap Rm only.
>
> Sure, I agree with that.  This is also true of most inline asms with
> multiple instructions (like the example I gave).  Using earlyclobber
> should be a conservative but correct solution (and much better than
> using the 'multiply fixer' pass that used to exist).
>
> This would also make it easier to test that earlyclobber is working
> right (multiplies are more frequent than & in asms), which is why I
> brought it up. :)

Also, to be perfectly clear, the testing is pretty easy (doesn't rely  
on assembler support): just add asserts to the asmprinter that the  
result isn't the same as any output.  Then just build llvm-test with  
armv4 and see if any asserts come out.  If not, declare that  
earlyclobber works ;-)

-Chris


From evan.cheng at apple.com  Mon Sep 22 12:46:06 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Mon, 22 Sep 2008 10:46:06 -0700
Subject: [llvm-commits] [llvm] r56384 - in /llvm/trunk/lib/CodeGen:
	RegAllocLinearScan.cpp SimpleRegisterCoalescing.cpp
In-Reply-To: <AAA125E9-8897-4B47-A405-CDFA1C83E8DA@apple.com>
References: <200809200203.m8K234YA013252@zion.cs.uiuc.edu>
	<4F71A860-E342-4A07-8211-0A59A1AA154D@apple.com>
	<F80F5034-326C-4AF5-A7A6-84F8C1C3AF23@apple.com>
	<8D81D6DA-8289-49E2-B352-53C6C313FDA8@apple.com>
	<33791BFC-A09D-43EB-B4D0-6582A9243EED@apple.com>
	<ADDCBC77-DB9F-46BB-A73D-FADC943C29D7@apple.com>
	<6AABEF56-39B2-4D47-8928-7FC4AC7AB61B@apple.com>
	<73CDDC9A-1C75-4A15-9931-12DDC51EABCB@apple.com>
	<C661BBE3-98E2-461C-BD90-5CA12268A65C@apple.com>
	<AAA125E9-8897-4B47-A405-CDFA1C83E8DA@apple.com>
Message-ID: <99141E76-1A5C-4852-B1B5-7053DA9B02D5@apple.com>


On Sep 22, 2008, at 10:38 AM, Chris Lattner wrote:

> On Sep 22, 2008, at 10:28 AM, Evan Cheng wrote:
>>> Can you give me an example?  It sounds like these sorts of
>>> assumptions
>>> are exactly what we want: you can only coalesce a def/use of a copy
>>> if
>>> the live ranges exactly line up.  Overlapping by one slot is a  
>>> *good*
>>> thing because we want to prevent coalescing.
>>
>> e.g.
>>      // Figure out the value # from the RHS.
>>      LHSValsDefinedFromRHS[VNI]=RHS.getLiveRangeContaining(VNI-
>>> def-1)->valno;
>>
>> Ok, so most of the assertions are for copies:
>> But it is possible modeling the def this way will *just work*. I  
>> doubt
>> it, but it's worth experimenting.
>
> I would strongly prefer this.  Even if there are cases that don't
> "just work", I think this is the correct way to model it, and the
> right long-term answer.

Ok fine. Sorry for being overly careful when it comes to the  
coalescer. Owen, can your liveintervals renumbering work be impacted?  
i.e. Does it assume def must be one cycle before use?

>
>
>>> Can earlyclobber operands be used to model the armv4 "mul" register
>>> weirdness where the input and output regs can't be the same?
>>
>> We could, but the correct way to model it is to push the use down one
>> cycle, not def up one cycle. The problem with early clobber is the  
>> def
>> cannot overlap any of the uses (both Rm and Rs). In the ARM mul case,
>> the def cannot overlap Rm only.
>
> Sure, I agree with that.  This is also true of most inline asms with
> multiple instructions (like the example I gave).  Using earlyclobber
> should be a conservative but correct solution (and much better than
> using the 'multiply fixer' pass that used to exist).
>
> This would also make it easier to test that earlyclobber is working
> right (multiplies are more frequent than & in asms), which is why I
> brought it up. :)

That will require some minor tblgen and TargetInstrDesc changes. If  
someone want to do that, sure.

Evan

>
>
> -Chris
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From clattner at apple.com  Mon Sep 22 12:48:13 2008
From: clattner at apple.com (Chris Lattner)
Date: Mon, 22 Sep 2008 10:48:13 -0700
Subject: [llvm-commits] [llvm] r55781 -
	/llvm/trunk/lib/Transforms/Scalar/SimplifyLibCalls.cpp
In-Reply-To: <A57AB168-860E-4019-A772-5642C8262BAA@apple.com>
References: <200809041830.m84IUmxP007821@zion.cs.uiuc.edu>
	<7C829F8E-2755-408C-986D-3545AFDEBF80@apple.com>
	<A57AB168-860E-4019-A772-5642C8262BAA@apple.com>
Message-ID: <AEC85154-8667-47D5-9A58-BA1A288281E1@apple.com>

On Sep 22, 2008, at 10:39 AM, Dale Johannesen wrote:
>> On Sep 4, 2008, at 11:30 AM, Dale Johannesen wrote:
>>> Author: johannes
>>> Date: Thu Sep  4 13:30:46 2008
>>> New Revision: 55781
>>>
>>> URL: http://llvm.org/viewvc/llvm-project?rev=55781&view=rev
>>> Log:
>>> Add intrinsic forms of pow and exp2.  The non-intrinsic
>>> forms remain to handle older IR files, but will go away soon.
>>
>> You want to remove handling of "powf" and only handle  
>> "llvm.pow.f32"?  Why?
>>
>> -Chris
>
> Because I don't think the BE should be sensitive to the source  
> language.

You don't think that LLVM should allow source-language-specific passes?

>>> That said, I think it is useful to distinguish between
>>> SimplifyLibcalls (SLC) and the rest of the compiler.
>>
>> Yes, SLC is specific to code that is using the standard C library.   
>> If you were writing a compiler for some language which had 'sin'  
>> mean something unusual, you'd just not run it.
>
> I don't think this makes sense.  What about languages that have some  
> of the standard C functions but not all of them?

This doesn't have anything to do with the backend knowing about source  
language: we already have this problem with GCC and C.  GCC supports - 
fno-builtin-foo.  We need a better way to model this, and that way may  
be to add intrinsics for everything that the optimizer looks at, but  
there are other options.

> This code should be language-independent, with any semantic  
> information (such as errno usage) encoded in the intrinisic; then  
> the BE can apply semantics appropriately.   (This, rarely enough, is  
> a case where gcc got the design right.)

I agree that the IR should capture errno assumptions/behavior.  For  
more of these functions, that can be done with readnone/readonly.

-Chris


From dpatel at apple.com  Mon Sep 22 12:54:54 2008
From: dpatel at apple.com (Devang Patel)
Date: Mon, 22 Sep 2008 10:54:54 -0700
Subject: [llvm-commits] [llvm] r55794 - in
	/llvm/trunk/lib/Target/X86/AsmPrinter: X86ATTAsmPrinter.cpp
	X86IntelAsmPrinter.cpp
In-Reply-To: <DA50817B-DEE5-4BF5-8B75-FC50E69A7E28@apple.com>
References: <200809042103.m84L3fBo012834@zion.cs.uiuc.edu>
	<200809051000.23606.baldrick@free.fr>
	<DA50817B-DEE5-4BF5-8B75-FC50E69A7E28@apple.com>
Message-ID: <0BF26B53-70FC-4345-9713-E6D9E331E2AF@apple.com>


On Sep 21, 2008, at 12:45 PM, Chris Lattner wrote:

>
> On Sep 5, 2008, at 1:00 AM, Duncan Sands wrote:
>
>> Hi Devang,
>>
>>>  unsigned FnAlign = OptimizeForSize ? 1 : 4;
>>> +  if (FnAlign == 4 && (F->getNotes() & FN_NOTE_OptimizeForSize))
>>> +    FnAlign = 1;
>>
>> There's no point in testing that FnAlign == 4 here.  I appreciate
>> that you may be trying for a small speedup, but it just makes the
>> code more fragile.
>
> Devang, ping.  Better yet, this should be:
>
> unsigned FnAlign = (OptimizeForSize || F- 
> >hasNote(FN_NOTE_OptimizeForSize)) ? 1 : 4;
>
> and eventually OptimizeForSize goes away.

yes. I am just going to remove OptimizeForSize flag.
-
Devang


From dalej at apple.com  Mon Sep 22 13:02:06 2008
From: dalej at apple.com (Dale Johannesen)
Date: Mon, 22 Sep 2008 11:02:06 -0700
Subject: [llvm-commits] [llvm] r55781 -
	/llvm/trunk/lib/Transforms/Scalar/SimplifyLibCalls.cpp
In-Reply-To: <AEC85154-8667-47D5-9A58-BA1A288281E1@apple.com>
References: <200809041830.m84IUmxP007821@zion.cs.uiuc.edu>
	<7C829F8E-2755-408C-986D-3545AFDEBF80@apple.com>
	<A57AB168-860E-4019-A772-5642C8262BAA@apple.com>
	<AEC85154-8667-47D5-9A58-BA1A288281E1@apple.com>
Message-ID: <944A649C-5E3A-4E9C-9A71-830C9E64E471@apple.com>


On Sep 22, 2008, at 10:48 AMPDT, Chris Lattner wrote:

> On Sep 22, 2008, at 10:39 AM, Dale Johannesen wrote:
>>> On Sep 4, 2008, at 11:30 AM, Dale Johannesen wrote:
>>>> Author: johannes
>>>> Date: Thu Sep  4 13:30:46 2008
>>>> New Revision: 55781
>>>>
>>>> URL: http://llvm.org/viewvc/llvm-project?rev=55781&view=rev
>>>> Log:
>>>> Add intrinsic forms of pow and exp2.  The non-intrinsic
>>>> forms remain to handle older IR files, but will go away soon.
>>>
>>> You want to remove handling of "powf" and only handle  
>>> "llvm.pow.f32"?  Why?
>>>
>>> -Chris
>>
>> Because I don't think the BE should be sensitive to the source  
>> language.
>
> You don't think that LLVM should allow source-language-specific  
> passes?

No.
(To be sure, every compiler IR starts out with the goal of keeping  
language-specific knowledge out of the BE and target-specific  
knowledge out of the FE, but I'm not sure any succeeds completely.   
ANDF might have.)

>>>> That said, I think it is useful to distinguish between
>>>> SimplifyLibcalls (SLC) and the rest of the compiler.
>>>
>>> Yes, SLC is specific to code that is using the standard C  
>>> library.  If you were writing a compiler for some language which  
>>> had 'sin' mean something unusual, you'd just not run it.
>>
>> I don't think this makes sense.  What about languages that have  
>> some of the standard C functions but not all of them?
>
> This doesn't have anything to do with the backend knowing about  
> source language: we already have this problem with GCC and C.  GCC  
> supports -fno-builtin-foo.  We need a better way to model this, and  
> that way may be to add intrinsics for everything that the optimizer  
> looks at, but there are other options.
>
>> This code should be language-independent, with any semantic  
>> information (such as errno usage) encoded in the intrinisic; then  
>> the BE can apply semantics appropriately.   (This, rarely enough,  
>> is a case where gcc got the design right.)
>
> I agree that the IR should capture errno assumptions/behavior.  For  
> more of these functions, that can be done with readnone/readonly.

Actually neither readnone nor readonly does a good job of capturing  
the semantics of (say) log; we want something in between that means  
"reads rounding mode but not memory".  As discussed elsewhere.



From dpatel at apple.com  Mon Sep 22 13:02:57 2008
From: dpatel at apple.com (Devang Patel)
Date: Mon, 22 Sep 2008 11:02:57 -0700
Subject: [llvm-commits] [llvm] r55673 - in /llvm/trunk:
	lib/Transforms/IPO/Inliner.cpp
	test/Transforms/Inline/2008-09-02-AlwaysInline.ll
	test/Transforms/Inline/2008-09-02-NoInline.ll
In-Reply-To: <DCD300EA-2851-458D-966D-E2145F0C4E6B@apple.com>
References: <200809022216.m82MGDNg021600@zion.cs.uiuc.edu>
	<200809030859.25530.baldrick@free.fr>
	<CE119770-6E9A-48F2-BEBE-D11B3BFE1B89@apple.com>
	<DCD300EA-2851-458D-966D-E2145F0C4E6B@apple.com>
Message-ID: <8A709906-22DF-4CCC-BE36-127F719EE96A@apple.com>


On Sep 21, 2008, at 8:36 PM, Chris Lattner wrote:

>
> On Sep 3, 2008, at 9:41 AM, Devang Patel wrote:
>
>>
>> On Sep 2, 2008, at 11:59 PM, Duncan Sands wrote:
>>
>>> Hi Devang,
>>>
>>>> respect inline=never and inline=always notes.
>>>
>>> what happens if you set inline=always on a function
>>> that calls itself?  Does the inliner go into an
>>> infinite loop?
>>
>> That'd be a bug.
>
> Ok, so what happens now?  Is that a bug in the current code, or have  
> you fixed that?

The inliner does not inline a call where caller and callee are same.  
inline=always does not override this behavior.

The inliner may decide to not inline due to various reasons :
- caller == callee
- weak linkage
- function takes variable number of args
- GCs do not match

inline=always does not override these checks.
-
Devang


From dpatel at apple.com  Mon Sep 22 13:08:00 2008
From: dpatel at apple.com (Devang Patel)
Date: Mon, 22 Sep 2008 11:08:00 -0700
Subject: [llvm-commits] [llvm] r56337 - in /llvm/trunk:
	test/Analysis/CallGraph/2008-09-09-DirectCall.ll
	test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll
	test/Other/2002-01-31-CallGraph.ll tools/opt/AnalysisWrappers.cpp
In-Reply-To: <200809221646.39541.baldrick@free.fr>
References: <200809190757.m8J7vA0C007167@zion.cs.uiuc.edu>
	<0EE8C571-DA8D-4C9A-BE3F-F63486A77CB8@apple.com>
	<200809221646.39541.baldrick@free.fr>
Message-ID: <53FAD328-4886-48CD-952E-60C55E03E29B@apple.com>


On Sep 22, 2008, at 7:46 AM, Duncan Sands wrote:

> Hi Devang,
>
>> How about renaming -callgraph as -dump-callgraph ?
>
> opt has the following options that print info.
>
>    -callgraph                            - Print a call graph
>    -callscc                              - Print SCCs of the Call  
> Graph
>    -cfgscc                               - Print SCCs of each  
> function CFG
>    -externalfnconstants                  - Print external fn  
> callsites passed constants
>    -print                                - Print function to stderr
>    -print-alias-sets                     - Alias Set Printer
>    -print-callgraph                      - Print Call Graph to 'dot'  
> file
>    -print-cfg                            - Print CFG of function to  
> 'dot' file
>    -print-cfg-only                       - Print CFG of function to  
> 'dot' file (with no function bodies)
>    -print-dom-info                       - Dominator Info Printer
>    -printm                               - Print module to stderr
>    -printusedtypes                       - Find Used Types
>
> It seems a bit of a mess.  What do you think of the following changes:
>
>    -callgraph => print-callgraph
>    -callscc   => print-callgraph-sccs
>    -cfgscc    => print-cfg-sccs
>    -externalfnconstants => print-externalfnconstants
>    -print               => print-function
>    -print-alias-sets (no change)
>    -print-callgraph     => dot-callgraph
>    -print-cfg           => dot-cfg
>    -print-cfg-only      => dot-cfg-only
>    -print-dom-info (no change)
>    -printm              => print-module
>    -printusedtypes      => print-used-types
>
> ?

Yes, this is better.
-
Devang


From dpatel at apple.com  Mon Sep 22 13:17:40 2008
From: dpatel at apple.com (Devang Patel)
Date: Mon, 22 Sep 2008 11:17:40 -0700
Subject: [llvm-commits] [llvm]
	r55638	-	/llvm/trunk/include/llvm/Function.h
In-Reply-To: <B7FF084E-3C04-480E-B0BC-72E16DC8EBD5@apple.com>
References: <200809021833.m82IXtBb013569@zion.cs.uiuc.edu>
	<b087fca00809030409q71e5c5b6t9f5d04df6d69c53f@mail.gmail.com>
	<E0CD9A9D-9C22-441B-B52D-925ACE281E89@apple.com>
	<B7FF084E-3C04-480E-B0BC-72E16DC8EBD5@apple.com>
Message-ID: <690E1C5C-04C8-4030-A740-8E3CE1CDE635@apple.com>


On Sep 21, 2008, at 8:40 PM, Chris Lattner wrote:

>>> Are we planning
>>> to drop "custom" notes? If yes - them now I'm just seeing  
>>> duplicating
>>> existing paramattrs functionality.
>>
>> paramattrs are associated with parameter, this is associated with the
>> definition. Some of the paramattrs can be used with call/invoke
>> instructions, e.g. nounwind. Where as notes are never associated with
>> call/invoke instruction.
>
> I guess that I don't understand what you're saying here.  Are you  
> saying that there should be two "namespaces", one for function  
> attributes and one for arg/retval attributes?

Yes. parameter attributes are associated with an arguments. Function  
note is associated with function definition.

> Are you saying that attributes are distinct from notes because  
> attributes are applied to call sites also?

yes, some of the attributes are (e.g. signext) are used in call  
instruction also. Function notes are never specified at call site.

> It seems that function attributes are strictly more general than  
> notes, why not just add these as attributes?

Attributes have to maintaing mapping with respective arguments. Some  
of the attributes are associated with a return vale. However, some of  
the attributes, e.g. readonly can easily be converted to a note. We  
should reserve attributes associated with argument zero as return  
value specific attributes. I think the two concepts are separate  
enough to distinguish them at IR level.

-
Devang


From kremenek at apple.com  Mon Sep 22 13:19:13 2008
From: kremenek at apple.com (Ted Kremenek)
Date: Mon, 22 Sep 2008 18:19:13 -0000
Subject: [llvm-commits] [llvm] r56450 - /llvm/tags/checker/checker-96/
Message-ID: <200809221819.m8MIJDIM028423@zion.cs.uiuc.edu>

Author: kremenek
Date: Mon Sep 22 13:19:13 2008
New Revision: 56450

URL: http://llvm.org/viewvc/llvm-project?rev=56450&view=rev
Log:
Tagging checker-96.

Added:
    llvm/tags/checker/checker-96/
      - copied from r56449, llvm/trunk/



From evan.cheng at apple.com  Mon Sep 22 13:19:24 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Mon, 22 Sep 2008 18:19:24 -0000
Subject: [llvm-commits] [llvm] r56452 -
	/llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
Message-ID: <200809221819.m8MIJPEw028456@zion.cs.uiuc.edu>

Author: evancheng
Date: Mon Sep 22 13:19:24 2008
New Revision: 56452

URL: http://llvm.org/viewvc/llvm-project?rev=56452&view=rev
Log:
Per review feedback: Only perform
(srl x, (trunc (and y, c))) -> (srl x, (and (trunc y), c))
etc. when both "trunc" and "and" have single uses.

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=56452&r1=56451&r2=56452&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Mon Sep 22 13:19:24 2008
@@ -2312,21 +2312,17 @@
   // fold (shl x, (trunc (and y, c))) -> (shl x, (and (trunc y), c))
   // iff (trunc c) == c
   if (N1.getOpcode() == ISD::TRUNCATE &&
-      N1.getOperand(0).getOpcode() == ISD::AND) {
+      N1.getOperand(0).getOpcode() == ISD::AND &&
+      N1.hasOneUse() && N1.getOperand(0).hasOneUse()) {
     SDValue N101 = N1.getOperand(0).getOperand(1);
-    ConstantSDNode *N101C = dyn_cast<ConstantSDNode>(N101);
-    if (N101C) {
+    if (ConstantSDNode *N101C = dyn_cast<ConstantSDNode>(N101)) {
       MVT TruncVT = N1.getValueType();
-      unsigned TruncBitSize = TruncVT.getSizeInBits();
-      APInt ShAmt = N101C->getAPIntValue();
-      if (ShAmt.trunc(TruncBitSize).getZExtValue() == N101C->getZExtValue()) {
-        SDValue N100 = N1.getOperand(0).getOperand(0);
-        return DAG.getNode(ISD::SHL, VT, N0,
-                           DAG.getNode(ISD::AND, TruncVT,
-                                  DAG.getNode(ISD::TRUNCATE, TruncVT, N100),
-                                  DAG.getConstant(N101C->getZExtValue(),
-                                                  TruncVT)));
-      }
+      SDValue N100 = N1.getOperand(0).getOperand(0);
+      return DAG.getNode(ISD::SHL, VT, N0,
+                         DAG.getNode(ISD::AND, TruncVT,
+                                     DAG.getNode(ISD::TRUNCATE, TruncVT, N100),
+                                     DAG.getConstant(N101C->getZExtValue(),
+                                                     TruncVT)));
     }
   }
 
@@ -2444,21 +2440,17 @@
   // fold (sra x, (trunc (and y, c))) -> (sra x, (and (trunc y), c))
   // iff (trunc c) == c
   if (N1.getOpcode() == ISD::TRUNCATE &&
-      N1.getOperand(0).getOpcode() == ISD::AND) {
+      N1.getOperand(0).getOpcode() == ISD::AND &&
+      N1.hasOneUse() && N1.getOperand(0).hasOneUse()) {
     SDValue N101 = N1.getOperand(0).getOperand(1);
-    ConstantSDNode *N101C = dyn_cast<ConstantSDNode>(N101);
-    if (N101C) {
+    if (ConstantSDNode *N101C = dyn_cast<ConstantSDNode>(N101)) {
       MVT TruncVT = N1.getValueType();
-      unsigned TruncBitSize = TruncVT.getSizeInBits();
-      APInt ShAmt = N101C->getAPIntValue();
-      if (ShAmt.trunc(TruncBitSize).getZExtValue() == N101C->getZExtValue()) {
-        SDValue N100 = N1.getOperand(0).getOperand(0);
-        return DAG.getNode(ISD::SRA, VT, N0,
-                           DAG.getNode(ISD::AND, TruncVT,
-                                  DAG.getNode(ISD::TRUNCATE, TruncVT, N100),
-                                  DAG.getConstant(N101C->getZExtValue(),
-                                                  TruncVT)));
-      }
+      SDValue N100 = N1.getOperand(0).getOperand(0);
+      return DAG.getNode(ISD::SRA, VT, N0,
+                         DAG.getNode(ISD::AND, TruncVT,
+                                     DAG.getNode(ISD::TRUNCATE, TruncVT, N100),
+                                     DAG.getConstant(N101C->getZExtValue(),
+                                                     TruncVT)));
     }
   }
 
@@ -2565,21 +2557,17 @@
   // fold (srl x, (trunc (and y, c))) -> (srl x, (and (trunc y), c))
   // iff (trunc c) == c
   if (N1.getOpcode() == ISD::TRUNCATE &&
-      N1.getOperand(0).getOpcode() == ISD::AND) {
+      N1.getOperand(0).getOpcode() == ISD::AND &&
+      N1.hasOneUse() && N1.getOperand(0).hasOneUse()) {
     SDValue N101 = N1.getOperand(0).getOperand(1);
-    ConstantSDNode *N101C = dyn_cast<ConstantSDNode>(N101);
-    if (N101C) {
+    if (ConstantSDNode *N101C = dyn_cast<ConstantSDNode>(N101)) {
       MVT TruncVT = N1.getValueType();
-      unsigned TruncBitSize = TruncVT.getSizeInBits();
-      APInt ShAmt = N101C->getAPIntValue();
-      if (ShAmt.trunc(TruncBitSize).getZExtValue() == N101C->getZExtValue()) {
-        SDValue N100 = N1.getOperand(0).getOperand(0);
-        return DAG.getNode(ISD::SRL, VT, N0,
-                           DAG.getNode(ISD::AND, TruncVT,
-                                  DAG.getNode(ISD::TRUNCATE, TruncVT, N100),
-                                  DAG.getConstant(N101C->getZExtValue(),
-                                                  TruncVT)));
-      }
+      SDValue N100 = N1.getOperand(0).getOperand(0);
+      return DAG.getNode(ISD::SRL, VT, N0,
+                         DAG.getNode(ISD::AND, TruncVT,
+                                     DAG.getNode(ISD::TRUNCATE, TruncVT, N100),
+                                     DAG.getConstant(N101C->getZExtValue(),
+                                                     TruncVT)));
     }
   }
   




From ofv at wanadoo.es  Mon Sep 22 13:21:51 2008
From: ofv at wanadoo.es (Oscar Fuentes)
Date: Mon, 22 Sep 2008 18:21:51 -0000
Subject: [llvm-commits] [llvm] r56453 - in /llvm/trunk: CMakeLists.txt
 cmake/modules/AddLLVM.cmake cmake/modules/AddPartiallyLinkedObject.cmake
 lib/Target/X86/AsmPrinter/CMakeLists.txt lib/Target/X86/CMakeLists.txt
 tools/llvm-config/CMakeLists.txt
Message-ID: <200809221821.m8MILpC1028583@zion.cs.uiuc.edu>

Author: ofv
Date: Mon Sep 22 13:21:51 2008
New Revision: 56453

URL: http://llvm.org/viewvc/llvm-project?rev=56453&view=rev
Log:
CMake build system: support for parallel builds.

Modified:
    llvm/trunk/CMakeLists.txt
    llvm/trunk/cmake/modules/AddLLVM.cmake
    llvm/trunk/cmake/modules/AddPartiallyLinkedObject.cmake
    llvm/trunk/lib/Target/X86/AsmPrinter/CMakeLists.txt
    llvm/trunk/lib/Target/X86/CMakeLists.txt
    llvm/trunk/tools/llvm-config/CMakeLists.txt

Modified: llvm/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=56453&r1=56452&r2=56453&view=diff

==============================================================================
--- llvm/trunk/CMakeLists.txt (original)
+++ llvm/trunk/CMakeLists.txt Mon Sep 22 13:21:51 2008
@@ -97,6 +97,10 @@
 
 add_subdirectory(lib/Support)
 add_subdirectory(lib/System)
+
+# Everything else depends on Support and System:
+set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} ${LLVM_LIBS} )
+
 add_subdirectory(utils/TableGen)
 
 add_custom_command(OUTPUT ${llvm_builded_incs_dir}/Intrinsics.gen
@@ -107,6 +111,8 @@
 add_custom_target(intrinsics_gen ALL
   DEPENDS ${llvm_builded_incs_dir}/Intrinsics.gen)
 
+set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} intrinsics_gen )
+
 add_subdirectory(lib/VMCore)
 add_subdirectory(lib/CodeGen)
 add_subdirectory(lib/CodeGen/SelectionDAG)

Modified: llvm/trunk/cmake/modules/AddLLVM.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=56453&r1=56452&r2=56453&view=diff

==============================================================================
--- llvm/trunk/cmake/modules/AddLLVM.cmake (original)
+++ llvm/trunk/cmake/modules/AddLLVM.cmake Mon Sep 22 13:21:51 2008
@@ -3,6 +3,10 @@
 macro(add_llvm_library name)
   add_library( ${name} ${ARGN} )
   set( llvm_libs ${llvm_libs} ${name} PARENT_SCOPE)
+  set( llvm_lib_targets ${llvm_lib_targets} ${name} PARENT_SCOPE )
+  if( LLVM_COMMON_DEPENDS )
+    add_dependencies( ${name} ${LLVM_COMMON_DEPENDS} )
+  endif( LLVM_COMMON_DEPENDS )
 endmacro(add_llvm_library name)
 
 

Modified: llvm/trunk/cmake/modules/AddPartiallyLinkedObject.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddPartiallyLinkedObject.cmake?rev=56453&r1=56452&r2=56453&view=diff

==============================================================================
--- llvm/trunk/cmake/modules/AddPartiallyLinkedObject.cmake (original)
+++ llvm/trunk/cmake/modules/AddPartiallyLinkedObject.cmake Mon Sep 22 13:21:51 2008
@@ -1,4 +1,13 @@
 
+macro(target_name_of_partially_linked_object lib var)
+  if( MSVC )
+    set(${var} ${lib})
+  else( MSVC )
+    set(${var} ${lib}_pll)
+  endif( MSVC )
+endmacro(target_name_of_partially_linked_object lib var)
+
+
 macro(add_partially_linked_object lib)
   if( MSVC )
     add_llvm_library( ${lib} ${ARGN})
@@ -7,6 +16,9 @@
     set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/temp_lib)
     set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/temp_lib)
     add_library( ${lib} STATIC ${ARGN})
+    if( LLVM_COMMON_DEPENDS )
+      add_dependencies( ${lib} ${LLVM_COMMON_DEPENDS} )
+    endif( LLVM_COMMON_DEPENDS )
     add_custom_command(OUTPUT ${pll}
       COMMENT "Building ${lib}.o..."
       DEPENDS ${lib}
@@ -15,7 +27,9 @@
       COMMAND ld -r *${CMAKE_CXX_OUTPUT_EXTENSION} -o ${pll}
       COMMAND rm -f *${CMAKE_CXX_OUTPUT_EXTENSION}
       )
-    add_custom_target(${lib}_pll ALL DEPENDS ${pll})
+    target_name_of_partially_linked_object(${lib} tnplo)
+    add_custom_target(${tnplo} ALL DEPENDS ${pll})
     set( llvm_libs ${llvm_libs} ${pll} PARENT_SCOPE)
+    set( llvm_lib_targets ${llvm_lib_targets} ${tnplo} PARENT_SCOPE )
   endif( MSVC )
 endmacro(add_partially_linked_object lib)

Modified: llvm/trunk/lib/Target/X86/AsmPrinter/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/CMakeLists.txt?rev=56453&r1=56452&r2=56453&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/CMakeLists.txt Mon Sep 22 13:21:51 2008
@@ -5,3 +5,7 @@
   X86AsmPrinter.cpp
   X86IntelAsmPrinter.cpp
   )
+
+target_name_of_partially_linked_object(LLVMX86CodeGen n)
+
+add_dependencies(LLVMX86AsmPrinter ${n})

Modified: llvm/trunk/lib/Target/X86/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/CMakeLists.txt?rev=56453&r1=56452&r2=56453&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/X86/CMakeLists.txt Mon Sep 22 13:21:51 2008
@@ -20,7 +20,6 @@
 
 add_custom_target(X86Table_gen echo Tablegenning
   DEPENDS
-  ${llvm_builded_incs_dir}/Intrinsics.gen
   ${CMAKE_CURRENT_BINARY_DIR}/X86GenRegisterInfo.h.inc
   ${CMAKE_CURRENT_BINARY_DIR}/X86GenRegisterNames.inc
   ${CMAKE_CURRENT_BINARY_DIR}/X86GenRegisterInfo.inc
@@ -34,6 +33,8 @@
   ${CMAKE_CURRENT_BINARY_DIR}/X86GenSubtarget.inc
   )
 
+add_dependencies(X86Table_gen ${LLVM_COMMON_DEPENDS})
+
 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
 
 add_partially_linked_object(LLVMX86CodeGen

Modified: llvm/trunk/tools/llvm-config/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-config/CMakeLists.txt?rev=56453&r1=56452&r2=56453&view=diff

==============================================================================
--- llvm/trunk/tools/llvm-config/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-config/CMakeLists.txt Mon Sep 22 13:21:51 2008
@@ -69,7 +69,6 @@
 
 add_custom_command(OUTPUT ${LIBDEPS_TMP}
   COMMAND ${PERL_EXECUTABLE} ${LLVM_MAIN_SRC_DIR}/utils/GenLibDeps.pl -flat ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY} > ${LIBDEPS_TMP}
-  DEPENDS ${llvm_libs}
   COMMENT "Regenerating ${LIBDEPS_TMP}")
 
 add_custom_command(OUTPUT ${LIBDEPS}
@@ -99,4 +98,6 @@
   )
 
 add_custom_target(llvm-config.target ALL
-  DEPENDS ${LLVM_CONFIG})
\ No newline at end of file
+  DEPENDS ${LLVM_CONFIG})
+
+add_dependencies(llvm-config.target ${llvm_lib_targets})




From dpatel at apple.com  Mon Sep 22 13:21:48 2008
From: dpatel at apple.com (Devang Patel)
Date: Mon, 22 Sep 2008 11:21:48 -0700
Subject: [llvm-commits] [llvm-gcc-4.2] r55718 -
	/llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp
In-Reply-To: <4DF68CD0-1A0C-4B54-AE37-0F8D18FDF11D@apple.com>
References: <200809032001.m83K1RkI012649@zion.cs.uiuc.edu>
	<4DF68CD0-1A0C-4B54-AE37-0F8D18FDF11D@apple.com>
Message-ID: <7AE2A0A8-5EFC-4559-A100-14B2BB4C89A5@apple.com>


On Sep 21, 2008, at 8:43 PM, Chris Lattner wrote:

>> +    else {
>> +      // The inliner pass won't be inserted based on command line  
>> options.
>> +      // Use AlwaysInliner to handle functions that are marked as  
>> always_inline.
>> +      bool NeedAlwaysInliner = false;
>> +      for (Module::iterator I = TheModule->begin(), E = TheModule- 
>> >end();
>> +         I != E; ++I)
>> +        if (!I->isDeclaration() && I->getNotes() ==  
>> FN_NOTE_AlwaysInline) {
>> +          NeedAlwaysInliner = true;
>> +          break;
>> +        }
>> +      if (NeedAlwaysInliner)
>> +        PM->add(createAlwaysInlinerPass());
>
> Please don't do this loop here, just unconditionally add it to the  
> passmgr.  Is there some advantage to checking here (in llvmgcc)  
> rather than in the pass itself?


Only one advantage is a small convenience to llvm developers. When we  
are using -analyze or -print or intentionally running selected pass  
for debugging/testing then you do not want PassManager to annoy you.  
This is not a big deal, and I do not see any advantage for end users.

-
Devang

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20080922/f42cf77f/attachment.html 

From baldrick at free.fr  Mon Sep 22 13:55:43 2008
From: baldrick at free.fr (Duncan Sands)
Date: Mon, 22 Sep 2008 20:55:43 +0200
Subject: [llvm-commits] [llvm] r55781 -
	/llvm/trunk/lib/Transforms/Scalar/SimplifyLibCalls.cpp
In-Reply-To: <944A649C-5E3A-4E9C-9A71-830C9E64E471@apple.com>
References: <200809041830.m84IUmxP007821@zion.cs.uiuc.edu>
	<AEC85154-8667-47D5-9A58-BA1A288281E1@apple.com>
	<944A649C-5E3A-4E9C-9A71-830C9E64E471@apple.com>
Message-ID: <200809222055.43490.baldrick@free.fr>

> Actually neither readnone nor readonly does a good job of capturing  
> the semantics of (say) log; we want something in between that means  
> "reads rounding mode but not memory".  As discussed elsewhere.

And as Chris pointed out somewhere, it's rather pointless to
try to get correct rounding mode behaviour for calls to functions
like sin & log, when simpler operations like multiplication and
division currently don't pay any attention to the rounding mode.
So I'm sorry I was so annoying about the rounding mode before :)

Ciao,

Duncan.


From baldrick at free.fr  Mon Sep 22 13:58:27 2008
From: baldrick at free.fr (Duncan Sands)
Date: Mon, 22 Sep 2008 20:58:27 +0200
Subject: [llvm-commits]
 =?iso-8859-1?q?=5Bllvm=5D_r55638=09-=09/llvm/trunk?=
 =?iso-8859-1?q?/include/llvm/Function=2Eh?=
In-Reply-To: <690E1C5C-04C8-4030-A740-8E3CE1CDE635@apple.com>
References: <200809021833.m82IXtBb013569@zion.cs.uiuc.edu>
	<B7FF084E-3C04-480E-B0BC-72E16DC8EBD5@apple.com>
	<690E1C5C-04C8-4030-A740-8E3CE1CDE635@apple.com>
Message-ID: <200809222058.28125.baldrick@free.fr>

Hi Devang,

> Attributes have to maintaing mapping with respective arguments. Some  
> of the attributes are associated with a return vale. However, some of  
> the attributes, e.g. readonly can easily be converted to a note.

actually it is theoretically useful to be able to specify readonly on a
call to a function that is not readonly: it means that this particular
call doesn't read memory (presumably because the function is being
passed a special value for some parameter) even though general calls
to it might.

Ciao,

Duncan.


From ggreif at gmail.com  Mon Sep 22 14:42:39 2008
From: ggreif at gmail.com (Gabor Greif)
Date: Mon, 22 Sep 2008 19:42:39 -0000
Subject: [llvm-commits] [llvm] r56455 - in /llvm/branches/ggreif/use-diet:
 include/llvm/Use.h include/llvm/Value.h lib/VMCore/Use.cpp
Message-ID: <200809221942.m8MJge3Y031273@zion.cs.uiuc.edu>

Author: ggreif
Date: Mon Sep 22 14:42:39 2008
New Revision: 56455

URL: http://llvm.org/viewvc/llvm-project?rev=56455&view=rev
Log:
get rid of most references to Use::Val1

Modified:
    llvm/branches/ggreif/use-diet/include/llvm/Use.h
    llvm/branches/ggreif/use-diet/include/llvm/Value.h
    llvm/branches/ggreif/use-diet/lib/VMCore/Use.cpp

Modified: llvm/branches/ggreif/use-diet/include/llvm/Use.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/include/llvm/Use.h?rev=56455&r1=56454&r2=56455&view=diff

==============================================================================
--- llvm/branches/ggreif/use-diet/include/llvm/Use.h (original)
+++ llvm/branches/ggreif/use-diet/include/llvm/Use.h Mon Sep 22 14:42:39 2008
@@ -92,7 +92,7 @@
 
   /// Destructor - Only for zap()
   inline ~Use() {
-    if (Val1) removeFromList();
+    if (!isNil(Next)) removeFromList();
   }
 
   /// Default ctor - This leaves the Use completely uninitialized.  The only thing
@@ -130,7 +130,7 @@
     return RHS;
   }
   const Use &operator=(const Use &RHS) {
-    set(RHS.Val1);
+    set(RHS.get());
     return *this;
   }
 
@@ -141,7 +141,6 @@
 			   ? 0
 			   : stripTag<tagMaskN>(Next); }
 private:
-  Value *Val1;
   Use *Next, **Prev;
 
   void setPrev(Use **NewPrev) {
@@ -241,7 +240,7 @@
 Value *Use::get() const {
   return fullStopTagN == extractTag<NextPtrTag, tagMaskN>(Next)
     ? reinterpret_cast<Value*>(stripTag<tagMaskN>(Next))
-    : (Val1 == getValue() ? Val1 : 0); // should crash if not equal!
+    : getValue();
 }
 
 template<> struct simplify_type<value_use_iterator<User> > {

Modified: llvm/branches/ggreif/use-diet/include/llvm/Value.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/include/llvm/Value.h?rev=56455&r1=56454&r2=56455&view=diff

==============================================================================
--- llvm/branches/ggreif/use-diet/include/llvm/Value.h (original)
+++ llvm/branches/ggreif/use-diet/include/llvm/Value.h Mon Sep 22 14:42:39 2008
@@ -233,14 +233,12 @@
 }
 
 void Use::init(Value *V, User *user) {
-  Val1 = V;
   if (V) V->addUse(*this);
   else Next = nilUse(0);
 }
 
 void Use::set(Value *V) {
-  if (Val1) removeFromList();
-  Val1 = V;
+  if (isNil(Next)) removeFromList();
   if (V) V->addUse(*this);
   else Next = nilUse(0);
 }

Modified: llvm/branches/ggreif/use-diet/lib/VMCore/Use.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/lib/VMCore/Use.cpp?rev=56455&r1=56454&r2=56455&view=diff

==============================================================================
--- llvm/branches/ggreif/use-diet/lib/VMCore/Use.cpp (original)
+++ llvm/branches/ggreif/use-diet/lib/VMCore/Use.cpp Mon Sep 22 14:42:39 2008
@@ -89,7 +89,6 @@
   ptrdiff_t Count = Done;
   while (Start != Stop) {
     --Stop;
-    Stop->Val1 = 0;
     Stop->Next = nilUse(0);
     if (!Count) {
       Stop->Prev = reinterpret_cast<Use**>(Done == 0 ? fullStopTag : stopTag);




From dalej at apple.com  Mon Sep 22 14:51:58 2008
From: dalej at apple.com (Dale Johannesen)
Date: Mon, 22 Sep 2008 19:51:58 -0000
Subject: [llvm-commits] [llvm] r56456 -
	/llvm/trunk/lib/CodeGen/IntrinsicLowering.cpp
Message-ID: <200809221951.m8MJpwZr031588@zion.cs.uiuc.edu>

Author: johannes
Date: Mon Sep 22 14:51:58 2008
New Revision: 56456

URL: http://llvm.org/viewvc/llvm-project?rev=56456&view=rev
Log:
Refactor FP intrinisic setup.  Per review feedback.


Modified:
    llvm/trunk/lib/CodeGen/IntrinsicLowering.cpp

Modified: llvm/trunk/lib/CodeGen/IntrinsicLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/IntrinsicLowering.cpp?rev=56456&r1=56455&r2=56456&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/IntrinsicLowering.cpp (original)
+++ llvm/trunk/lib/CodeGen/IntrinsicLowering.cpp Mon Sep 22 14:51:58 2008
@@ -34,6 +34,25 @@
   M.getOrInsertFunction(Name, FunctionType::get(RetTy, ParamTys, false));
 }
 
+static void EnsureFPIntrinsicsExist(Module &M, Module::iterator I,
+                                 const char *FName,
+                                 const char *DName, const char *LDName) {
+  // Insert definitions for all the floating point types.
+  switch((int)I->arg_begin()->getType()->getTypeID()) {
+  case Type::FloatTyID:
+    EnsureFunctionExists(M, FName, I->arg_begin(), I->arg_end(),
+                         Type::FloatTy);
+  case Type::DoubleTyID:
+    EnsureFunctionExists(M, DName, I->arg_begin(), I->arg_end(),
+                         Type::DoubleTy);
+  case Type::X86_FP80TyID:
+  case Type::FP128TyID:
+  case Type::PPC_FP128TyID:
+    EnsureFunctionExists(M, LDName, I->arg_begin(), I->arg_end(),
+                         I->arg_begin()->getType());
+  }
+}
+
 /// ReplaceCallWith - This function is used when we want to lower an intrinsic
 /// call to a call of an external function.  This handles hard cases such as
 /// when there was already a prototype for the external function, and if that
@@ -101,139 +120,31 @@
                               TD.getIntPtrType(), (Type *)0);
         break;
       case Intrinsic::sqrt:
-        switch((int)I->arg_begin()->getType()->getTypeID()) {
-        case Type::FloatTyID:
-          EnsureFunctionExists(M, "sqrtf", I->arg_begin(), I->arg_end(),
-                               Type::FloatTy);
-        case Type::DoubleTyID:
-          EnsureFunctionExists(M, "sqrt", I->arg_begin(), I->arg_end(),
-                               Type::DoubleTy);
-        case Type::X86_FP80TyID:
-        case Type::FP128TyID:
-        case Type::PPC_FP128TyID:
-          EnsureFunctionExists(M, "sqrtl", I->arg_begin(), I->arg_end(),
-                               I->arg_begin()->getType());
-        }
+        EnsureFPIntrinsicsExist(M, I, "sqrtf", "sqrt", "sqrtl");
         break;
       case Intrinsic::sin:
-        switch((int)I->arg_begin()->getType()->getTypeID()) {
-        case Type::FloatTyID:
-          EnsureFunctionExists(M, "sinf", I->arg_begin(), I->arg_end(),
-                               Type::FloatTy);
-        case Type::DoubleTyID:
-          EnsureFunctionExists(M, "sin", I->arg_begin(), I->arg_end(),
-                               Type::DoubleTy);
-        case Type::X86_FP80TyID:
-        case Type::FP128TyID:
-        case Type::PPC_FP128TyID:
-          EnsureFunctionExists(M, "sinl", I->arg_begin(), I->arg_end(),
-                               I->arg_begin()->getType());
-        }
+        EnsureFPIntrinsicsExist(M, I, "sinf", "sin", "sinl");
         break;
       case Intrinsic::cos:
-        switch((int)I->arg_begin()->getType()->getTypeID()) {
-        case Type::FloatTyID:
-          EnsureFunctionExists(M, "cosf", I->arg_begin(), I->arg_end(),
-                               Type::FloatTy);
-        case Type::DoubleTyID:
-          EnsureFunctionExists(M, "cos", I->arg_begin(), I->arg_end(),
-                               Type::DoubleTy);
-        case Type::X86_FP80TyID:
-        case Type::FP128TyID:
-        case Type::PPC_FP128TyID:
-          EnsureFunctionExists(M, "cosl", I->arg_begin(), I->arg_end(),
-                               I->arg_begin()->getType());
-        }
+        EnsureFPIntrinsicsExist(M, I, "cosf", "cos", "cosl");
         break;
       case Intrinsic::pow:
-        switch((int)I->arg_begin()->getType()->getTypeID()) {
-        case Type::FloatTyID:
-          EnsureFunctionExists(M, "powf", I->arg_begin(), I->arg_end(),
-                               Type::FloatTy);
-        case Type::DoubleTyID:
-          EnsureFunctionExists(M, "pow", I->arg_begin(), I->arg_end(),
-                               Type::DoubleTy);
-        case Type::X86_FP80TyID:
-        case Type::FP128TyID:
-        case Type::PPC_FP128TyID:
-          EnsureFunctionExists(M, "powl", I->arg_begin(), I->arg_end(),
-                               I->arg_begin()->getType());
-        }
+        EnsureFPIntrinsicsExist(M, I, "powf", "pow", "powl");
         break;
       case Intrinsic::log:
-        switch((int)I->arg_begin()->getType()->getTypeID()) {
-        case Type::FloatTyID:
-          EnsureFunctionExists(M, "logf", I->arg_begin(), I->arg_end(),
-                               Type::FloatTy);
-        case Type::DoubleTyID:
-          EnsureFunctionExists(M, "log", I->arg_begin(), I->arg_end(),
-                               Type::DoubleTy);
-        case Type::X86_FP80TyID:
-        case Type::FP128TyID:
-        case Type::PPC_FP128TyID:
-          EnsureFunctionExists(M, "logl", I->arg_begin(), I->arg_end(),
-                               I->arg_begin()->getType());
-        }
+        EnsureFPIntrinsicsExist(M, I, "logf", "log", "logl");
         break;
       case Intrinsic::log2:
-        switch((int)I->arg_begin()->getType()->getTypeID()) {
-        case Type::FloatTyID:
-          EnsureFunctionExists(M, "log2f", I->arg_begin(), I->arg_end(),
-                               Type::FloatTy);
-        case Type::DoubleTyID:
-          EnsureFunctionExists(M, "log2", I->arg_begin(), I->arg_end(),
-                               Type::DoubleTy);
-        case Type::X86_FP80TyID:
-        case Type::FP128TyID:
-        case Type::PPC_FP128TyID:
-          EnsureFunctionExists(M, "log2l", I->arg_begin(), I->arg_end(),
-                               I->arg_begin()->getType());
-        }
+        EnsureFPIntrinsicsExist(M, I, "log2f", "log2", "log2l");
         break;
       case Intrinsic::log10:
-        switch((int)I->arg_begin()->getType()->getTypeID()) {
-        case Type::FloatTyID:
-          EnsureFunctionExists(M, "log10f", I->arg_begin(), I->arg_end(),
-                               Type::FloatTy);
-        case Type::DoubleTyID:
-          EnsureFunctionExists(M, "log10", I->arg_begin(), I->arg_end(),
-                               Type::DoubleTy);
-        case Type::X86_FP80TyID:
-        case Type::FP128TyID:
-        case Type::PPC_FP128TyID:
-          EnsureFunctionExists(M, "log10l", I->arg_begin(), I->arg_end(),
-                               I->arg_begin()->getType());
-        }
+        EnsureFPIntrinsicsExist(M, I, "log10f", "log10", "log10l");
         break;
       case Intrinsic::exp:
-        switch((int)I->arg_begin()->getType()->getTypeID()) {
-        case Type::FloatTyID:
-          EnsureFunctionExists(M, "expf", I->arg_begin(), I->arg_end(),
-                               Type::FloatTy);
-        case Type::DoubleTyID:
-          EnsureFunctionExists(M, "exp", I->arg_begin(), I->arg_end(),
-                               Type::DoubleTy);
-        case Type::X86_FP80TyID:
-        case Type::FP128TyID:
-        case Type::PPC_FP128TyID:
-          EnsureFunctionExists(M, "expl", I->arg_begin(), I->arg_end(),
-                               I->arg_begin()->getType());
-        }
+        EnsureFPIntrinsicsExist(M, I, "expf", "exp", "expl");
         break;
       case Intrinsic::exp2:
-        switch((int)I->arg_begin()->getType()->getTypeID()) {
-        case Type::FloatTyID:
-          EnsureFunctionExists(M, "exp2f", I->arg_begin(), I->arg_end(),
-                               Type::FloatTy);
-        case Type::DoubleTyID:
-          EnsureFunctionExists(M, "exp2", I->arg_begin(), I->arg_end(),
-                               Type::DoubleTy);
-        case Type::X86_FP80TyID:
-        case Type::FP128TyID:
-        case Type::PPC_FP128TyID:
-          EnsureFunctionExists(M, "exp2l", I->arg_begin(), I->arg_end(),
-                               I->arg_begin()->getType());
-        }
+        EnsureFPIntrinsicsExist(M, I, "exp2f", "exp2", "exp2l");
         break;
       }
 }




From dalej at apple.com  Mon Sep 22 15:06:52 2008
From: dalej at apple.com (Dale Johannesen)
Date: Mon, 22 Sep 2008 13:06:52 -0700
Subject: [llvm-commits] [llvm] r55781 -
	/llvm/trunk/lib/Transforms/Scalar/SimplifyLibCalls.cpp
In-Reply-To: <200809222055.43490.baldrick@free.fr>
References: <200809041830.m84IUmxP007821@zion.cs.uiuc.edu>
	<AEC85154-8667-47D5-9A58-BA1A288281E1@apple.com>
	<944A649C-5E3A-4E9C-9A71-830C9E64E471@apple.com>
	<200809222055.43490.baldrick@free.fr>
Message-ID: <C5D5BCCD-4884-4A36-B688-CA712A2D4156@apple.com>


On Sep 22, 2008, at 11:55 AMPDT, Duncan Sands wrote:

>> Actually neither readnone nor readonly does a good job of capturing
>> the semantics of (say) log; we want something in between that means
>> "reads rounding mode but not memory".  As discussed elsewhere.
>
> And as Chris pointed out somewhere, it's rather pointless to
> try to get correct rounding mode behaviour for calls to functions
> like sin & log, when simpler operations like multiplication and
> division currently don't pay any attention to the rounding mode.
> So I'm sorry I was so annoying about the rounding mode before :)

It's OK.  If we accept that the rounding mode handling should be  
conservatively correct (which I'm not so sure about), we have to start  
somewhere.  Might as well be here.




From ggreif at gmail.com  Mon Sep 22 15:08:26 2008
From: ggreif at gmail.com (Gabor Greif)
Date: Mon, 22 Sep 2008 20:08:26 -0000
Subject: [llvm-commits] [llvm] r56457 -
	/llvm/branches/ggreif/use-diet/lib/VMCore/Use.cpp
Message-ID: <200809222008.m8MK8UmB032199@zion.cs.uiuc.edu>

Author: ggreif
Date: Mon Sep 22 15:08:20 2008
New Revision: 56457

URL: http://llvm.org/viewvc/llvm-project?rev=56457&view=rev
Log:
first (untested but performant) implementation of Use::swap

Modified:
    llvm/branches/ggreif/use-diet/lib/VMCore/Use.cpp

Modified: llvm/branches/ggreif/use-diet/lib/VMCore/Use.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/lib/VMCore/Use.cpp?rev=56457&r1=56456&r2=56457&view=diff

==============================================================================
--- llvm/branches/ggreif/use-diet/lib/VMCore/Use.cpp (original)
+++ llvm/branches/ggreif/use-diet/lib/VMCore/Use.cpp Mon Sep 22 15:08:20 2008
@@ -20,7 +20,30 @@
 //===----------------------------------------------------------------------===//
 
 void Use::swap(Use &RHS) {
-  Value *V1(Val1);
+  ptrdiff_t dist((char*)&RHS - (char*)this);
+
+  if (dist) {
+    Use *valid1(stripTag<tagMaskN>(Next));
+    Use *valid2(stripTag<tagMaskN>(RHS.Next));
+    if (valid1 && valid2) {
+      bool real1(fullStopTagN != extractTag<NextPtrTag, tagMaskN>(Next));
+      bool real2(fullStopTagN != extractTag<NextPtrTag, tagMaskN>(RHS.Next));
+      (char*&)*stripTag<tagMask>(Prev) += dist;
+      (char*&)*stripTag<tagMask>(RHS.Prev) -= dist;
+      if (real1)
+	(char*&)valid1->Next += dist;
+      if (real2)
+        (char*&)valid2->Next -= dist;
+
+    }
+
+    // swap the members
+    std::swap(Next, RHS.Next);
+    Use** Prev1 = transferTag<tagMask>(Prev, stripTag<tagMask>(RHS.Prev));
+    RHS.Prev = transferTag<tagMask>(RHS.Prev, stripTag<tagMask>(Prev));
+    Prev = Prev1;
+  }
+  /*  Value *V1(Val1);
   Value *V2(RHS.Val1);
   if (V1 != V2) {
     if (V1) {
@@ -42,6 +65,7 @@
       RHS.Val1 = 0;
     }
   }
+  */
 }
 
 //===----------------------------------------------------------------------===//




From dalej at apple.com  Mon Sep 22 15:13:36 2008
From: dalej at apple.com (Dale Johannesen)
Date: Mon, 22 Sep 2008 13:13:36 -0700
Subject: [llvm-commits] [llvm] r55673 - in /llvm/trunk:
	lib/Transforms/IPO/Inliner.cpp
	test/Transforms/Inline/2008-09-02-AlwaysInline.ll
	test/Transforms/Inline/2008-09-02-NoInline.ll
In-Reply-To: <8A709906-22DF-4CCC-BE36-127F719EE96A@apple.com>
References: <200809022216.m82MGDNg021600@zion.cs.uiuc.edu>
	<200809030859.25530.baldrick@free.fr>
	<CE119770-6E9A-48F2-BEBE-D11B3BFE1B89@apple.com>
	<DCD300EA-2851-458D-966D-E2145F0C4E6B@apple.com>
	<8A709906-22DF-4CCC-BE36-127F719EE96A@apple.com>
Message-ID: <E1383B1F-A888-40CB-8659-9831C899BCAF@apple.com>


On Sep 22, 2008, at 11:02 AMPDT, Devang Patel wrote:

>
> On Sep 21, 2008, at 8:36 PM, Chris Lattner wrote:
>
>>
>> On Sep 3, 2008, at 9:41 AM, Devang Patel wrote:
>>
>>>
>>> On Sep 2, 2008, at 11:59 PM, Duncan Sands wrote:
>>>
>>>> Hi Devang,
>>>>
>>>>> respect inline=never and inline=always notes.
>>>>
>>>> what happens if you set inline=always on a function
>>>> that calls itself?  Does the inliner go into an
>>>> infinite loop?
>>>
>>> That'd be a bug.
>>
>> Ok, so what happens now?  Is that a bug in the current code, or have
>> you fixed that?
>
> The inliner does not inline a call where caller and callee are same.
> inline=always does not override this behavior.

Hmm.  gcc does have internal support for recursive inlining and  
several documented parameters of the form --max-inline-recursive-xxx,  
but I haven't been able to get it to fire....if you want to  
experiment, remember to turn off tail recursion.

I've seen the sentiment expressed that always-inline on a recursive  
function ought to be reported as an error, but gcc doesn't do that  
now, seems to quietly ignore always-inline.  I don't have a strong  
opinion myself.

> The inliner may decide to not inline due to various reasons :
> - caller == callee
> - weak linkage
> - function takes variable number of args
> - GCs do not match
>
> inline=always does not override these checks.
> -
> Devang
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From clattner at apple.com  Mon Sep 22 15:32:30 2008
From: clattner at apple.com (Chris Lattner)
Date: Mon, 22 Sep 2008 13:32:30 -0700
Subject: [llvm-commits] [llvm] r56456 -
	/llvm/trunk/lib/CodeGen/IntrinsicLowering.cpp
In-Reply-To: <200809221951.m8MJpwZr031588@zion.cs.uiuc.edu>
References: <200809221951.m8MJpwZr031588@zion.cs.uiuc.edu>
Message-ID: <DB6B4C19-69C7-4036-BB98-95CA2CAAF321@apple.com>


On Sep 22, 2008, at 12:51 PM, Dale Johannesen wrote:

> Author: johannes
> Date: Mon Sep 22 14:51:58 2008
> New Revision: 56456
>
> URL: http://llvm.org/viewvc/llvm-project?rev=56456&view=rev
> Log:
> Refactor FP intrinisic setup.  Per review feedback.

Thanks Dale!

-Chris



From clattner at apple.com  Mon Sep 22 15:33:47 2008
From: clattner at apple.com (Chris Lattner)
Date: Mon, 22 Sep 2008 13:33:47 -0700
Subject: [llvm-commits] [llvm] r55673 - in /llvm/trunk:
	lib/Transforms/IPO/Inliner.cpp
	test/Transforms/Inline/2008-09-02-AlwaysInline.ll
	test/Transforms/Inline/2008-09-02-NoInline.ll
In-Reply-To: <8A709906-22DF-4CCC-BE36-127F719EE96A@apple.com>
References: <200809022216.m82MGDNg021600@zion.cs.uiuc.edu>
	<200809030859.25530.baldrick@free.fr>
	<CE119770-6E9A-48F2-BEBE-D11B3BFE1B89@apple.com>
	<DCD300EA-2851-458D-966D-E2145F0C4E6B@apple.com>
	<8A709906-22DF-4CCC-BE36-127F719EE96A@apple.com>
Message-ID: <F31B0D0C-5F31-4F8E-B56A-07185EC57A27@apple.com>


On Sep 22, 2008, at 11:02 AM, Devang Patel wrote:

>
> On Sep 21, 2008, at 8:36 PM, Chris Lattner wrote:
>
>>
>> On Sep 3, 2008, at 9:41 AM, Devang Patel wrote:
>>
>>>
>>> On Sep 2, 2008, at 11:59 PM, Duncan Sands wrote:
>>>
>>>> Hi Devang,
>>>>
>>>>> respect inline=never and inline=always notes.
>>>>
>>>> what happens if you set inline=always on a function
>>>> that calls itself?  Does the inliner go into an
>>>> infinite loop?
>>>
>>> That'd be a bug.
>>
>> Ok, so what happens now?  Is that a bug in the current code, or  
>> have you fixed that?
>
> The inliner does not inline a call where caller and callee are same.  
> inline=always does not override this behavior.
>
> The inliner may decide to not inline due to various reasons :
> - caller == callee
> - weak linkage
> - function takes variable number of args
> - GCs do not match
>
> inline=always does not override these checks.

Ok, makes sense!

-Chris



From clattner at apple.com  Mon Sep 22 15:35:26 2008
From: clattner at apple.com (Chris Lattner)
Date: Mon, 22 Sep 2008 13:35:26 -0700
Subject: [llvm-commits] [llvm-gcc-4.2] r55718 -
	/llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp
In-Reply-To: <7AE2A0A8-5EFC-4559-A100-14B2BB4C89A5@apple.com>
References: <200809032001.m83K1RkI012649@zion.cs.uiuc.edu>
	<4DF68CD0-1A0C-4B54-AE37-0F8D18FDF11D@apple.com>
	<7AE2A0A8-5EFC-4559-A100-14B2BB4C89A5@apple.com>
Message-ID: <1BAD5C02-8779-40FD-88C6-6C75B33ABA6B@apple.com>


On Sep 22, 2008, at 11:21 AM, Devang Patel wrote:

>
> On Sep 21, 2008, at 8:43 PM, Chris Lattner wrote:
>
>>> +    else {
>>> +      // The inliner pass won't be inserted based on command line  
>>> options.
>>> +      // Use AlwaysInliner to handle functions that are marked as  
>>> always_inline.
>>> +      bool NeedAlwaysInliner = false;
>>> +      for (Module::iterator I = TheModule->begin(), E = TheModule- 
>>> >end();
>>> +         I != E; ++I)
>>> +        if (!I->isDeclaration() && I->getNotes() ==  
>>> FN_NOTE_AlwaysInline) {
>>> +          NeedAlwaysInliner = true;
>>> +          break;
>>> +        }
>>> +      if (NeedAlwaysInliner)
>>> +        PM->add(createAlwaysInlinerPass());
>>
>> Please don't do this loop here, just unconditionally add it to the  
>> passmgr.  Is there some advantage to checking here (in llvmgcc)  
>> rather than in the pass itself?
>
>
> Only one advantage is a small convenience to llvm developers. When  
> we are using -analyze or -print or intentionally running selected  
> pass for debugging/testing then you do not want PassManager to annoy  
> you. This is not a big deal, and I do not see any advantage for end  
> users.

How would it be annoying?  I don't understand.  It is just an  
optimization to speed up the pass.

-Chris
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20080922/cb34e65d/attachment.html 

From foldr at codedgers.com  Mon Sep 22 15:45:33 2008
From: foldr at codedgers.com (Mikhail Glushenkov)
Date: Mon, 22 Sep 2008 20:45:33 -0000
Subject: [llvm-commits] [llvm] r56458 - in /llvm/trunk:
 tools/llvmc2/doc/LLVMC-Enhancements.rst
 tools/llvmc2/doc/LLVMC-Reference.rst tools/llvmc2/doc/LLVMC-Tutorial.rst
 utils/TableGen/LLVMCConfigurationEmitter.cpp
Message-ID: <200809222045.m8MKjbmx001074@zion.cs.uiuc.edu>

Author: foldr
Date: Mon Sep 22 15:45:17 2008
New Revision: 56458

URL: http://llvm.org/viewvc/llvm-project?rev=56458&view=rev
Log:
Delete the file llvmc2/doc/LLVMC-Enhancements.rst + some minor language/spelling fixes.

Removed:
    llvm/trunk/tools/llvmc2/doc/LLVMC-Enhancements.rst
Modified:
    llvm/trunk/tools/llvmc2/doc/LLVMC-Reference.rst
    llvm/trunk/tools/llvmc2/doc/LLVMC-Tutorial.rst
    llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp

Removed: llvm/trunk/tools/llvmc2/doc/LLVMC-Enhancements.rst
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/doc/LLVMC-Enhancements.rst?rev=56457&view=auto

==============================================================================
--- llvm/trunk/tools/llvmc2/doc/LLVMC-Enhancements.rst (original)
+++ llvm/trunk/tools/llvmc2/doc/LLVMC-Enhancements.rst (removed)
@@ -1,264 +0,0 @@
-Introduction
-============
-
-Disclaimer: this document is currently somewhat out-of-date and is
-retained for reference; for more recent documentation please refer to
-LLVMC-Tutorial.rst.
-
-A complete rewrite of the LLVMC compiler driver is proposed, aimed at
-making it more configurable and useful.
-
-Motivation
-==========
-
-As it stands, the current version of LLVMC does not meet its stated goals
-of configurability and extensibility, and is therefore not used
-much. The need for enhancements to LLVMC is also reflected in [1]_. The
-proposed rewrite will fix the aforementioned deficiences and provide
-an extensible, future-proof solution.
-
-Design
-======
-
-A compiler driver's job is essentially to find a way to transform a set
-of input files into a set of targets, depending on the user-provided
-options. Since several methods of transformation can potentially exist,
-it's natural to use a directed graph to represent all of them. In this
-graph, nodes are tools -- e.g.,  ``gcc -S`` is a tool that generates
-assembly from C language files -- and edges between the nodes indicate
-that the output of one tool can be given as input to another -- i.e.,
-``gcc -S -o - file.c | as``. We'll call this graph the compilation graph.
-
-The proposed design revolves around the compilation graph and the
-following core abstractions:
-
-- Target - An (intermediate) compilation target.
-
-- Action - A shell command template that represents a basic compilation
-  transformation -- example: ``gcc -S $INPUT_FILE -o $OUTPUT_FILE``.
-
-- Tool - Encapsulates information about a concrete tool used in the
-  compilation process, produces Actions. Its operation depends on
-  command-line options provided by the user.
-
-- GraphBuilder - Constructs the compilation graph. Its operation
-  depends on command-line options.
-
-- GraphTraverser - Traverses the compilation graph and constructs a
-  sequence of Actions needed to build the target file. Its operation
-  depends on command-line options.
-
-A high-level view of the compilation process:
-
-  1. Configuration libraries (see below) are loaded in and the
-     compilation graph is constructed from the tool descriptions.
-
-  2. Information about possible options is gathered from (the nodes of)
-     the compilation graph.
-
-  3. Options are parsed based on data gathered in step 2.
-
-  4. A sequence of Actions needed to build the target is constructed
-     using the compilation graph and provided options.
-
-  5. The resulting action sequence is executed.
-
-Extensibility
-==============
-
-To make this design extensible, TableGen [2]_ will be used for
-automatic generation of the Tool classes. Users wanting to customize
-LLVMC need to write a configuration library consisting of a set of
-TableGen descriptions of compilation tools plus a number of hooks
-that influence compilation graph construction and traversal. LLVMC
-will have the ability to load user configuration libraries at runtime;
-in fact, its own basic functionality will be implemented as a
-configuration library.
-
-TableGen specification example
-------------------------------
-
-This small example specifies a Tool that converts C source to object
-files. Note that it is only a mock-up of intended functionality, not a
-final specification::
-
-    def GCC : Tool<
-     GCCProperties, // Properties of this tool
-     GCCOptions     // Options description for this tool
-    >;
-
-    def GCCProperties : ToolProperties<[
-     ToolName<"GCC">,
-     InputLanguageName<"C">,
-     OutputLanguageName<"Object-Code">
-     InputFileExtension<"c">,
-     OutputFileExtension<"o">,
-     CommandFormat<"gcc -c $OPTIONS $FILES">
-    ]>;
-
-    def GCCOptions : ToolOptions<[
-     Option<
-       "-Wall",                 // Option name
-       [None],                  // Allowed values
-       [AddOption<"-Wall">]>,   // Action
-
-     Option<
-       "-Wextra",               // Option name
-       [None],                  // Allowed values
-       [AddOption<"-Wextra">]>, // Action
-
-     Option<
-       "-W",                 // Option name
-       [None],               // Allowed values
-       [AddOption<"-W">]>,   // Action
-
-     Option<
-       "-D",        // Option name
-       [AnyString], // Allowed values
-
-       [AddOptionWithArgument<"-D",GetOptionArgument<"-D">>]
-       // Action:
-       // If the driver was given option "-D<argument>", add
-       // option "-D" with the same argument to the invocation string of
-       // this tool.
-       >
-
-     ]>;
-
-Example of generated code
--------------------------
-
-The specification above compiles to the following code (again, it's a
-mock-up)::
-
-    class GCC : public Tool {
-
-    public:
-
-      GCC() { //... }
-
-     // Properties
-
-      static const char* ToolName = "GCC";
-      static const char* InputLanguageName = "C";
-      static const char* OutputLanguageName = "Object-Code";
-      static const char* InputFileExtension = "c";
-      static const char* OutputFileExtension = "o";
-      static const char* CommandFormat = "gcc -c $OPTIONS $FILES";
-
-     // Options
-
-     OptionsDescription SupportedOptions() {
-       OptionsDescription supportedOptions;
-
-       supportedOptions.Add(Option("-Wall"));
-       supportedOptions.Add(Option("-Wextra"));
-       supportedOptions.Add(Option("-W"));
-       supportedOptions.Add(Option("-D", AllowedArgs::ANY_STRING));
-
-       return supportedOptions;
-     }
-
-     Action GenerateAction(Options providedOptions) {
-       Action generatedAction(CommandFormat); Option curOpt;
-
-       curOpt = providedOptions.Get("-D");
-       if (curOpt) {
-          assert(curOpt.HasArgument());
-          generatedAction.AddOption(Option("-D", curOpt.GetArgument()));
-       }
-
-       curOpt = providedOptions.Get("-Wall");
-       if (curOpt)
-         generatedAction.AddOption(Option("-Wall"));
-
-       curOpt = providedOptions.Get("-Wextra");
-       if (curOpt)
-         generatedAction.AddOption(Option("-Wall"));
-
-       curOpt = providedOptions.Get("-W");
-       if (curOpt)
-         generatedAction.AddOption(Option("-Wall")); }
-
-       return generatedAction;
-     }
-
-    };
-
-    // defined somewhere...
-
-    class Action { public: void AddOption(const Option& opt) {...}
-    int Run(const Filenames& fnms) {...}
-
-    }
-
-Option handling
-===============
-
-Because one of the main tasks of the compiler driver is to correctly
-handle user-provided options, it is important to define this process
-in an exact way. The intent of the proposed scheme is to function as
-a drop-in replacement for GCC.
-
-Option syntax
--------------
-
-The option syntax is specified by the following formal grammar::
-
-        <command-line>      ::=  <option>*
-        <option>            ::=  <positional-option> | <named-option>
-        <named-option>      ::=  -[-]<option-name>[<delimeter><option-argument>]
-        <delimeter>         ::=  ',' | '=' | ' '
-        <positional-option> ::=  <string>
-        <option-name>       ::=  <string>
-        <option-argument>   ::=  <string>
-
-This roughly corresponds to the GCC option syntax. Note that grouping
-of short options (as in ``ls -la``) is forbidden.
-
-Example::
-
-        llvmc -O3 -Wa,-foo,-bar -pedantic -std=c++0x a.c b.c c.c
-
-Option arguments can also have special forms. For example, an argument
-can be a comma-separated list (like in -Wa,-foo,-bar). In such cases,
-it's up to the option handler to parse the argument.
-
-Option semantics
-----------------
-
-According to their meaning, options are classified into the following
-categories:
-
-- Global options - Options that influence compilation graph
-  construction/traversal. Example: -E (stop after preprocessing).
-
-- Local options - Options that influence one or several Actions in
-  the generated action sequence. Example: -O3 (turn on optimization).
-
-- Prefix options - Options that influence the meaning of the following
-  command-line arguments. Example: -x language (specify language for
-  the input files explicitly). Prefix options can be local or global.
-
-- Built-in options - Options that are hard-coded into the
-  driver. Examples: --help, -o file/-pipe (redirect output). Can be
-  local or global.
-
-Issues
-======
-
-1. Should global-options-influencing hooks be written by hand or
-   auto-generated from TableGen specifications?
-
-2. More?
-
-References
-==========
-
-.. [1] LLVM Bug#686
-
-       http://llvm.org/bugs/show_bug.cgi?id=686
-
-.. [2] TableGen Fundamentals
-
-       http://llvm.org/docs/TableGenFundamentals.html

Modified: llvm/trunk/tools/llvmc2/doc/LLVMC-Reference.rst
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/doc/LLVMC-Reference.rst?rev=56458&r1=56457&r2=56458&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/doc/LLVMC-Reference.rst (original)
+++ llvm/trunk/tools/llvmc2/doc/LLVMC-Reference.rst Mon Sep 22 15:45:17 2008
@@ -182,7 +182,8 @@
 
 * Possible tool properties:
 
-  - ``in_language`` - input language name.
+  - ``in_language`` - input language name. Can be either a string or a
+    list, in case the tool supports multiple input languages.
 
   - ``out_language`` - output language name.
 

Modified: llvm/trunk/tools/llvmc2/doc/LLVMC-Tutorial.rst
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/doc/LLVMC-Tutorial.rst?rev=56458&r1=56457&r2=56458&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/doc/LLVMC-Tutorial.rst (original)
+++ llvm/trunk/tools/llvmc2/doc/LLVMC-Tutorial.rst Mon Sep 22 15:45:17 2008
@@ -30,7 +30,7 @@
 At the time of writing LLVMC does not support on-the-fly reloading of
 configuration, so it will be necessary to recompile its source
 code. LLVMC uses TableGen [1]_ as its configuration language, so
-you'll need to familiar with it.
+you need to be familiar with it.
 
 Start by compiling ``examples/Simple.td``, which is a simple wrapper
 for ``gcc``::
@@ -66,11 +66,10 @@
 language map, and the compilation graph definition.
 
 At the heart of LLVMC is the idea of a transformation graph: vertices
-in this graph are tools, and edges signify that there is a
-transformation path between two tools (for example, assembly source
-produced by the compiler can be transformed into executable code by an
-assembler). A special node named ``root`` is used to mark the graph
-entry points.
+in this graph are tools, and edges represent a transformation path
+between two tools (for example, assembly source produced by the
+compiler can be transformed into executable code by an assembler). A
+special node named ``root`` is used to mark graph entry points.
 
 Tool descriptions are basically lists of properties: most properties
 in the example above should be self-explanatory; the ``sink`` property

Modified: llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp?rev=56458&r1=56457&r2=56458&view=diff

==============================================================================
--- llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp Mon Sep 22 15:45:17 2008
@@ -796,7 +796,6 @@
                       const DagInit& d,
                       const GlobalOptionDescriptions& OptDescs,
                       std::ostream& O) {
-  // TOFIX - Add a mechanism for OS detection.
   checkNumberOfArguments(&d, 1);
   const std::string& OptName = InitPtrToString(d.getArg(0));
   if (TestName == "switch_on") {
@@ -1462,8 +1461,8 @@
 // and multiple default edges in the graph (better error
 // reporting). Unfortunately, it is awkward to do right now because
 // our intermediate representation is not sufficiently
-// sofisticated. Algorithms like these should be run on a real graph
-// instead of AST.
+// sophisticated. Algorithms like these require a real graph instead of
+// an AST.
 void TypecheckGraph (Record* CompilationGraph,
                      const ToolPropertiesList& TPList) {
   StringMap<StringSet<> > ToolToInLang;




From foldr at codedgers.com  Mon Sep 22 15:46:20 2008
From: foldr at codedgers.com (Mikhail Glushenkov)
Date: Mon, 22 Sep 2008 20:46:20 -0000
Subject: [llvm-commits] [llvm] r56459 - in /llvm/trunk:
 tools/llvmc2/Common.td tools/llvmc2/doc/LLVMC-Reference.rst
 utils/TableGen/LLVMCConfigurationEmitter.cpp
Message-ID: <200809222046.m8MKkKli001118@zion.cs.uiuc.edu>

Author: foldr
Date: Mon Sep 22 15:46:19 2008
New Revision: 56459

URL: http://llvm.org/viewvc/llvm-project?rev=56459&view=rev
Log:
Add a (forward_as) option property

Modified:
    llvm/trunk/tools/llvmc2/Common.td
    llvm/trunk/tools/llvmc2/doc/LLVMC-Reference.rst
    llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp

Modified: llvm/trunk/tools/llvmc2/Common.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/Common.td?rev=56459&r1=56458&r2=56459&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/Common.td (original)
+++ llvm/trunk/tools/llvmc2/Common.td Mon Sep 22 15:46:19 2008
@@ -1,4 +1,4 @@
-//===- Common.td - Common definitions for LLVMCC  ----------*- tablegen -*-===//
+//===- Common.td - Common definitions for LLVMC2  ----------*- tablegen -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// This file contains common definitions used in llvmcc tool description files.
+// This file contains common definitions used in llvmc2 tool description files.
 //
 //===----------------------------------------------------------------------===//
 
@@ -41,6 +41,7 @@
 
 def append_cmd;
 def forward;
+def forward_as;
 def stop_compilation;
 def unpack_values;
 def help;
@@ -58,7 +59,6 @@
 def element_in_list;
 def input_languages_contain;
 def not_empty;
-// TOTHINK: remove?
 def default;
 
 // Boolean operators.

Modified: llvm/trunk/tools/llvmc2/doc/LLVMC-Reference.rst
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/doc/LLVMC-Reference.rst?rev=56459&r1=56458&r2=56459&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/doc/LLVMC-Reference.rst (original)
+++ llvm/trunk/tools/llvmc2/doc/LLVMC-Reference.rst Mon Sep 22 15:46:19 2008
@@ -250,8 +250,11 @@
 
    - ``forward`` - forward this option unchanged.
 
+   - ``forward_as`` - Change the name of this option, but forward the
+     argument unchanged. Example: ``(forward_as "--disable-optimize")``.
+
    - ``output_suffix`` - modify the output suffix of this
-     tool. Example : ``(switch "E", (output_suffix "i")``.
+     tool. Example: ``(switch "E", (output_suffix "i")``.
 
    - ``stop_compilation`` - stop compilation after this phase.
 

Modified: llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp?rev=56459&r1=56458&r2=56459&view=diff

==============================================================================
--- llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp Mon Sep 22 15:46:19 2008
@@ -155,11 +155,18 @@
   std::string EscapeVariableName(const std::string& Var) const {
     std::string ret;
     for (unsigned i = 0; i != Var.size(); ++i) {
-      if (Var[i] == ',') {
+      char cur_char = Var[i];
+      if (cur_char == ',') {
+        ret += "_comma_";
+      }
+      else if (cur_char == '+') {
+        ret += "_plus_";
+      }
+      else if (cur_char == ',') {
         ret += "_comma_";
       }
       else {
-        ret.push_back(Var[i]);
+        ret.push_back(cur_char);
       }
     }
     return ret;
@@ -279,7 +286,7 @@
                                     Forward = 0x2, UnpackValues = 0x4};
 }
 namespace OptionPropertyType {
-  enum OptionPropertyType { AppendCmd, OutputSuffix };
+  enum OptionPropertyType { AppendCmd, ForwardAs, OutputSuffix };
 }
 
 typedef std::pair<OptionPropertyType::OptionPropertyType, std::string>
@@ -399,6 +406,8 @@
         &CollectOptionProperties::onAppendCmd;
       optionPropertyHandlers_["forward"] =
         &CollectOptionProperties::onForward;
+      optionPropertyHandlers_["forward_as"] =
+        &CollectOptionProperties::onForwardAs;
       optionPropertyHandlers_["help"] =
         &CollectOptionProperties::onHelp;
       optionPropertyHandlers_["output_suffix"] =
@@ -466,6 +475,15 @@
     toolProps_->OptDescs[optDesc_.Name].setForward();
   }
 
+  void onForwardAs (const DagInit* d) {
+    checkNumberOfArguments(d, 1);
+    checkToolProps(d);
+    const std::string& cmd = InitPtrToString(d->getArg(0));
+
+    toolProps_->OptDescs[optDesc_.Name].
+      AddProperty(OptionPropertyType::ForwardAs, cmd);
+  }
+
   void onHelp (const DagInit* d) {
     checkNumberOfArguments(d, 1);
     const std::string& help_message = InitPtrToString(d->getArg(0));
@@ -956,26 +974,31 @@
 
 /// EmitForwardOptionPropertyHandlingCode - Helper function used to
 /// implement EmitOptionPropertyHandlingCode(). Emits code for
-/// handling the (forward) option property.
+/// handling the (forward) and (forward_as) option properties.
 void EmitForwardOptionPropertyHandlingCode (const ToolOptionDescription& D,
+                                            const std::string& NewName,
                                             std::ostream& O) {
+  const std::string& Name = NewName.empty()
+    ? ("-" + D.Name)
+    : NewName;
+
   switch (D.Type) {
   case OptionType::Switch:
-    O << Indent3 << "vec.push_back(\"-" << D.Name << "\");\n";
+    O << Indent3 << "vec.push_back(\"" << Name << "\");\n";
     break;
   case OptionType::Parameter:
-    O << Indent3 << "vec.push_back(\"-" << D.Name << "\");\n";
+    O << Indent3 << "vec.push_back(\"" << Name << "\");\n";
     O << Indent3 << "vec.push_back(" << D.GenVariableName() << ");\n";
     break;
   case OptionType::Prefix:
-    O << Indent3 << "vec.push_back(\"-" << D.Name << "\" + "
+    O << Indent3 << "vec.push_back(\"" << Name << "\" + "
       << D.GenVariableName() << ");\n";
     break;
   case OptionType::PrefixList:
     O << Indent3 << "for (" << D.GenTypeDeclaration()
       << "::iterator B = " << D.GenVariableName() << ".begin(),\n"
       << Indent3 << "E = " << D.GenVariableName() << ".end(); B != E; ++B)\n"
-      << Indent4 << "vec.push_back(\"-" << D.Name << "\" + "
+      << Indent4 << "vec.push_back(\"" << Name << "\" + "
       << "*B);\n";
     break;
   case OptionType::ParameterList:
@@ -983,7 +1006,7 @@
       << "::iterator B = " << D.GenVariableName() << ".begin(),\n"
       << Indent3 << "E = " << D.GenVariableName()
       << ".end() ; B != E; ++B) {\n"
-      << Indent4 << "vec.push_back(\"-" << D.Name << "\");\n"
+      << Indent4 << "vec.push_back(\"" << Name << "\");\n"
       << Indent4 << "vec.push_back(*B);\n"
       << Indent3 << "}\n";
     break;
@@ -1001,7 +1024,8 @@
   for (OptionPropertyList::const_iterator B = D.Props.begin(),
          E = D.Props.end(); B != E; ++B) {
       const OptionProperty& OptProp = *B;
-      if (OptProp.first == OptionPropertyType::AppendCmd)
+      if (OptProp.first == OptionPropertyType::AppendCmd
+          || OptProp.first == OptionPropertyType::ForwardAs)
         ret = true;
     }
   if (D.isForward() || D.isUnpackValues())
@@ -1036,6 +1060,10 @@
     case OptionPropertyType::AppendCmd:
       O << Indent3 << "vec.push_back(\"" << val.second << "\");\n";
       break;
+      // (forward_as) property
+    case OptionPropertyType::ForwardAs:
+      EmitForwardOptionPropertyHandlingCode(D, val.second, O);
+      break;
       // Other properties with argument
     default:
       break;
@@ -1046,7 +1074,7 @@
 
   // (forward) property
   if (D.isForward())
-    EmitForwardOptionPropertyHandlingCode(D, O);
+    EmitForwardOptionPropertyHandlingCode(D, "", O);
 
   // (unpack_values) property
   if (D.isUnpackValues()) {




From foldr at codedgers.com  Mon Sep 22 15:46:45 2008
From: foldr at codedgers.com (Mikhail Glushenkov)
Date: Mon, 22 Sep 2008 20:46:45 -0000
Subject: [llvm-commits] [llvm] r56460 - in /llvm/trunk/tools/llvmc2:
	Graph.td Tools.td
Message-ID: <200809222046.m8MKkjGI001143@zion.cs.uiuc.edu>

Author: foldr
Date: Mon Sep 22 15:46:44 2008
New Revision: 56460

URL: http://llvm.org/viewvc/llvm-project?rev=56460&view=rev
Log:
Fix some comments

Modified:
    llvm/trunk/tools/llvmc2/Graph.td
    llvm/trunk/tools/llvmc2/Tools.td

Modified: llvm/trunk/tools/llvmc2/Graph.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/Graph.td?rev=56460&r1=56459&r2=56460&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/Graph.td (original)
+++ llvm/trunk/tools/llvmc2/Graph.td Mon Sep 22 15:46:44 2008
@@ -1,4 +1,4 @@
-//===- Graph.td - LLVMCC toolchain descriptions ------------*- tablegen -*-===//
+//===- Graph.td - LLVMC2 toolchain descriptions ------------*- tablegen -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// This file contains compilation graph description used by llvmcc.
+// This file contains compilation graph description used by llvmc2.
 //
 //===----------------------------------------------------------------------===//
 

Modified: llvm/trunk/tools/llvmc2/Tools.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/Tools.td?rev=56460&r1=56459&r2=56460&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/Tools.td (original)
+++ llvm/trunk/tools/llvmc2/Tools.td Mon Sep 22 15:46:44 2008
@@ -1,4 +1,4 @@
-//===- Tools.td - Tools description for the LLVMCC  --------*- tablegen -*-===//
+//===- Tools.td - Tools description for LLVMC2 -------------*- tablegen -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,20 +7,10 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// This file contains descriptions of the various build tools run by llvmcc.
+// This file contains descriptions of the various build tools run by llvmc2.
 //
 //===----------------------------------------------------------------------===//
 
-// TOTHINK: Open issue: should we use DAG lists in Tool specifications
-// or change to something like
-
-// def LLVMGccC : < Tool<
-// [ InLanguage<"c">,
-//   PrefixListOption<"Wl", [UnpackValues, PropertyName<Arg>, ...]>
-//  ...] ?
-
-// DAG lists look more aesthetically pleasing to me.
-
 def llvm_gcc_c : Tool<
 [(in_language "c"),
  (out_language "llvm-bitcode"),




From foldr at codedgers.com  Mon Sep 22 15:47:10 2008
From: foldr at codedgers.com (Mikhail Glushenkov)
Date: Mon, 22 Sep 2008 20:47:10 -0000
Subject: [llvm-commits] [llvm] r56461 -
	/llvm/trunk/tools/llvmc2/examples/Clang.td
Message-ID: <200809222047.m8MKlA8Q001169@zion.cs.uiuc.edu>

Author: foldr
Date: Mon Sep 22 15:47:09 2008
New Revision: 56461

URL: http://llvm.org/viewvc/llvm-project?rev=56461&view=rev
Log:
Rename our version of ccc to ccc2

Modified:
    llvm/trunk/tools/llvmc2/examples/Clang.td

Modified: llvm/trunk/tools/llvmc2/examples/Clang.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/examples/Clang.td?rev=56461&r1=56460&r2=56461&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/examples/Clang.td (original)
+++ llvm/trunk/tools/llvmc2/examples/Clang.td Mon Sep 22 15:47:09 2008
@@ -1,6 +1,6 @@
 // A (first stab at a) replacement for the Clang's ccc script.
 // To compile, use this command:
-//    make TOOLNAME=ccc GRAPH=examples/Clang.td
+//    make TOOLNAME=ccc2 GRAPH=examples/Clang.td
 
 include "Common.td"
 




From foldr at codedgers.com  Mon Sep 22 15:47:49 2008
From: foldr at codedgers.com (Mikhail Glushenkov)
Date: Mon, 22 Sep 2008 20:47:49 -0000
Subject: [llvm-commits] [llvm] r56462 - in /llvm/trunk:
 tools/llvmc2/AutoGenerated.cpp tools/llvmc2/AutoGenerated.h
 tools/llvmc2/CompilationGraph.cpp tools/llvmc2/CompilationGraph.h
 tools/llvmc2/Tool.h tools/llvmc2/llvmc.cpp
 utils/TableGen/LLVMCConfigurationEmitter.cpp
Message-ID: <200809222047.m8MKlorJ001209@zion.cs.uiuc.edu>

Author: foldr
Date: Mon Sep 22 15:47:46 2008
New Revision: 56462

URL: http://llvm.org/viewvc/llvm-project?rev=56462&view=rev
Log:
Get rid of GlobalLanguageMap. Global state is evil.

Modified:
    llvm/trunk/tools/llvmc2/AutoGenerated.cpp
    llvm/trunk/tools/llvmc2/AutoGenerated.h
    llvm/trunk/tools/llvmc2/CompilationGraph.cpp
    llvm/trunk/tools/llvmc2/CompilationGraph.h
    llvm/trunk/tools/llvmc2/Tool.h
    llvm/trunk/tools/llvmc2/llvmc.cpp
    llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp

Modified: llvm/trunk/tools/llvmc2/AutoGenerated.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/AutoGenerated.cpp?rev=56462&r1=56461&r2=56462&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/AutoGenerated.cpp (original)
+++ llvm/trunk/tools/llvmc2/AutoGenerated.cpp Mon Sep 22 15:47:46 2008
@@ -24,11 +24,6 @@
 using namespace llvm;
 using namespace llvmc;
 
-namespace llvmc {
-  extern LanguageMap GlobalLanguageMap;
-  extern const std::string& GetLanguage(const sys::Path& File);
-}
-
 extern cl::opt<std::string> OutputFilename;
 
 // The auto-generated file

Modified: llvm/trunk/tools/llvmc2/AutoGenerated.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/AutoGenerated.h?rev=56462&r1=56461&r2=56462&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/AutoGenerated.h (original)
+++ llvm/trunk/tools/llvmc2/AutoGenerated.h Mon Sep 22 15:47:46 2008
@@ -20,12 +20,12 @@
 
 namespace llvmc {
 
-  typedef llvm::StringMap<std::string> LanguageMap;
+  class LanguageMap;
   class CompilationGraph;
 
   /// PopulateLanguageMap - The auto-generated function that fills in
   /// the language map (map from file extensions to language names).
-  void PopulateLanguageMap();
+  void PopulateLanguageMap(LanguageMap& langMap);
   /// PopulateCompilationGraph - The auto-generated function that
   /// populates the compilation graph with nodes and edges.
   void PopulateCompilationGraph(CompilationGraph& tools);

Modified: llvm/trunk/tools/llvmc2/CompilationGraph.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/CompilationGraph.cpp?rev=56462&r1=56461&r2=56462&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/CompilationGraph.cpp (original)
+++ llvm/trunk/tools/llvmc2/CompilationGraph.cpp Mon Sep 22 15:47:46 2008
@@ -33,13 +33,10 @@
 extern cl::list<std::string> Languages;
 
 namespace llvmc {
-  /// ExtsToLangs - Map from file extensions to language names.
-  LanguageMap GlobalLanguageMap;
 
-  /// GetLanguage -  Find the language name corresponding to the given file.
-  const std::string& GetLanguage(const sys::Path& File) {
-    LanguageMap::const_iterator Lang = GlobalLanguageMap.find(File.getSuffix());
-    if (Lang == GlobalLanguageMap.end())
+  const std::string& LanguageMap::GetLanguage(const sys::Path& File) const {
+    LanguageMap::const_iterator Lang = this->find(File.getSuffix());
+    if (Lang == this->end())
       throw std::runtime_error("Unknown suffix: " + File.getSuffix());
     return Lang->second;
   }
@@ -165,7 +162,8 @@
 void CompilationGraph::PassThroughGraph (const sys::Path& InFile,
                                          const Node* StartNode,
                                          const InputLanguagesSet& InLangs,
-                                         const sys::Path& TempDir) const {
+                                         const sys::Path& TempDir,
+                                         const LanguageMap& LangMap) const {
   bool Last = false;
   sys::Path In = InFile;
   const Node* CurNode = StartNode;
@@ -196,7 +194,7 @@
       Out = MakeTempFile(TempDir, In.getBasename(), CurTool->OutputSuffix());
     }
 
-    if (int ret = CurTool->GenerateAction(In, Out, InLangs).Execute())
+    if (int ret = CurTool->GenerateAction(In, Out, InLangs, LangMap).Execute())
       throw error_code(ret);
 
     if (Last)
@@ -212,12 +210,12 @@
 // Find the head of the toolchain corresponding to the given file.
 // Also, insert an input language into InLangs.
 const Node* CompilationGraph::
-FindToolChain(const sys::Path& In, const std::string* forceLanguage,
-              InputLanguagesSet& InLangs) const {
+FindToolChain(const sys::Path& In, const std::string* ForceLanguage,
+              InputLanguagesSet& InLangs, const LanguageMap& LangMap) const {
 
   // Determine the input language.
   const std::string& InLanguage =
-    forceLanguage ? *forceLanguage : GetLanguage(In);
+    ForceLanguage ? *ForceLanguage : LangMap.GetLanguage(In);
 
   // Add the current input language to the input language set.
   InLangs.insert(InLanguage);
@@ -234,7 +232,8 @@
 // Traverses initial portions of the toolchains (up to the first Join node).
 // This function is also responsible for handling the -x option.
 void CompilationGraph::BuildInitial (InputLanguagesSet& InLangs,
-                                     const sys::Path& TempDir) {
+                                     const sys::Path& TempDir,
+                                     const LanguageMap& LangMap) {
   // This is related to -x option handling.
   cl::list<std::string>::const_iterator xIter = Languages.begin(),
     xBegin = xIter, xEnd = Languages.end();
@@ -283,9 +282,9 @@
     }
 
     // Find the toolchain corresponding to this file.
-    const Node* N = FindToolChain(In, xLanguage, InLangs);
+    const Node* N = FindToolChain(In, xLanguage, InLangs, LangMap);
     // Pass file through the chain starting at head.
-    PassThroughGraph(In, N, InLangs, TempDir);
+    PassThroughGraph(In, N, InLangs, TempDir, LangMap);
   }
 }
 
@@ -324,12 +323,13 @@
                       std::back_inserter(Out), NotJoinNode);
 }
 
-int CompilationGraph::Build (const sys::Path& TempDir) {
+int CompilationGraph::Build (const sys::Path& TempDir,
+                             const LanguageMap& LangMap) {
 
   InputLanguagesSet InLangs;
 
   // Traverse initial parts of the toolchains and fill in InLangs.
-  BuildInitial(InLangs, TempDir);
+  BuildInitial(InLangs, TempDir, LangMap);
 
   std::vector<const Node*> JTV;
   TopologicalSortFilterJoinNodes(JTV);
@@ -362,14 +362,14 @@
       Out = MakeTempFile(TempDir, "tmp", JT->OutputSuffix());
     }
 
-    if (int ret = JT->GenerateAction(Out, InLangs).Execute())
+    if (int ret = JT->GenerateAction(Out, InLangs, LangMap).Execute())
       throw error_code(ret);
 
     if (!IsLast) {
       const Node* NextNode =
         &getNode(ChooseEdge(CurNode->OutEdges, InLangs,
                             CurNode->Name())->ToolName());
-      PassThroughGraph(Out, NextNode, InLangs, TempDir);
+      PassThroughGraph(Out, NextNode, InLangs, TempDir, LangMap);
     }
   }
 

Modified: llvm/trunk/tools/llvmc2/CompilationGraph.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/CompilationGraph.h?rev=56462&r1=56461&r2=56462&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/CompilationGraph.h (original)
+++ llvm/trunk/tools/llvmc2/CompilationGraph.h Mon Sep 22 15:47:46 2008
@@ -32,6 +32,14 @@
 
   typedef llvm::StringSet<> InputLanguagesSet;
 
+  /// LanguageMap - Maps from extensions to language names.
+  class LanguageMap : public llvm::StringMap<std::string> {
+  public:
+
+    /// GetLanguage -  Find the language name corresponding to a given file.
+    const std::string& GetLanguage(const llvm::sys::Path&) const;
+  };
+
   /// Edge - Represents an edge of the compilation graph.
   class Edge : public llvm::RefCountedBaseVPTR<Edge> {
   public:
@@ -128,7 +136,7 @@
 
     /// Build - Build target(s) from the input file set. Command-line
     /// options are passed implicitly as global variables.
-    int Build(llvm::sys::Path const& tempDir);
+    int Build(llvm::sys::Path const& TempDir, const LanguageMap& LangMap);
 
     /// getNode - Return a reference to the node correponding to the
     /// given tool name. Throws std::runtime_error.
@@ -161,16 +169,19 @@
     /// starting at StartNode.
     void PassThroughGraph (const llvm::sys::Path& In, const Node* StartNode,
                            const InputLanguagesSet& InLangs,
-                           const llvm::sys::Path& TempDir) const;
+                           const llvm::sys::Path& TempDir,
+                           const LanguageMap& LangMap) const;
 
     /// FindToolChain - Find head of the toolchain corresponding to the given file.
     const Node* FindToolChain(const llvm::sys::Path& In,
-                              const std::string* forceLanguage,
-                              InputLanguagesSet& InLangs) const;
+                              const std::string* ForceLanguage,
+                              InputLanguagesSet& InLangs,
+                              const LanguageMap& LangMap) const;
 
     /// BuildInitial - Traverse the initial parts of the toolchains.
     void BuildInitial(InputLanguagesSet& InLangs,
-                      const llvm::sys::Path& TempDir);
+                      const llvm::sys::Path& TempDir,
+                      const LanguageMap& LangMap);
 
     /// TopologicalSort - Sort the nodes in topological order.
     void TopologicalSort(std::vector<const Node*>& Out);

Modified: llvm/trunk/tools/llvmc2/Tool.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/Tool.h?rev=56462&r1=56461&r2=56462&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/Tool.h (original)
+++ llvm/trunk/tools/llvmc2/Tool.h Mon Sep 22 15:47:46 2008
@@ -36,11 +36,13 @@
 
     virtual Action GenerateAction (const PathVector& inFiles,
                                    const llvm::sys::Path& outFile,
-                                   const InputLanguagesSet& InLangs) const = 0;
+                                   const InputLanguagesSet& InLangs,
+                                   const LanguageMap& LangMap) const = 0;
 
     virtual Action GenerateAction (const llvm::sys::Path& inFile,
                                    const llvm::sys::Path& outFile,
-                                   const InputLanguagesSet& InLangs) const = 0;
+                                   const InputLanguagesSet& InLangs,
+                                   const LanguageMap& LangMap) const = 0;
 
     virtual const char*  Name() const = 0;
     virtual const char** InputLanguages() const = 0;
@@ -59,8 +61,9 @@
     bool JoinListEmpty() const { return JoinList_.empty(); }
 
     Action GenerateAction(const llvm::sys::Path& outFile,
-                          const InputLanguagesSet& InLangs) const {
-      return GenerateAction(JoinList_, outFile, InLangs);
+                          const InputLanguagesSet& InLangs,
+                          const LanguageMap& LangMap) const {
+      return GenerateAction(JoinList_, outFile, InLangs, LangMap);
     }
     // We shouldn't shadow base class's version of GenerateAction.
     using Tool::GenerateAction;

Modified: llvm/trunk/tools/llvmc2/llvmc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/llvmc.cpp?rev=56462&r1=56461&r2=56462&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/llvmc.cpp (original)
+++ llvm/trunk/tools/llvmc2/llvmc.cpp Mon Sep 22 15:47:46 2008
@@ -55,14 +55,14 @@
 
 namespace {
   /// BuildTargets - A small wrapper for CompilationGraph::Build.
-  int BuildTargets(CompilationGraph& graph) {
+  int BuildTargets(CompilationGraph& graph, const LanguageMap& langMap) {
     int ret;
     const sys::Path& tempDir = SaveTemps
       ? sys::Path("")
       : sys::Path(sys::Path::GetTemporaryDirectory());
 
     try {
-      ret = graph.Build(tempDir);
+      ret = graph.Build(tempDir, langMap);
     }
     catch(...) {
       tempDir.eraseFromDisk(true);
@@ -77,10 +77,13 @@
 
 int main(int argc, char** argv) {
   try {
+    LanguageMap langMap;
     CompilationGraph graph;
 
     cl::ParseCommandLineOptions
       (argc, argv, "LLVM Compiler Driver (Work In Progress)", true);
+
+    PopulateLanguageMap(langMap);
     PopulateCompilationGraph(graph);
 
     if (WriteGraph) {
@@ -98,7 +101,7 @@
       throw std::runtime_error("no input files");
     }
 
-    return BuildTargets(graph);
+    return BuildTargets(graph, langMap);
   }
   catch(llvmc::error_code& ec) {
     return ec.code();

Modified: llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp?rev=56462&r1=56461&r2=56462&view=diff

==============================================================================
--- llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp Mon Sep 22 15:47:46 2008
@@ -826,8 +826,9 @@
     O << "InLangs.count(\"" << OptName << "\") != 0";
     return true;
   } else if (TestName == "in_language") {
+    // TODO: remove this restriction
     // Works only for cmd_line!
-    O << "GetLanguage(inFile) == \"" << OptName << '\"';
+    O << "LangMap.GetLanguage(inFile) == \"" << OptName << '\"';
     return true;
   } else if (TestName == "not_empty") {
     if (OptName == "o") {
@@ -1205,7 +1206,8 @@
     O << Indent1 << "Action GenerateAction(const sys::Path& inFile,\n";
 
   O << Indent2 << "const sys::Path& outFile,\n"
-    << Indent2 << "const InputLanguagesSet& InLangs) const\n"
+    << Indent2 << "const InputLanguagesSet& InLangs,\n"
+    << Indent2 << "const LanguageMap& LangMap) const\n"
     << Indent1 << "{\n"
     << Indent2 << "const char* cmd;\n"
     << Indent2 << "std::vector<std::string> vec;\n";
@@ -1245,7 +1247,8 @@
   if (!P.isJoin())
     O << Indent1 << "Action GenerateAction(const PathVector& inFiles,\n"
       << Indent2 << "const llvm::sys::Path& outFile,\n"
-      << Indent2 << "const InputLanguagesSet& InLangs) const\n"
+      << Indent2 << "const InputLanguagesSet& InLangs,\n"
+      << Indent2 << "const LanguageMap& LangMap) const\n"
       << Indent1 << "{\n"
       << Indent2 << "throw std::runtime_error(\"" << P.Name
       << " is not a Join tool!\");\n"
@@ -1451,7 +1454,7 @@
     throw std::string("Error in the language map definition!");
 
   // Generate code
-  O << "void llvmc::PopulateLanguageMap() {\n";
+  O << "void llvmc::PopulateLanguageMap(LanguageMap& langMap) {\n";
 
   for (unsigned i = 0; i < LangsToSuffixesList->size(); ++i) {
     Record* LangToSuffixes = LangsToSuffixesList->getElementAsRecord(i);
@@ -1460,7 +1463,7 @@
     const ListInit* Suffixes = LangToSuffixes->getValueAsListInit("suffixes");
 
     for (unsigned i = 0; i < Suffixes->size(); ++i)
-      O << Indent1 << "GlobalLanguageMap[\""
+      O << Indent1 << "langMap[\""
         << InitPtrToString(Suffixes->getElement(i))
         << "\"] = \"" << Lang << "\";\n";
   }
@@ -1588,8 +1591,7 @@
   ListInit* edges = CompilationGraph->getValueAsListInit("edges");
 
   // Generate code
-  O << "void llvmc::PopulateCompilationGraph(CompilationGraph& G) {\n"
-    << Indent1 << "PopulateLanguageMap();\n\n";
+  O << "void llvmc::PopulateCompilationGraph(CompilationGraph& G) {\n";
 
   // Insert vertices
 




From foldr at codedgers.com  Mon Sep 22 15:48:23 2008
From: foldr at codedgers.com (Mikhail Glushenkov)
Date: Mon, 22 Sep 2008 20:48:23 -0000
Subject: [llvm-commits] [llvm] r56463 - in /llvm/trunk:
 tools/llvmc2/doc/LLVMC-Reference.rst
 utils/TableGen/LLVMCConfigurationEmitter.cpp
Message-ID: <200809222048.m8MKmNQ8001247@zion.cs.uiuc.edu>

Author: foldr
Date: Mon Sep 22 15:48:22 2008
New Revision: 56463

URL: http://llvm.org/viewvc/llvm-project?rev=56463&view=rev
Log:
Make comments a little bit more clear.

Modified:
    llvm/trunk/tools/llvmc2/doc/LLVMC-Reference.rst
    llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp

Modified: llvm/trunk/tools/llvmc2/doc/LLVMC-Reference.rst
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/doc/LLVMC-Reference.rst?rev=56463&r1=56462&r2=56463&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/doc/LLVMC-Reference.rst (original)
+++ llvm/trunk/tools/llvmc2/doc/LLVMC-Reference.rst Mon Sep 22 15:48:22 2008
@@ -375,16 +375,16 @@
 
   - ``input_languages_contain`` - Returns true if a given language
     belongs to the current input language set. Example:
-    ```(input_languages_contain "c++")``.
+    ``(input_languages_contain "c++")``.
 
   - ``in_language`` - Evaluates to true if the language of the input
-    file equals to the argument. Valid only when using ``case``
-    expression in a ``cmd_line`` tool property. Example:
-    ```(in_language "c++")``.
+    file equals to the argument. At the moment works only with
+    ``cmd_line`` property on non-join nodes. Example: ``(in_language
+    "c++")``.
 
   - ``not_empty`` - Returns true if a given option (which should be
     either a parameter or a parameter list) is set by the
-    user. Example: ```(not_empty "o")``.
+    user. Example: ``(not_empty "o")``.
 
   - ``default`` - Always evaluates to true. Should always be the last
     test in the ``case`` expression.

Modified: llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp?rev=56463&r1=56462&r2=56463&view=diff

==============================================================================
--- llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp Mon Sep 22 15:48:22 2008
@@ -826,8 +826,10 @@
     O << "InLangs.count(\"" << OptName << "\") != 0";
     return true;
   } else if (TestName == "in_language") {
-    // TODO: remove this restriction
-    // Works only for cmd_line!
+    // This works only for single-argument Tool::GenerateAction. Join
+    // tools can process several files in different languages simultaneously.
+
+    // TODO: make this work with Edge::Weight (if possible).
     O << "LangMap.GetLanguage(inFile) == \"" << OptName << '\"';
     return true;
   } else if (TestName == "not_empty") {




From foldr at codedgers.com  Mon Sep 22 15:48:48 2008
From: foldr at codedgers.com (Mikhail Glushenkov)
Date: Mon, 22 Sep 2008 20:48:48 -0000
Subject: [llvm-commits] [llvm] r56464 -
	/llvm/trunk/tools/llvmc2/doc/LLVMC-Reference.rst
Message-ID: <200809222048.m8MKmmv6001271@zion.cs.uiuc.edu>

Author: foldr
Date: Mon Sep 22 15:48:48 2008
New Revision: 56464

URL: http://llvm.org/viewvc/llvm-project?rev=56464&view=rev
Log:
Add a 'Debugging' section to the documentation.

Modified:
    llvm/trunk/tools/llvmc2/doc/LLVMC-Reference.rst

Modified: llvm/trunk/tools/llvmc2/doc/LLVMC-Reference.rst
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/doc/LLVMC-Reference.rst?rev=56464&r1=56463&r2=56464&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/doc/LLVMC-Reference.rst (original)
+++ llvm/trunk/tools/llvmc2/doc/LLVMC-Reference.rst Mon Sep 22 15:48:48 2008
@@ -69,7 +69,7 @@
 * ``-v`` - Enable verbose mode, i.e. print out all executed commands.
 
 * ``--view-graph`` - Show a graphical representation of the compilation
-  graph. Requires that you have ``dot`` and ``gv`` commands
+  graph. Requires that you have ``dot`` and ``gv`` programs
   installed. Hidden option, useful for debugging.
 
 * ``--write-graph`` - Write a ``compilation-graph.dot`` file in the
@@ -414,9 +414,25 @@
          ...
         ]>;
 
+Debugging
+=========
+
+When writing LLVMC plugins, it can be useful to get a visual view of
+the resulting compilation graph. This can be achieved via the command
+line option ``--view-graph``. This command assumes that Graphviz [2]_ and
+Ghostview [3]_ are installed. There is also a ``--dump-graph`` option that
+creates a Graphviz source file(``compilation-graph.dot``) in the
+current directory.
+
 
 References
 ==========
 
 .. [1] TableGen Fundamentals
        http://llvm.cs.uiuc.edu/docs/TableGenFundamentals.html
+
+.. [2] Graphviz
+       http://www.graphviz.org/
+
+.. [3] Ghostview
+       http://pages.cs.wisc.edu/~ghost/




From foldr at codedgers.com  Mon Sep 22 15:49:35 2008
From: foldr at codedgers.com (Mikhail Glushenkov)
Date: Mon, 22 Sep 2008 20:49:35 -0000
Subject: [llvm-commits] [llvm] r56465 - in /llvm/trunk:
 tools/llvmc2/AutoGenerated.cpp tools/llvmc2/AutoGenerated.h
 tools/llvmc2/CompilationGraph.h tools/llvmc2/Plugin.cpp
 tools/llvmc2/Plugin.h tools/llvmc2/Tool.h tools/llvmc2/llvmc.cpp
 tools/llvmc2/plugins/ tools/llvmc2/plugins/Hello/
 tools/llvmc2/plugins/Hello/Hello.cpp tools/llvmc2/plugins/Hello/Makefile
 utils/TableGen/LLVMCConfigurationEmitter.cpp
Message-ID: <200809222049.m8MKnanK001356@zion.cs.uiuc.edu>

Author: foldr
Date: Mon Sep 22 15:49:34 2008
New Revision: 56465

URL: http://llvm.org/viewvc/llvm-project?rev=56465&view=rev
Log:
Plugin support for llvmc2 (a-la opt).

Added:
    llvm/trunk/tools/llvmc2/Plugin.cpp
    llvm/trunk/tools/llvmc2/Plugin.h
    llvm/trunk/tools/llvmc2/plugins/
    llvm/trunk/tools/llvmc2/plugins/Hello/
    llvm/trunk/tools/llvmc2/plugins/Hello/Hello.cpp
    llvm/trunk/tools/llvmc2/plugins/Hello/Makefile
Removed:
    llvm/trunk/tools/llvmc2/AutoGenerated.h
Modified:
    llvm/trunk/tools/llvmc2/AutoGenerated.cpp
    llvm/trunk/tools/llvmc2/CompilationGraph.h
    llvm/trunk/tools/llvmc2/Tool.h
    llvm/trunk/tools/llvmc2/llvmc.cpp
    llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp

Modified: llvm/trunk/tools/llvmc2/AutoGenerated.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/AutoGenerated.cpp?rev=56465&r1=56464&r2=56465&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/AutoGenerated.cpp (original)
+++ llvm/trunk/tools/llvmc2/AutoGenerated.cpp Mon Sep 22 15:49:34 2008
@@ -11,20 +11,5 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "AutoGenerated.h"
-#include "CompilationGraph.h"
-#include "Tool.h"
-
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/Support/CommandLine.h"
-
-#include <cstdlib>
-#include <stdexcept>
-
-using namespace llvm;
-using namespace llvmc;
-
-extern cl::opt<std::string> OutputFilename;
-
 // The auto-generated file
 #include "AutoGenerated.inc"

Removed: llvm/trunk/tools/llvmc2/AutoGenerated.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/AutoGenerated.h?rev=56464&view=auto

==============================================================================
--- llvm/trunk/tools/llvmc2/AutoGenerated.h (original)
+++ llvm/trunk/tools/llvmc2/AutoGenerated.h (removed)
@@ -1,34 +0,0 @@
-//===--- AutoGenerated.h - The LLVM Compiler Driver -------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open
-// Source License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-//  Auto-generated tool descriptions - public interface.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVMC2_AUTOGENERATED_H
-#define LLVM_TOOLS_LLVMC2_AUTOGENERATED_H
-
-#include "llvm/ADT/StringMap.h"
-
-#include <string>
-
-namespace llvmc {
-
-  class LanguageMap;
-  class CompilationGraph;
-
-  /// PopulateLanguageMap - The auto-generated function that fills in
-  /// the language map (map from file extensions to language names).
-  void PopulateLanguageMap(LanguageMap& langMap);
-  /// PopulateCompilationGraph - The auto-generated function that
-  /// populates the compilation graph with nodes and edges.
-  void PopulateCompilationGraph(CompilationGraph& tools);
-}
-
-#endif // LLVM_TOOLS_LLVMC2_AUTOGENERATED_H

Modified: llvm/trunk/tools/llvmc2/CompilationGraph.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/CompilationGraph.h?rev=56465&r1=56464&r2=56465&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/CompilationGraph.h (original)
+++ llvm/trunk/tools/llvmc2/CompilationGraph.h Mon Sep 22 15:49:34 2008
@@ -14,7 +14,6 @@
 #ifndef LLVM_TOOLS_LLVMC2_COMPILATION_GRAPH_H
 #define LLVM_TOOLS_LLVMC2_COMPILATION_GRAPH_H
 
-#include "AutoGenerated.h"
 #include "Tool.h"
 
 #include "llvm/ADT/GraphTraits.h"
@@ -30,6 +29,7 @@
 
 namespace llvmc {
 
+  class CompilationGraph;
   typedef llvm::StringSet<> InputLanguagesSet;
 
   /// LanguageMap - Maps from extensions to language names.

Added: llvm/trunk/tools/llvmc2/Plugin.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/Plugin.cpp?rev=56465&view=auto

==============================================================================
--- llvm/trunk/tools/llvmc2/Plugin.cpp (added)
+++ llvm/trunk/tools/llvmc2/Plugin.cpp Mon Sep 22 15:49:34 2008
@@ -0,0 +1,41 @@
+//===--- Plugin.cpp - The LLVM Compiler Driver ------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open
+// Source License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+//  Plugin support for llvmc2.
+//
+//===----------------------------------------------------------------------===//
+
+#include "Plugin.h"
+
+#include <vector>
+
+namespace {
+  typedef std::vector<llvmc::BasePlugin*> PluginRegistry;
+  static PluginRegistry GlobalPluginRegistry;
+}
+
+namespace llvmc {
+
+  RegisterPluginImpl::RegisterPluginImpl(BasePlugin* plugin) {
+    GlobalPluginRegistry.push_back(plugin);
+  }
+
+  void PopulateLanguageMap(LanguageMap& langMap) {
+    for (PluginRegistry::const_iterator B = GlobalPluginRegistry.begin(),
+           E = GlobalPluginRegistry.end(); B != E; ++B)
+      (*B)->PopulateLanguageMap(langMap);
+  }
+
+  void PopulateCompilationGraph(CompilationGraph& graph) {
+    for (PluginRegistry::const_iterator B = GlobalPluginRegistry.begin(),
+           E = GlobalPluginRegistry.end(); B != E; ++B)
+      (*B)->PopulateCompilationGraph(graph);
+  }
+
+}

Added: llvm/trunk/tools/llvmc2/Plugin.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/Plugin.h?rev=56465&view=auto

==============================================================================
--- llvm/trunk/tools/llvmc2/Plugin.h (added)
+++ llvm/trunk/tools/llvmc2/Plugin.h Mon Sep 22 15:49:34 2008
@@ -0,0 +1,56 @@
+//===--- Plugin.h - The LLVM Compiler Driver --------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open
+// Source License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+//  Plugin support for llvmc2.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_TOOLS_LLVMC2_PLUGIN_H
+#define LLVM_TOOLS_LLVMC2_PLUGIN_H
+
+namespace llvmc {
+
+  class LanguageMap;
+  class CompilationGraph;
+
+  /// BasePlugin - An abstract base class for all LLVMC plugins.
+  struct BasePlugin {
+
+    /// PopulateLanguageMap - The auto-generated function that fills in
+    /// the language map (map from file extensions to language names).
+    virtual void PopulateLanguageMap(LanguageMap&) const = 0;
+
+    /// PopulateCompilationGraph - The auto-generated function that
+    /// populates the compilation graph with nodes and edges.
+    virtual void PopulateCompilationGraph(CompilationGraph&) const = 0;
+  };
+
+  // Helper class for RegisterPlugin.
+  class RegisterPluginImpl {
+  protected:
+    RegisterPluginImpl(BasePlugin*);
+  };
+
+  /// RegisterPlugin<T> template - Used to register LLVMC plugins.
+  template <class T>
+  struct RegisterPlugin : RegisterPluginImpl {
+    RegisterPlugin() : RegisterPluginImpl (new T()) {}
+  };
+
+  /// PopulateLanguageMap - Fills in the language map by calling
+  /// PopulateLanguageMap methods of all plugins.
+  void PopulateLanguageMap(LanguageMap& langMap);
+
+  /// PopulateCompilationGraph - Populates the compilation graph by
+  /// calling PopulateCompilationGraph methods of all plugins.
+  void PopulateCompilationGraph(CompilationGraph& tools);
+
+}
+
+#endif // LLVM_TOOLS_LLVMC2_PLUGIN_H

Modified: llvm/trunk/tools/llvmc2/Tool.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/Tool.h?rev=56465&r1=56464&r2=56465&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/Tool.h (original)
+++ llvm/trunk/tools/llvmc2/Tool.h Mon Sep 22 15:49:34 2008
@@ -25,6 +25,7 @@
 
 namespace llvmc {
 
+  class LanguageMap;
   typedef std::vector<llvm::sys::Path> PathVector;
   typedef llvm::StringSet<> InputLanguagesSet;
 

Modified: llvm/trunk/tools/llvmc2/llvmc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/llvmc.cpp?rev=56465&r1=56464&r2=56465&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/llvmc.cpp (original)
+++ llvm/trunk/tools/llvmc2/llvmc.cpp Mon Sep 22 15:49:34 2008
@@ -16,10 +16,11 @@
 
 #include "CompilationGraph.h"
 #include "Error.h"
-#include "Tool.h"
+#include "Plugin.h"
 
 #include "llvm/System/Path.h"
 #include "llvm/Support/CommandLine.h"
+#include "llvm/Support/PluginLoader.h"
 
 #include <iostream>
 #include <stdexcept>

Added: llvm/trunk/tools/llvmc2/plugins/Hello/Hello.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/plugins/Hello/Hello.cpp?rev=56465&view=auto

==============================================================================
--- llvm/trunk/tools/llvmc2/plugins/Hello/Hello.cpp (added)
+++ llvm/trunk/tools/llvmc2/plugins/Hello/Hello.cpp Mon Sep 22 15:49:34 2008
@@ -0,0 +1,35 @@
+//===- Hello.cpp - Example code from "Writing an LLVM Pass" ---------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// Test plugin for LLVMC.
+//
+//===----------------------------------------------------------------------===//
+
+// TODO: Since llvmc2 has now gained support for plugins, its header
+// files should be probably moved into LLVM include dir.
+
+#include "../../CompilationGraph.h"
+#include "../../Plugin.h"
+
+#include <iostream>
+
+namespace {
+struct MyPlugin : public llvmc::BasePlugin {
+  void PopulateLanguageMap(llvmc::LanguageMap&) const
+  { std::cout << "Hello!\n"; }
+
+  void PopulateCompilationGraph(llvmc::CompilationGraph&) const
+  {}
+};
+
+static llvmc::RegisterPlugin<MyPlugin> RP;
+
+}
+
+

Added: llvm/trunk/tools/llvmc2/plugins/Hello/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/plugins/Hello/Makefile?rev=56465&view=auto

==============================================================================
--- llvm/trunk/tools/llvmc2/plugins/Hello/Makefile (added)
+++ llvm/trunk/tools/llvmc2/plugins/Hello/Makefile Mon Sep 22 15:49:34 2008
@@ -0,0 +1,17 @@
+##===- lib/Transforms/Hello/Makefile -----------------------*- Makefile -*-===##
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+
+LEVEL = ../../../..
+LIBRARYNAME = LLVMCHello
+LOADABLE_MODULE = 1
+REQUIRES_EH = 1
+USEDLIBS =
+
+include $(LEVEL)/Makefile.common
+

Modified: llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp?rev=56465&r1=56464&r2=56465&view=diff

==============================================================================
--- llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp Mon Sep 22 15:49:34 2008
@@ -1456,7 +1456,8 @@
     throw std::string("Error in the language map definition!");
 
   // Generate code
-  O << "void llvmc::PopulateLanguageMap(LanguageMap& langMap) {\n";
+  O << "namespace {\n\n";
+  O << "void PopulateLanguageMapLocal(LanguageMap& langMap) {\n";
 
   for (unsigned i = 0; i < LangsToSuffixesList->size(); ++i) {
     Record* LangToSuffixes = LangsToSuffixesList->getElementAsRecord(i);
@@ -1470,7 +1471,7 @@
         << "\"] = \"" << Lang << "\";\n";
   }
 
-  O << "}\n\n";
+  O << "}\n\n}\n\n";
 }
 
 /// FillInToolToLang - Fills in two tables that map tool names to
@@ -1593,7 +1594,8 @@
   ListInit* edges = CompilationGraph->getValueAsListInit("edges");
 
   // Generate code
-  O << "void llvmc::PopulateCompilationGraph(CompilationGraph& G) {\n";
+  O << "namespace {\n\n";
+  O << "void PopulateCompilationGraphLocal(CompilationGraph& G) {\n";
 
   // Insert vertices
 
@@ -1627,7 +1629,7 @@
     O << ");\n";
   }
 
-  O << "}\n\n";
+  O << "}\n\n}\n\n";
 }
 
 /// ExtractHookNames - Extract the hook names from all instances of
@@ -1704,6 +1706,38 @@
   O << "}\n\n";
 }
 
+/// EmitRegisterPlugin - Emit code to register this plugin.
+void EmitRegisterPlugin(std::ostream& O) {
+  O << "namespace {\n\n"
+    << "struct Plugin : public llvmc::BasePlugin {\n"
+    << Indent1 << "void PopulateLanguageMap(LanguageMap& langMap) const\n"
+    << Indent1 << "{ PopulateLanguageMapLocal(langMap); }\n\n"
+    << Indent1
+    << "void PopulateCompilationGraph(CompilationGraph& graph) const\n"
+    << Indent1 << "{ PopulateCompilationGraphLocal(graph); }\n"
+    << "};\n\n"
+
+    << "static llvmc::RegisterPlugin<Plugin> RP;\n\n}\n\n";
+}
+
+/// EmitInclude - Emit necessary #include directives.
+void EmitIncludes(std::ostream& O) {
+  O << "#include \"CompilationGraph.h\"\n"
+    << "#include \"Plugin.h\"\n"
+    << "#include \"Tool.h\"\n\n"
+
+    << "#include \"llvm/ADT/StringExtras.h\"\n"
+    << "#include \"llvm/Support/CommandLine.h\"\n\n"
+
+    << "#include <cstdlib>\n"
+    << "#include <stdexcept>\n\n"
+
+    << "using namespace llvm;\n"
+    << "using namespace llvmc;\n\n"
+
+    << "extern cl::opt<std::string> OutputFilename;\n\n";
+}
+
 // End of anonymous namespace
 }
 
@@ -1713,6 +1747,7 @@
 
   // Emit file header.
   EmitSourceFileHeader("LLVMC Configuration Library", O);
+  EmitIncludes(O);
 
   // Get a list of all defined Tools.
   RecordVector Tools = Records.getAllDerivedDefinitions("Tool");
@@ -1760,6 +1795,9 @@
   // Emit PopulateCompilationGraph() function.
   EmitPopulateCompilationGraph(CompilationGraphRecord, O);
 
+  // Emit code for plugin registration.
+  EmitRegisterPlugin(O);
+
   // EOF
   } catch (std::exception& Error) {
     throw Error.what() + std::string(" - usually this means a syntax error.");




From foldr at codedgers.com  Mon Sep 22 15:50:40 2008
From: foldr at codedgers.com (Mikhail Glushenkov)
Date: Mon, 22 Sep 2008 20:50:40 -0000
Subject: [llvm-commits] [llvm] r56466 - in /llvm/trunk:
 include/llvm/CompilerDriver/ include/llvm/CompilerDriver/Action.h
 include/llvm/CompilerDriver/CompilationGraph.h
 include/llvm/CompilerDriver/Plugin.h include/llvm/CompilerDriver/Tool.h
 tools/llvmc2/Action.cpp tools/llvmc2/Action.h
 tools/llvmc2/CompilationGraph.cpp tools/llvmc2/CompilationGraph.h
 tools/llvmc2/Plugin.cpp tools/llvmc2/Plugin.h tools/llvmc2/Tool.h
 tools/llvmc2/llvmc.cpp tools/llvmc2/plugins/Hello/Hello.cpp
 utils/TableGen/LLVMCConfigurationEmitter.cpp
Message-ID: <200809222050.m8MKofgg001425@zion.cs.uiuc.edu>

Author: foldr
Date: Mon Sep 22 15:50:40 2008
New Revision: 56466

URL: http://llvm.org/viewvc/llvm-project?rev=56466&view=rev
Log:
Move llvmc2 header files under include/llvm/CompilerDriver

Added:
    llvm/trunk/include/llvm/CompilerDriver/
    llvm/trunk/include/llvm/CompilerDriver/Action.h
      - copied, changed from r56465, llvm/trunk/tools/llvmc2/Action.h
    llvm/trunk/include/llvm/CompilerDriver/CompilationGraph.h
      - copied, changed from r56465, llvm/trunk/tools/llvmc2/CompilationGraph.h
    llvm/trunk/include/llvm/CompilerDriver/Plugin.h
      - copied, changed from r56465, llvm/trunk/tools/llvmc2/Plugin.h
    llvm/trunk/include/llvm/CompilerDriver/Tool.h
      - copied, changed from r56465, llvm/trunk/tools/llvmc2/Tool.h
Removed:
    llvm/trunk/tools/llvmc2/Action.h
    llvm/trunk/tools/llvmc2/CompilationGraph.h
    llvm/trunk/tools/llvmc2/Plugin.h
    llvm/trunk/tools/llvmc2/Tool.h
Modified:
    llvm/trunk/tools/llvmc2/Action.cpp
    llvm/trunk/tools/llvmc2/CompilationGraph.cpp
    llvm/trunk/tools/llvmc2/Plugin.cpp
    llvm/trunk/tools/llvmc2/llvmc.cpp
    llvm/trunk/tools/llvmc2/plugins/Hello/Hello.cpp
    llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp

Copied: llvm/trunk/include/llvm/CompilerDriver/Action.h (from r56465, llvm/trunk/tools/llvmc2/Action.h)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CompilerDriver/Action.h?p2=llvm/trunk/include/llvm/CompilerDriver/Action.h&p1=llvm/trunk/tools/llvmc2/Action.h&r1=56465&r2=56466&rev=56466&view=diff

==============================================================================
    (empty)

Copied: llvm/trunk/include/llvm/CompilerDriver/CompilationGraph.h (from r56465, llvm/trunk/tools/llvmc2/CompilationGraph.h)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CompilerDriver/CompilationGraph.h?p2=llvm/trunk/include/llvm/CompilerDriver/CompilationGraph.h&p1=llvm/trunk/tools/llvmc2/CompilationGraph.h&r1=56465&r2=56466&rev=56466&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/CompilationGraph.h (original)
+++ llvm/trunk/include/llvm/CompilerDriver/CompilationGraph.h Mon Sep 22 15:50:40 2008
@@ -14,7 +14,7 @@
 #ifndef LLVM_TOOLS_LLVMC2_COMPILATION_GRAPH_H
 #define LLVM_TOOLS_LLVMC2_COMPILATION_GRAPH_H
 
-#include "Tool.h"
+#include "llvm/CompilerDriver/Tool.h"
 
 #include "llvm/ADT/GraphTraits.h"
 #include "llvm/ADT/IntrusiveRefCntPtr.h"

Copied: llvm/trunk/include/llvm/CompilerDriver/Plugin.h (from r56465, llvm/trunk/tools/llvmc2/Plugin.h)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CompilerDriver/Plugin.h?p2=llvm/trunk/include/llvm/CompilerDriver/Plugin.h&p1=llvm/trunk/tools/llvmc2/Plugin.h&r1=56465&r2=56466&rev=56466&view=diff

==============================================================================
    (empty)

Copied: llvm/trunk/include/llvm/CompilerDriver/Tool.h (from r56465, llvm/trunk/tools/llvmc2/Tool.h)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CompilerDriver/Tool.h?p2=llvm/trunk/include/llvm/CompilerDriver/Tool.h&p1=llvm/trunk/tools/llvmc2/Tool.h&r1=56465&r2=56466&rev=56466&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/Tool.h (original)
+++ llvm/trunk/include/llvm/CompilerDriver/Tool.h Mon Sep 22 15:50:40 2008
@@ -14,7 +14,7 @@
 #ifndef LLVM_TOOLS_LLVMC2_TOOL_H
 #define LLVM_TOOLS_LLVMC2_TOOL_H
 
-#include "Action.h"
+#include "llvm/CompilerDriver/Action.h"
 
 #include "llvm/ADT/IntrusiveRefCntPtr.h"
 #include "llvm/ADT/StringSet.h"

Modified: llvm/trunk/tools/llvmc2/Action.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/Action.cpp?rev=56466&r1=56465&r2=56466&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/Action.cpp (original)
+++ llvm/trunk/tools/llvmc2/Action.cpp Mon Sep 22 15:50:40 2008
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Action.h"
+#include "llvm/CompilerDriver/Action.h"
 
 #include "llvm/Support/CommandLine.h"
 #include "llvm/System/Program.h"

Removed: llvm/trunk/tools/llvmc2/Action.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/Action.h?rev=56465&view=auto

==============================================================================
--- llvm/trunk/tools/llvmc2/Action.h (original)
+++ llvm/trunk/tools/llvmc2/Action.h (removed)
@@ -1,42 +0,0 @@
-//===--- Action.h - The LLVM Compiler Driver --------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open
-// Source License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-//  Action - encapsulates a single shell command.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVMC2_ACTION_H
-#define LLVM_TOOLS_LLVMC2_ACTION_H
-
-#include <string>
-#include <vector>
-
-namespace llvmc {
-
-  typedef std::vector<std::string> StrVector;
-
-  /// Action - A class that encapsulates a single shell command.
-  class Action {
-    /// Command_ - The actual command (for example, 'ls').
-    std::string Command_;
-    /// Args_ - Command arguments. Stdout redirection ("> file") is allowed.
-    std::vector<std::string> Args_;
-  public:
-    Action() {}
-    Action (const std::string& C, const StrVector& A)
-      : Command_(C), Args_(A)
-    {}
-
-    /// Execute - Executes the represented action.
-    int Execute() const;
-  };
-
-}
-
-#endif // LLVM_TOOLS_LLVMC2_ACTION_H

Modified: llvm/trunk/tools/llvmc2/CompilationGraph.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/CompilationGraph.cpp?rev=56466&r1=56465&r2=56466&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/CompilationGraph.cpp (original)
+++ llvm/trunk/tools/llvmc2/CompilationGraph.cpp Mon Sep 22 15:50:40 2008
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "Error.h"
-#include "CompilationGraph.h"
+#include "llvm/CompilerDriver/CompilationGraph.h"
 
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/Support/CommandLine.h"

Removed: llvm/trunk/tools/llvmc2/CompilationGraph.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/CompilationGraph.h?rev=56465&view=auto

==============================================================================
--- llvm/trunk/tools/llvmc2/CompilationGraph.h (original)
+++ llvm/trunk/tools/llvmc2/CompilationGraph.h (removed)
@@ -1,302 +0,0 @@
-//===--- CompilationGraph.h - The LLVM Compiler Driver ----------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open
-// Source License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-//  Compilation graph - definition.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVMC2_COMPILATION_GRAPH_H
-#define LLVM_TOOLS_LLVMC2_COMPILATION_GRAPH_H
-
-#include "Tool.h"
-
-#include "llvm/ADT/GraphTraits.h"
-#include "llvm/ADT/IntrusiveRefCntPtr.h"
-#include "llvm/ADT/iterator.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringMap.h"
-#include "llvm/ADT/StringSet.h"
-#include "llvm/System/Path.h"
-
-#include <cassert>
-#include <string>
-
-namespace llvmc {
-
-  class CompilationGraph;
-  typedef llvm::StringSet<> InputLanguagesSet;
-
-  /// LanguageMap - Maps from extensions to language names.
-  class LanguageMap : public llvm::StringMap<std::string> {
-  public:
-
-    /// GetLanguage -  Find the language name corresponding to a given file.
-    const std::string& GetLanguage(const llvm::sys::Path&) const;
-  };
-
-  /// Edge - Represents an edge of the compilation graph.
-  class Edge : public llvm::RefCountedBaseVPTR<Edge> {
-  public:
-    Edge(const std::string& T) : ToolName_(T) {}
-    virtual ~Edge() {};
-
-    const std::string& ToolName() const { return ToolName_; }
-    virtual unsigned Weight(const InputLanguagesSet& InLangs) const = 0;
-  private:
-    std::string ToolName_;
-  };
-
-  /// SimpleEdge - An edge that has no properties.
-  class SimpleEdge : public Edge {
-  public:
-    SimpleEdge(const std::string& T) : Edge(T) {}
-    unsigned Weight(const InputLanguagesSet&) const { return 1; }
-  };
-
-  /// Node - A node (vertex) of the compilation graph.
-  struct Node {
-    // A Node holds a list of the outward edges.
-    typedef llvm::SmallVector<llvm::IntrusiveRefCntPtr<Edge>, 3> container_type;
-    typedef container_type::iterator iterator;
-    typedef container_type::const_iterator const_iterator;
-
-    Node() : OwningGraph(0), InEdges(0) {}
-    Node(CompilationGraph* G) : OwningGraph(G), InEdges(0) {}
-    Node(CompilationGraph* G, Tool* T) :
-      OwningGraph(G), ToolPtr(T), InEdges(0) {}
-
-    bool HasChildren() const { return !OutEdges.empty(); }
-    const std::string Name() const
-    { return ToolPtr ? ToolPtr->Name() : "root"; }
-
-    // Iteration.
-    iterator EdgesBegin() { return OutEdges.begin(); }
-    const_iterator EdgesBegin() const { return OutEdges.begin(); }
-    iterator EdgesEnd() { return OutEdges.end(); }
-    const_iterator EdgesEnd() const { return OutEdges.end(); }
-
-    /// AddEdge - Add an outward edge. Takes ownership of the provided
-    /// Edge object.
-    void AddEdge(Edge* E)
-    { OutEdges.push_back(llvm::IntrusiveRefCntPtr<Edge>(E)); }
-
-    // Inward edge counter. Used to implement topological sort.
-    void IncrInEdges() { ++InEdges; }
-    void DecrInEdges() { --InEdges; }
-    bool HasNoInEdges() const { return InEdges == 0; }
-
-    // Needed to implement NodeChildIterator/GraphTraits
-    CompilationGraph* OwningGraph;
-    // The corresponding Tool.
-    // WARNING: ToolPtr can be NULL (for the root node).
-    llvm::IntrusiveRefCntPtr<Tool> ToolPtr;
-    // Links to children.
-    container_type OutEdges;
-    // Inward edge counter. Updated in
-    // CompilationGraph::insertEdge(). Used for topological sorting.
-    unsigned InEdges;
-  };
-
-  class NodesIterator;
-
-  /// CompilationGraph - The compilation graph itself.
-  class CompilationGraph {
-    /// nodes_map_type - The main data structure.
-    typedef llvm::StringMap<Node> nodes_map_type;
-    /// tools_vector_type, tools_map_type - Data structures used to
-    /// map from language names to tools. (We can have several tools
-    /// associated with each language name, hence the need for a
-    /// vector.)
-    typedef
-    llvm::SmallVector<llvm::IntrusiveRefCntPtr<Edge>, 3> tools_vector_type;
-    typedef llvm::StringMap<tools_vector_type> tools_map_type;
-
-    /// ToolsMap - Map from language names to lists of tool names.
-    tools_map_type ToolsMap;
-    /// NodesMap - Map from tool names to Tool objects.
-    nodes_map_type NodesMap;
-
-  public:
-
-    CompilationGraph();
-
-    /// insertNode - Insert a new node into the graph. Takes
-    /// ownership of the object.
-    void insertNode(Tool* T);
-
-    /// insertEdge - Insert a new edge into the graph. Takes ownership
-    /// of the Edge object.
-    void insertEdge(const std::string& A, Edge* E);
-
-    /// Build - Build target(s) from the input file set. Command-line
-    /// options are passed implicitly as global variables.
-    int Build(llvm::sys::Path const& TempDir, const LanguageMap& LangMap);
-
-    /// getNode - Return a reference to the node correponding to the
-    /// given tool name. Throws std::runtime_error.
-    Node& getNode(const std::string& ToolName);
-    const Node& getNode(const std::string& ToolName) const;
-
-    /// viewGraph - This function is meant for use from the debugger.
-    /// You can just say 'call G->viewGraph()' and a ghostview window
-    /// should pop up from the program, displaying the compilation
-    /// graph. This depends on there being a 'dot' and 'gv' program
-    /// in your path.
-    void viewGraph();
-
-    /// writeGraph - Write a compilation-graph.dot file.
-    void writeGraph();
-
-    // GraphTraits support.
-    friend NodesIterator GraphBegin(CompilationGraph*);
-    friend NodesIterator GraphEnd(CompilationGraph*);
-
-  private:
-    // Helper functions.
-
-    /// getToolsVector - Return a reference to the list of tool names
-    /// corresponding to the given language name. Throws
-    /// std::runtime_error.
-    const tools_vector_type& getToolsVector(const std::string& LangName) const;
-
-    /// PassThroughGraph - Pass the input file through the toolchain
-    /// starting at StartNode.
-    void PassThroughGraph (const llvm::sys::Path& In, const Node* StartNode,
-                           const InputLanguagesSet& InLangs,
-                           const llvm::sys::Path& TempDir,
-                           const LanguageMap& LangMap) const;
-
-    /// FindToolChain - Find head of the toolchain corresponding to the given file.
-    const Node* FindToolChain(const llvm::sys::Path& In,
-                              const std::string* ForceLanguage,
-                              InputLanguagesSet& InLangs,
-                              const LanguageMap& LangMap) const;
-
-    /// BuildInitial - Traverse the initial parts of the toolchains.
-    void BuildInitial(InputLanguagesSet& InLangs,
-                      const llvm::sys::Path& TempDir,
-                      const LanguageMap& LangMap);
-
-    /// TopologicalSort - Sort the nodes in topological order.
-    void TopologicalSort(std::vector<const Node*>& Out);
-    /// TopologicalSortFilterJoinNodes - Call TopologicalSort and
-    /// filter the resulting list to include only Join nodes.
-    void TopologicalSortFilterJoinNodes(std::vector<const Node*>& Out);
-  };
-
-  // GraphTraits support code.
-
-  /// NodesIterator - Auxiliary class needed to implement GraphTraits
-  /// support. Can be generalised to something like value_iterator
-  /// for map-like containers.
-  class NodesIterator : public llvm::StringMap<Node>::iterator {
-    typedef llvm::StringMap<Node>::iterator super;
-    typedef NodesIterator ThisType;
-    typedef Node* pointer;
-    typedef Node& reference;
-
-  public:
-    NodesIterator(super I) : super(I) {}
-
-    inline reference operator*() const {
-      return super::operator->()->second;
-    }
-    inline pointer operator->() const {
-      return &super::operator->()->second;
-    }
-  };
-
-  inline NodesIterator GraphBegin(CompilationGraph* G) {
-    return NodesIterator(G->NodesMap.begin());
-  }
-
-  inline NodesIterator GraphEnd(CompilationGraph* G) {
-    return NodesIterator(G->NodesMap.end());
-  }
-
-
-  /// NodeChildIterator - Another auxiliary class needed by GraphTraits.
-  class NodeChildIterator : public bidirectional_iterator<Node, ptrdiff_t> {
-    typedef NodeChildIterator ThisType;
-    typedef Node::container_type::iterator iterator;
-
-    CompilationGraph* OwningGraph;
-    iterator EdgeIter;
-  public:
-    typedef Node* pointer;
-    typedef Node& reference;
-
-    NodeChildIterator(Node* N, iterator I) :
-      OwningGraph(N->OwningGraph), EdgeIter(I) {}
-
-    const ThisType& operator=(const ThisType& I) {
-      assert(OwningGraph == I.OwningGraph);
-      EdgeIter = I.EdgeIter;
-      return *this;
-    }
-
-    inline bool operator==(const ThisType& I) const
-    { return EdgeIter == I.EdgeIter; }
-    inline bool operator!=(const ThisType& I) const
-    { return EdgeIter != I.EdgeIter; }
-
-    inline pointer operator*() const {
-      return &OwningGraph->getNode((*EdgeIter)->ToolName());
-    }
-    inline pointer operator->() const {
-      return &OwningGraph->getNode((*EdgeIter)->ToolName());
-    }
-
-    ThisType& operator++() { ++EdgeIter; return *this; } // Preincrement
-    ThisType operator++(int) { // Postincrement
-      ThisType tmp = *this;
-      ++*this;
-      return tmp;
-    }
-
-    inline ThisType& operator--() { --EdgeIter; return *this; }  // Predecrement
-    inline ThisType operator--(int) { // Postdecrement
-      ThisType tmp = *this;
-      --*this;
-      return tmp;
-    }
-
-  };
-}
-
-namespace llvm {
-  template <>
-  struct GraphTraits<llvmc::CompilationGraph*> {
-    typedef llvmc::CompilationGraph GraphType;
-    typedef llvmc::Node NodeType;
-    typedef llvmc::NodeChildIterator ChildIteratorType;
-
-    static NodeType* getEntryNode(GraphType* G) {
-      return &G->getNode("root");
-    }
-
-    static ChildIteratorType child_begin(NodeType* N) {
-      return ChildIteratorType(N, N->OutEdges.begin());
-    }
-    static ChildIteratorType child_end(NodeType* N) {
-      return ChildIteratorType(N, N->OutEdges.end());
-    }
-
-    typedef llvmc::NodesIterator nodes_iterator;
-    static nodes_iterator nodes_begin(GraphType *G) {
-      return GraphBegin(G);
-    }
-    static nodes_iterator nodes_end(GraphType *G) {
-      return GraphEnd(G);
-    }
-  };
-
-}
-
-#endif // LLVM_TOOLS_LLVMC2_COMPILATION_GRAPH_H

Modified: llvm/trunk/tools/llvmc2/Plugin.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/Plugin.cpp?rev=56466&r1=56465&r2=56466&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/Plugin.cpp (original)
+++ llvm/trunk/tools/llvmc2/Plugin.cpp Mon Sep 22 15:50:40 2008
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Plugin.h"
+#include "llvm/CompilerDriver/Plugin.h"
 
 #include <vector>
 

Removed: llvm/trunk/tools/llvmc2/Plugin.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/Plugin.h?rev=56465&view=auto

==============================================================================
--- llvm/trunk/tools/llvmc2/Plugin.h (original)
+++ llvm/trunk/tools/llvmc2/Plugin.h (removed)
@@ -1,56 +0,0 @@
-//===--- Plugin.h - The LLVM Compiler Driver --------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open
-// Source License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-//  Plugin support for llvmc2.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVMC2_PLUGIN_H
-#define LLVM_TOOLS_LLVMC2_PLUGIN_H
-
-namespace llvmc {
-
-  class LanguageMap;
-  class CompilationGraph;
-
-  /// BasePlugin - An abstract base class for all LLVMC plugins.
-  struct BasePlugin {
-
-    /// PopulateLanguageMap - The auto-generated function that fills in
-    /// the language map (map from file extensions to language names).
-    virtual void PopulateLanguageMap(LanguageMap&) const = 0;
-
-    /// PopulateCompilationGraph - The auto-generated function that
-    /// populates the compilation graph with nodes and edges.
-    virtual void PopulateCompilationGraph(CompilationGraph&) const = 0;
-  };
-
-  // Helper class for RegisterPlugin.
-  class RegisterPluginImpl {
-  protected:
-    RegisterPluginImpl(BasePlugin*);
-  };
-
-  /// RegisterPlugin<T> template - Used to register LLVMC plugins.
-  template <class T>
-  struct RegisterPlugin : RegisterPluginImpl {
-    RegisterPlugin() : RegisterPluginImpl (new T()) {}
-  };
-
-  /// PopulateLanguageMap - Fills in the language map by calling
-  /// PopulateLanguageMap methods of all plugins.
-  void PopulateLanguageMap(LanguageMap& langMap);
-
-  /// PopulateCompilationGraph - Populates the compilation graph by
-  /// calling PopulateCompilationGraph methods of all plugins.
-  void PopulateCompilationGraph(CompilationGraph& tools);
-
-}
-
-#endif // LLVM_TOOLS_LLVMC2_PLUGIN_H

Removed: llvm/trunk/tools/llvmc2/Tool.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/Tool.h?rev=56465&view=auto

==============================================================================
--- llvm/trunk/tools/llvmc2/Tool.h (original)
+++ llvm/trunk/tools/llvmc2/Tool.h (removed)
@@ -1,78 +0,0 @@
-//===--- Tool.h - The LLVM Compiler Driver ----------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open
-// Source License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-//  Tool abstract base class - an interface to tool descriptions.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVMC2_TOOL_H
-#define LLVM_TOOLS_LLVMC2_TOOL_H
-
-#include "Action.h"
-
-#include "llvm/ADT/IntrusiveRefCntPtr.h"
-#include "llvm/ADT/StringSet.h"
-#include "llvm/System/Path.h"
-
-#include <string>
-#include <vector>
-
-namespace llvmc {
-
-  class LanguageMap;
-  typedef std::vector<llvm::sys::Path> PathVector;
-  typedef llvm::StringSet<> InputLanguagesSet;
-
-  /// Tool - A class
-  class Tool : public llvm::RefCountedBaseVPTR<Tool> {
-  public:
-
-    virtual ~Tool() {}
-
-    virtual Action GenerateAction (const PathVector& inFiles,
-                                   const llvm::sys::Path& outFile,
-                                   const InputLanguagesSet& InLangs,
-                                   const LanguageMap& LangMap) const = 0;
-
-    virtual Action GenerateAction (const llvm::sys::Path& inFile,
-                                   const llvm::sys::Path& outFile,
-                                   const InputLanguagesSet& InLangs,
-                                   const LanguageMap& LangMap) const = 0;
-
-    virtual const char*  Name() const = 0;
-    virtual const char** InputLanguages() const = 0;
-    virtual const char*  OutputLanguage() const = 0;
-    virtual const char*  OutputSuffix() const = 0;
-
-    virtual bool IsLast() const = 0;
-    virtual bool IsJoin() const = 0;
-  };
-
-  /// JoinTool - A Tool that has an associated input file list.
-  class JoinTool : public Tool {
-  public:
-    void AddToJoinList(const llvm::sys::Path& P) { JoinList_.push_back(P); }
-    void ClearJoinList() { JoinList_.clear(); }
-    bool JoinListEmpty() const { return JoinList_.empty(); }
-
-    Action GenerateAction(const llvm::sys::Path& outFile,
-                          const InputLanguagesSet& InLangs,
-                          const LanguageMap& LangMap) const {
-      return GenerateAction(JoinList_, outFile, InLangs, LangMap);
-    }
-    // We shouldn't shadow base class's version of GenerateAction.
-    using Tool::GenerateAction;
-
-  private:
-    PathVector JoinList_;
-  };
-
-}
-
-#endif //LLVM_TOOLS_LLVMC2_TOOL_H

Modified: llvm/trunk/tools/llvmc2/llvmc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/llvmc.cpp?rev=56466&r1=56465&r2=56466&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/llvmc.cpp (original)
+++ llvm/trunk/tools/llvmc2/llvmc.cpp Mon Sep 22 15:50:40 2008
@@ -14,9 +14,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "CompilationGraph.h"
 #include "Error.h"
-#include "Plugin.h"
+
+#include "llvm/CompilerDriver/CompilationGraph.h"
+#include "llvm/CompilerDriver/Plugin.h"
 
 #include "llvm/System/Path.h"
 #include "llvm/Support/CommandLine.h"

Modified: llvm/trunk/tools/llvmc2/plugins/Hello/Hello.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/plugins/Hello/Hello.cpp?rev=56466&r1=56465&r2=56466&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/plugins/Hello/Hello.cpp (original)
+++ llvm/trunk/tools/llvmc2/plugins/Hello/Hello.cpp Mon Sep 22 15:50:40 2008
@@ -11,11 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-// TODO: Since llvmc2 has now gained support for plugins, its header
-// files should be probably moved into LLVM include dir.
-
-#include "../../CompilationGraph.h"
-#include "../../Plugin.h"
+#include "llvm/CompilerDriver/CompilationGraph.h"
+#include "llvm/CompilerDriver/Plugin.h"
 
 #include <iostream>
 

Modified: llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp?rev=56466&r1=56465&r2=56466&view=diff

==============================================================================
--- llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp Mon Sep 22 15:50:40 2008
@@ -1722,9 +1722,9 @@
 
 /// EmitInclude - Emit necessary #include directives.
 void EmitIncludes(std::ostream& O) {
-  O << "#include \"CompilationGraph.h\"\n"
-    << "#include \"Plugin.h\"\n"
-    << "#include \"Tool.h\"\n\n"
+  O << "#include \"llvm/CompilerDriver/CompilationGraph.h\"\n"
+    << "#include \"llvm/CompilerDriver/Plugin.h\"\n"
+    << "#include \"llvm/CompilerDriver/Tool.h\"\n\n"
 
     << "#include \"llvm/ADT/StringExtras.h\"\n"
     << "#include \"llvm/Support/CommandLine.h\"\n\n"




From foldr at codedgers.com  Mon Sep 22 15:51:20 2008
From: foldr at codedgers.com (Mikhail Glushenkov)
Date: Mon, 22 Sep 2008 20:51:20 -0000
Subject: [llvm-commits] [llvm] r56467 - in /llvm/trunk:
 include/llvm/CompilerDriver/Plugin.h tools/llvmc2/Plugin.cpp
 tools/llvmc2/llvmc.cpp tools/llvmc2/plugins/Hello/Hello.cpp
Message-ID: <200809222051.m8MKpK48001465@zion.cs.uiuc.edu>

Author: foldr
Date: Mon Sep 22 15:51:19 2008
New Revision: 56467

URL: http://llvm.org/viewvc/llvm-project?rev=56467&view=rev
Log:
Convert llvmc2 plugins to use llvm/Support/Registry.h machinery.

Modified:
    llvm/trunk/include/llvm/CompilerDriver/Plugin.h
    llvm/trunk/tools/llvmc2/Plugin.cpp
    llvm/trunk/tools/llvmc2/llvmc.cpp
    llvm/trunk/tools/llvmc2/plugins/Hello/Hello.cpp

Modified: llvm/trunk/include/llvm/CompilerDriver/Plugin.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CompilerDriver/Plugin.h?rev=56467&r1=56466&r2=56467&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CompilerDriver/Plugin.h (original)
+++ llvm/trunk/include/llvm/CompilerDriver/Plugin.h Mon Sep 22 15:51:19 2008
@@ -14,6 +14,8 @@
 #ifndef LLVM_TOOLS_LLVMC2_PLUGIN_H
 #define LLVM_TOOLS_LLVMC2_PLUGIN_H
 
+#include "llvm/Support/Registry.h"
+
 namespace llvmc {
 
   class LanguageMap;
@@ -31,25 +33,38 @@
     virtual void PopulateCompilationGraph(CompilationGraph&) const = 0;
   };
 
-  // Helper class for RegisterPlugin.
-  class RegisterPluginImpl {
-  protected:
-    RegisterPluginImpl(BasePlugin*);
-  };
+  typedef llvm::Registry<BasePlugin> PluginRegistry;
 
-  /// RegisterPlugin<T> template - Used to register LLVMC plugins.
-  template <class T>
-  struct RegisterPlugin : RegisterPluginImpl {
-    RegisterPlugin() : RegisterPluginImpl (new T()) {}
+  template <class P>
+  struct RegisterPlugin
+    : public PluginRegistry::Add<P> {
+    typedef PluginRegistry::Add<P> Base;
+
+    RegisterPlugin(const char* Name = "Nameless",
+                   const char* Desc = "Auto-generated plugin")
+      : Base(Name, Desc) {}
   };
 
-  /// PopulateLanguageMap - Fills in the language map by calling
-  /// PopulateLanguageMap methods of all plugins.
-  void PopulateLanguageMap(LanguageMap& langMap);
-
-  /// PopulateCompilationGraph - Populates the compilation graph by
-  /// calling PopulateCompilationGraph methods of all plugins.
-  void PopulateCompilationGraph(CompilationGraph& tools);
+
+  /// PluginLoader - Helper class used by the main program for
+  /// lifetime management.
+  struct PluginLoader {
+    PluginLoader();
+    ~PluginLoader();
+
+    /// PopulateLanguageMap - Fills in the language map by calling
+    /// PopulateLanguageMap methods of all plugins.
+    void PopulateLanguageMap(LanguageMap& langMap);
+
+    /// PopulateCompilationGraph - Populates the compilation graph by
+    /// calling PopulateCompilationGraph methods of all plugins.
+    void PopulateCompilationGraph(CompilationGraph& tools);
+
+  private:
+    // noncopyable
+    PluginLoader(const PluginLoader& other);
+    const PluginLoader& operator=(const PluginLoader& other);
+  };
 
 }
 

Modified: llvm/trunk/tools/llvmc2/Plugin.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/Plugin.cpp?rev=56467&r1=56466&r2=56467&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/Plugin.cpp (original)
+++ llvm/trunk/tools/llvmc2/Plugin.cpp Mon Sep 22 15:51:19 2008
@@ -16,25 +16,48 @@
 #include <vector>
 
 namespace {
-  typedef std::vector<llvmc::BasePlugin*> PluginRegistry;
-  static PluginRegistry GlobalPluginRegistry;
+
+  // Registry::Add<> does not do lifetime management (probably issues
+  // with static constructor/destructor ordering), so we have to
+  // implement it here.
+  //
+  // All this static registration/life-before-main model seems
+  // unnecessary convoluted to me.
+
+  static bool pluginListInitialized = false;
+  typedef std::vector<const llvmc::BasePlugin*> PluginList;
+  static PluginList Plugins;
 }
 
 namespace llvmc {
 
-  RegisterPluginImpl::RegisterPluginImpl(BasePlugin* plugin) {
-    GlobalPluginRegistry.push_back(plugin);
+  PluginLoader::PluginLoader() {
+    if (!pluginListInitialized) {
+      for (PluginRegistry::iterator B = PluginRegistry::begin(),
+             E = PluginRegistry::end(); B != E; ++B)
+        Plugins.push_back(B->instantiate());
+    }
+    pluginListInitialized = true;
+  }
+
+  PluginLoader::~PluginLoader() {
+    if (pluginListInitialized) {
+      for (PluginList::iterator B = Plugins.begin(), E = Plugins.end();
+           B != E; ++B)
+        delete (*B);
+    }
+    pluginListInitialized = false;
   }
 
-  void PopulateLanguageMap(LanguageMap& langMap) {
-    for (PluginRegistry::const_iterator B = GlobalPluginRegistry.begin(),
-           E = GlobalPluginRegistry.end(); B != E; ++B)
+  void PluginLoader::PopulateLanguageMap(LanguageMap& langMap) {
+    for (PluginList::iterator B = Plugins.begin(), E = Plugins.end();
+         B != E; ++B)
       (*B)->PopulateLanguageMap(langMap);
   }
 
-  void PopulateCompilationGraph(CompilationGraph& graph) {
-    for (PluginRegistry::const_iterator B = GlobalPluginRegistry.begin(),
-           E = GlobalPluginRegistry.end(); B != E; ++B)
+  void PluginLoader::PopulateCompilationGraph(CompilationGraph& graph) {
+    for (PluginList::iterator B = Plugins.begin(), E = Plugins.end();
+         B != E; ++B)
       (*B)->PopulateCompilationGraph(graph);
   }
 

Modified: llvm/trunk/tools/llvmc2/llvmc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/llvmc.cpp?rev=56467&r1=56466&r2=56467&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/llvmc.cpp (original)
+++ llvm/trunk/tools/llvmc2/llvmc.cpp Mon Sep 22 15:51:19 2008
@@ -85,8 +85,9 @@
     cl::ParseCommandLineOptions
       (argc, argv, "LLVM Compiler Driver (Work In Progress)", true);
 
-    PopulateLanguageMap(langMap);
-    PopulateCompilationGraph(graph);
+    PluginLoader Plugins;
+    Plugins.PopulateLanguageMap(langMap);
+    Plugins.PopulateCompilationGraph(graph);
 
     if (WriteGraph) {
       graph.writeGraph();

Modified: llvm/trunk/tools/llvmc2/plugins/Hello/Hello.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/plugins/Hello/Hello.cpp?rev=56467&r1=56466&r2=56467&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/plugins/Hello/Hello.cpp (original)
+++ llvm/trunk/tools/llvmc2/plugins/Hello/Hello.cpp Mon Sep 22 15:51:19 2008
@@ -25,7 +25,7 @@
   {}
 };
 
-static llvmc::RegisterPlugin<MyPlugin> RP;
+static llvmc::RegisterPlugin<MyPlugin> RP("Hello", "Hello World plugin");
 
 }
 




From dalej at apple.com  Mon Sep 22 15:51:32 2008
From: dalej at apple.com (Dale Johannesen)
Date: Mon, 22 Sep 2008 20:51:32 -0000
Subject: [llvm-commits] [llvm] r56468 -
	/llvm/trunk/lib/CodeGen/IntrinsicLowering.cpp
Message-ID: <200809222051.m8MKpX92001481@zion.cs.uiuc.edu>

Author: johannes
Date: Mon Sep 22 15:51:30 2008
New Revision: 56468

URL: http://llvm.org/viewvc/llvm-project?rev=56468&view=rev
Log:
More refactoring.  Yawn.


Modified:
    llvm/trunk/lib/CodeGen/IntrinsicLowering.cpp

Modified: llvm/trunk/lib/CodeGen/IntrinsicLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/IntrinsicLowering.cpp?rev=56468&r1=56467&r2=56468&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/IntrinsicLowering.cpp (original)
+++ llvm/trunk/lib/CodeGen/IntrinsicLowering.cpp Mon Sep 22 15:51:30 2008
@@ -629,6 +629,28 @@
   return CallInst::Create(F, Args, array_endof(Args), CI->getName(), CI);
 }
 
+static void ReplaceFPIntrinsicWithCall(CallInst *CI, Constant *FCache,
+                                       Constant *DCache, Constant *LDCache,
+                                       const char *Fname, const char *Dname,
+                                       const char *LDname) {
+  switch (CI->getOperand(1)->getType()->getTypeID()) {
+  default: assert(0 && "Invalid type in intrinsic"); abort();
+  case Type::FloatTyID:
+    ReplaceCallWith(Fname, CI, CI->op_begin()+1, CI->op_end(),
+                  Type::FloatTy, FCache);
+    break;
+  case Type::DoubleTyID:
+    ReplaceCallWith(Dname, CI, CI->op_begin()+1, CI->op_end(),
+                  Type::DoubleTy, DCache);
+    break;
+  case Type::X86_FP80TyID:
+  case Type::FP128TyID:
+  case Type::PPC_FP128TyID:
+    ReplaceCallWith(LDname, CI, CI->op_begin()+1, CI->op_end(),
+                  CI->getOperand(1)->getType(), LDCache);
+    break;
+  }
+}
 
 void IntrinsicLowering::LowerIntrinsicCall(CallInst *CI) {
   Function *Callee = CI->getCalledFunction();
@@ -821,164 +843,59 @@
     break;
   }
   case Intrinsic::sqrt: {
-    static Constant *sqrtfFCache = 0;
     static Constant *sqrtFCache = 0;
+    static Constant *sqrtDCache = 0;
     static Constant *sqrtLDCache = 0;
-    switch (CI->getOperand(1)->getType()->getTypeID()) {
-    default: assert(0 && "Invalid type in sqrt"); abort();
-    case Type::FloatTyID:
-      ReplaceCallWith("sqrtf", CI, CI->op_begin()+1, CI->op_end(),
-                    Type::FloatTy, sqrtfFCache);
-      break;
-    case Type::DoubleTyID:
-      ReplaceCallWith("sqrt", CI, CI->op_begin()+1, CI->op_end(),
-                    Type::DoubleTy, sqrtFCache);
-      break;
-    case Type::X86_FP80TyID:
-    case Type::FP128TyID:
-    case Type::PPC_FP128TyID:
-      ReplaceCallWith("sqrtl", CI, CI->op_begin()+1, CI->op_end(),
-                    CI->getOperand(1)->getType(), sqrtLDCache);
-      break;
-    }
+    ReplaceFPIntrinsicWithCall(CI, sqrtFCache, sqrtDCache, sqrtLDCache,
+                               "sqrtf", "sqrt", "sqrtl");
     break;
   }
   case Intrinsic::log: {
-    static Constant *logfFCache = 0;
     static Constant *logFCache = 0;
+    static Constant *logDCache = 0;
     static Constant *logLDCache = 0;
-    switch (CI->getOperand(1)->getType()->getTypeID()) {
-    default: assert(0 && "Invalid type in log"); abort();
-    case Type::FloatTyID:
-      ReplaceCallWith("logf", CI, CI->op_begin()+1, CI->op_end(),
-                    Type::FloatTy, logfFCache);
-      break;
-    case Type::DoubleTyID:
-      ReplaceCallWith("log", CI, CI->op_begin()+1, CI->op_end(),
-                    Type::DoubleTy, logFCache);
-      break;
-    case Type::X86_FP80TyID:
-    case Type::FP128TyID:
-    case Type::PPC_FP128TyID:
-      ReplaceCallWith("logl", CI, CI->op_begin()+1, CI->op_end(),
-                    CI->getOperand(1)->getType(), logLDCache);
-      break;
-    }
+    ReplaceFPIntrinsicWithCall(CI, logFCache, logDCache, logLDCache,
+                               "logf", "log", "logl");
     break;
   }
   case Intrinsic::log2: {
-    static Constant *log2fFCache = 0;
     static Constant *log2FCache = 0;
+    static Constant *log2DCache = 0;
     static Constant *log2LDCache = 0;
-    switch (CI->getOperand(1)->getType()->getTypeID()) {
-    default: assert(0 && "Invalid type in log2"); abort();
-    case Type::FloatTyID:
-      ReplaceCallWith("log2f", CI, CI->op_begin()+1, CI->op_end(),
-                    Type::FloatTy, log2fFCache);
-      break;
-    case Type::DoubleTyID:
-      ReplaceCallWith("log2", CI, CI->op_begin()+1, CI->op_end(),
-                    Type::DoubleTy, log2FCache);
-      break;
-    case Type::X86_FP80TyID:
-    case Type::FP128TyID:
-    case Type::PPC_FP128TyID:
-      ReplaceCallWith("log2l", CI, CI->op_begin()+1, CI->op_end(),
-                    CI->getOperand(1)->getType(), log2LDCache);
-      break;
-    }
+    ReplaceFPIntrinsicWithCall(CI, log2FCache, log2DCache, log2LDCache,
+                               "log2f", "log2", "log2l");
     break;
   }
   case Intrinsic::log10: {
-    static Constant *log10fFCache = 0;
     static Constant *log10FCache = 0;
+    static Constant *log10DCache = 0;
     static Constant *log10LDCache = 0;
-    switch (CI->getOperand(1)->getType()->getTypeID()) {
-    default: assert(0 && "Invalid type in log10"); abort();
-    case Type::FloatTyID:
-      ReplaceCallWith("log10f", CI, CI->op_begin()+1, CI->op_end(),
-                    Type::FloatTy, log10fFCache);
-      break;
-    case Type::DoubleTyID:
-      ReplaceCallWith("log10", CI, CI->op_begin()+1, CI->op_end(),
-                    Type::DoubleTy, log10FCache);
-      break;
-    case Type::X86_FP80TyID:
-    case Type::FP128TyID:
-    case Type::PPC_FP128TyID:
-      ReplaceCallWith("log10l", CI, CI->op_begin()+1, CI->op_end(),
-                    CI->getOperand(1)->getType(), log10LDCache);
-      break;
-    }
+    ReplaceFPIntrinsicWithCall(CI, log10FCache, log10DCache, log10LDCache,
+                               "log10f", "log10", "log10l");
     break;
   }
   case Intrinsic::exp: {
-    static Constant *expfFCache = 0;
     static Constant *expFCache = 0;
+    static Constant *expDCache = 0;
     static Constant *expLDCache = 0;
-    switch (CI->getOperand(1)->getType()->getTypeID()) {
-    default: assert(0 && "Invalid type in exp"); abort();
-    case Type::FloatTyID:
-      ReplaceCallWith("expf", CI, CI->op_begin()+1, CI->op_end(),
-                    Type::FloatTy, expfFCache);
-      break;
-    case Type::DoubleTyID:
-      ReplaceCallWith("exp", CI, CI->op_begin()+1, CI->op_end(),
-                    Type::DoubleTy, expFCache);
-      break;
-    case Type::X86_FP80TyID:
-    case Type::FP128TyID:
-    case Type::PPC_FP128TyID:
-      ReplaceCallWith("expl", CI, CI->op_begin()+1, CI->op_end(),
-                    CI->getOperand(1)->getType(), expLDCache);
-      break;
-    }
+    ReplaceFPIntrinsicWithCall(CI, expFCache, expDCache, expLDCache,
+                               "expf", "exp", "expl");
     break;
   }
   case Intrinsic::exp2: {
-    static Constant *exp2fFCache = 0;
     static Constant *exp2FCache = 0;
+    static Constant *exp2DCache = 0;
     static Constant *exp2LDCache = 0;
-    switch (CI->getOperand(1)->getType()->getTypeID()) {
-    default: assert(0 && "Invalid type in exp2"); abort();
-    case Type::FloatTyID:
-      ReplaceCallWith("exp2f", CI, CI->op_begin()+1, CI->op_end(),
-                    Type::FloatTy, exp2fFCache);
-      break;
-    case Type::DoubleTyID:
-      ReplaceCallWith("exp2", CI, CI->op_begin()+1, CI->op_end(),
-                    Type::DoubleTy, exp2FCache);
-      break;
-    case Type::X86_FP80TyID:
-    case Type::FP128TyID:
-    case Type::PPC_FP128TyID:
-      ReplaceCallWith("exp2l", CI, CI->op_begin()+1, CI->op_end(),
-                    CI->getOperand(1)->getType(), exp2LDCache);
-      break;
-    }
+    ReplaceFPIntrinsicWithCall(CI, exp2FCache, exp2DCache, exp2LDCache,
+                               "exp2f", "exp2", "exp2l");
     break;
   }
   case Intrinsic::pow: {
-    static Constant *powfFCache = 0;
     static Constant *powFCache = 0;
+    static Constant *powDCache = 0;
     static Constant *powLDCache = 0;
-    switch (CI->getOperand(1)->getType()->getTypeID()) {
-    default: assert(0 && "Invalid type in pow"); abort();
-    case Type::FloatTyID:
-      ReplaceCallWith("powf", CI, CI->op_begin()+1, CI->op_end(),
-                    Type::FloatTy, powfFCache);
-      break;
-    case Type::DoubleTyID:
-      ReplaceCallWith("pow", CI, CI->op_begin()+1, CI->op_end(),
-                    Type::DoubleTy, powFCache);
-      break;
-    case Type::X86_FP80TyID:
-    case Type::FP128TyID:
-    case Type::PPC_FP128TyID:
-      ReplaceCallWith("powl", CI, CI->op_begin()+1, CI->op_end(),
-                    CI->getOperand(1)->getType(), powLDCache);
-      break;
-    }
+    ReplaceFPIntrinsicWithCall(CI, powFCache, powDCache, powLDCache,
+                               "powf", "pow", "powl");
     break;
   }
   case Intrinsic::flt_rounds:




From evan.cheng at apple.com  Mon Sep 22 15:58:14 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Mon, 22 Sep 2008 20:58:14 -0000
Subject: [llvm-commits] [llvm] r56469 - in /llvm/trunk/lib:
 CodeGen/BranchFolding.cpp CodeGen/LiveStackAnalysis.cpp
 CodeGen/LoopAligner.cpp CodeGen/LowerSubregs.cpp
 CodeGen/MachineModuleInfo.cpp CodeGen/PrologEpilogInserter.cpp
 CodeGen/SimpleRegisterCoalescing.cpp CodeGen/StackSlotColoring.cpp
 Target/X86/X86FloatingPoint.cpp
Message-ID: <200809222058.m8MKwJOa001700@zion.cs.uiuc.edu>

Author: evancheng
Date: Mon Sep 22 15:58:04 2008
New Revision: 56469

URL: http://llvm.org/viewvc/llvm-project?rev=56469&view=rev
Log:
Mark several codegen passes as preserving all analysis.

Modified:
    llvm/trunk/lib/CodeGen/BranchFolding.cpp
    llvm/trunk/lib/CodeGen/LiveStackAnalysis.cpp
    llvm/trunk/lib/CodeGen/LoopAligner.cpp
    llvm/trunk/lib/CodeGen/LowerSubregs.cpp
    llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp
    llvm/trunk/lib/CodeGen/PrologEpilogInserter.cpp
    llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp
    llvm/trunk/lib/CodeGen/StackSlotColoring.cpp
    llvm/trunk/lib/Target/X86/X86FloatingPoint.cpp

Modified: llvm/trunk/lib/CodeGen/BranchFolding.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/BranchFolding.cpp?rev=56469&r1=56468&r2=56469&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/BranchFolding.cpp (original)
+++ llvm/trunk/lib/CodeGen/BranchFolding.cpp Mon Sep 22 15:58:04 2008
@@ -48,12 +48,12 @@
   struct VISIBILITY_HIDDEN BranchFolder : public MachineFunctionPass {
     static char ID;
     explicit BranchFolder(bool defaultEnableTailMerge) : 
-        MachineFunctionPass(&ID) {
-          switch (FlagEnableTailMerge) {
-          case cl::BOU_UNSET: EnableTailMerge = defaultEnableTailMerge; break;
-          case cl::BOU_TRUE: EnableTailMerge = true; break;
-          case cl::BOU_FALSE: EnableTailMerge = false; break;
-          }
+      MachineFunctionPass(&ID) {
+      switch (FlagEnableTailMerge) {
+        case cl::BOU_UNSET: EnableTailMerge = defaultEnableTailMerge; break;
+        case cl::BOU_TRUE: EnableTailMerge = true; break;
+        case cl::BOU_FALSE: EnableTailMerge = false; break;
+      }
     }
 
     virtual bool runOnMachineFunction(MachineFunction &MF);

Modified: llvm/trunk/lib/CodeGen/LiveStackAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveStackAnalysis.cpp?rev=56469&r1=56468&r2=56469&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/LiveStackAnalysis.cpp (original)
+++ llvm/trunk/lib/CodeGen/LiveStackAnalysis.cpp Mon Sep 22 15:58:04 2008
@@ -26,6 +26,7 @@
 
 void LiveStacks::getAnalysisUsage(AnalysisUsage &AU) const {
   AU.setPreservesAll();
+  MachineFunctionPass::getAnalysisUsage(AU);
 }
 
 void LiveStacks::releaseMemory() {

Modified: llvm/trunk/lib/CodeGen/LoopAligner.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LoopAligner.cpp?rev=56469&r1=56468&r2=56469&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/LoopAligner.cpp (original)
+++ llvm/trunk/lib/CodeGen/LoopAligner.cpp Mon Sep 22 15:58:04 2008
@@ -34,6 +34,7 @@
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.addRequired<MachineLoopInfo>();
       AU.addPreserved<MachineLoopInfo>();
+      AU.setPreservesAll();
       MachineFunctionPass::getAnalysisUsage(AU);
     }
   };

Modified: llvm/trunk/lib/CodeGen/LowerSubregs.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LowerSubregs.cpp?rev=56469&r1=56468&r2=56469&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/LowerSubregs.cpp (original)
+++ llvm/trunk/lib/CodeGen/LowerSubregs.cpp Mon Sep 22 15:58:04 2008
@@ -30,6 +30,11 @@
       return "Subregister lowering instruction pass";
     }
 
+    virtual void getAnalysisUsage(AnalysisUsage &AU) const {
+      AU.setPreservesAll();
+      MachineFunctionPass::getAnalysisUsage(AU);
+    }
+
     /// runOnMachineFunction - pass entry point
     bool runOnMachineFunction(MachineFunction&);
     

Modified: llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp?rev=56469&r1=56468&r2=56469&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp Mon Sep 22 15:58:04 2008
@@ -2013,6 +2013,11 @@
   static char ID;
   DebugLabelFolder() : MachineFunctionPass(&ID) {}
 
+  virtual void getAnalysisUsage(AnalysisUsage &AU) const {
+    AU.setPreservesAll();
+    MachineFunctionPass::getAnalysisUsage(AU);
+  }
+
   virtual bool runOnMachineFunction(MachineFunction &MF);
   virtual const char *getPassName() const { return "Label Folder"; }
 };

Modified: llvm/trunk/lib/CodeGen/PrologEpilogInserter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PrologEpilogInserter.cpp?rev=56469&r1=56468&r2=56469&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/PrologEpilogInserter.cpp (original)
+++ llvm/trunk/lib/CodeGen/PrologEpilogInserter.cpp Mon Sep 22 15:58:04 2008
@@ -41,6 +41,11 @@
       return "Prolog/Epilog Insertion & Frame Finalization";
     }
 
+    virtual void getAnalysisUsage(AnalysisUsage &AU) const {
+      AU.setPreservesAll();
+      MachineFunctionPass::getAnalysisUsage(AU);
+    }
+
     /// runOnMachineFunction - Insert prolog/epilog code and replace abstract
     /// frame indexes with appropriate references.
     ///

Modified: llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp?rev=56469&r1=56468&r2=56469&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp (original)
+++ llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp Mon Sep 22 15:58:04 2008
@@ -67,13 +67,13 @@
 const PassInfo *const llvm::SimpleRegisterCoalescingID = &X;
 
 void SimpleRegisterCoalescing::getAnalysisUsage(AnalysisUsage &AU) const {
+  AU.addRequired<LiveIntervals>();
   AU.addPreserved<LiveIntervals>();
+  AU.addRequired<MachineLoopInfo>();
   AU.addPreserved<MachineLoopInfo>();
   AU.addPreservedID(MachineDominatorsID);
   AU.addPreservedID(PHIEliminationID);
   AU.addPreservedID(TwoAddressInstructionPassID);
-  AU.addRequired<LiveIntervals>();
-  AU.addRequired<MachineLoopInfo>();
   MachineFunctionPass::getAnalysisUsage(AU);
 }
 

Modified: llvm/trunk/lib/CodeGen/StackSlotColoring.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/StackSlotColoring.cpp?rev=56469&r1=56468&r2=56469&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/StackSlotColoring.cpp (original)
+++ llvm/trunk/lib/CodeGen/StackSlotColoring.cpp Mon Sep 22 15:58:04 2008
@@ -66,6 +66,7 @@
     
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.addRequired<LiveStacks>();
+      AU.setPreservesAll();
       MachineFunctionPass::getAnalysisUsage(AU);
     }
 

Modified: llvm/trunk/lib/Target/X86/X86FloatingPoint.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86FloatingPoint.cpp?rev=56469&r1=56468&r2=56469&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86FloatingPoint.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86FloatingPoint.cpp Mon Sep 22 15:58:04 2008
@@ -55,6 +55,11 @@
     static char ID;
     FPS() : MachineFunctionPass(&ID) {}
 
+    virtual void getAnalysisUsage(AnalysisUsage &AU) const {
+      AU.setPreservesAll();
+      MachineFunctionPass::getAnalysisUsage(AU);
+    }
+
     virtual bool runOnMachineFunction(MachineFunction &MF);
 
     virtual const char *getPassName() const { return "X86 FP Stackifier"; }




From dalej at apple.com  Mon Sep 22 16:57:35 2008
From: dalej at apple.com (Dale Johannesen)
Date: Mon, 22 Sep 2008 21:57:35 -0000
Subject: [llvm-commits] [llvm] r56471 - in /llvm/trunk/lib:
 CodeGen/SelectionDAG/TargetLowering.cpp Target/ARM/ARMISelLowering.cpp
 Target/Alpha/AlphaISelLowering.cpp Target/CellSPU/SPUISelLowering.cpp
 Target/IA64/IA64ISelLowering.cpp Target/PowerPC/PPCISelLowering.cpp
 Target/Sparc/SparcISelLowering.cpp Target/X86/X86ISelLowering.cpp
Message-ID: <200809222157.m8MLvZsF003735@zion.cs.uiuc.edu>

Author: johannes
Date: Mon Sep 22 16:57:32 2008
New Revision: 56471

URL: http://llvm.org/viewvc/llvm-project?rev=56471&view=rev
Log:
Make log, log2, log10, exp, exp2 use Expand by
default.


Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp
    llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp
    llvm/trunk/lib/Target/Alpha/AlphaISelLowering.cpp
    llvm/trunk/lib/Target/CellSPU/SPUISelLowering.cpp
    llvm/trunk/lib/Target/IA64/IA64ISelLowering.cpp
    llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp
    llvm/trunk/lib/Target/Sparc/SparcISelLowering.cpp
    llvm/trunk/lib/Target/X86/X86ISelLowering.cpp

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp Mon Sep 22 16:57:32 2008
@@ -430,6 +430,18 @@
   setOperationAction(ISD::ConstantFP, MVT::f64, Expand);
   setOperationAction(ISD::ConstantFP, MVT::f80, Expand);
 
+  // These library functions default to expand.
+  setOperationAction(ISD::FLOG , MVT::f64, Expand);
+  setOperationAction(ISD::FLOG2, MVT::f64, Expand);
+  setOperationAction(ISD::FLOG10,MVT::f64, Expand);
+  setOperationAction(ISD::FEXP , MVT::f64, Expand);
+  setOperationAction(ISD::FEXP2, MVT::f64, Expand);
+  setOperationAction(ISD::FLOG , MVT::f32, Expand);
+  setOperationAction(ISD::FLOG2, MVT::f32, Expand);
+  setOperationAction(ISD::FLOG10,MVT::f32, Expand);
+  setOperationAction(ISD::FEXP , MVT::f32, Expand);
+  setOperationAction(ISD::FEXP2, MVT::f32, Expand);
+
   // Default ISD::TRAP to expand (which turns it into abort).
   setOperationAction(ISD::TRAP, MVT::Other, Expand);
     

Modified: llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp?rev=56471&r1=56470&r2=56471&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp Mon Sep 22 16:57:32 2008
@@ -243,16 +243,6 @@
   setOperationAction(ISD::FCOS     , MVT::f64, Expand);
   setOperationAction(ISD::FREM     , MVT::f64, Expand);
   setOperationAction(ISD::FREM     , MVT::f32, Expand);
-  setOperationAction(ISD::FLOG     , MVT::f64, Expand);
-  setOperationAction(ISD::FLOG     , MVT::f32, Expand);
-  setOperationAction(ISD::FLOG2    , MVT::f64, Expand);
-  setOperationAction(ISD::FLOG2    , MVT::f32, Expand);
-  setOperationAction(ISD::FLOG10   , MVT::f64, Expand);
-  setOperationAction(ISD::FLOG10   , MVT::f32, Expand);
-  setOperationAction(ISD::FEXP     , MVT::f64, Expand);
-  setOperationAction(ISD::FEXP     , MVT::f32, Expand);
-  setOperationAction(ISD::FEXP2    , MVT::f64, Expand);
-  setOperationAction(ISD::FEXP2    , MVT::f32, Expand);
   if (!UseSoftFloat && Subtarget->hasVFP2() && !Subtarget->isThumb()) {
     setOperationAction(ISD::FCOPYSIGN, MVT::f64, Custom);
     setOperationAction(ISD::FCOPYSIGN, MVT::f32, Custom);

Modified: llvm/trunk/lib/Target/Alpha/AlphaISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Alpha/AlphaISelLowering.cpp?rev=56471&r1=56470&r2=56471&view=diff

==============================================================================
--- llvm/trunk/lib/Target/Alpha/AlphaISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/Alpha/AlphaISelLowering.cpp Mon Sep 22 16:57:32 2008
@@ -99,17 +99,6 @@
   setOperationAction(ISD::FPOW , MVT::f32, Expand);
   setOperationAction(ISD::FPOW , MVT::f64, Expand);
 
-  setOperationAction(ISD::FLOG, MVT::f32, Expand);
-  setOperationAction(ISD::FLOG, MVT::f64, Expand);
-  setOperationAction(ISD::FLOG2, MVT::f32, Expand);
-  setOperationAction(ISD::FLOG2, MVT::f64, Expand);
-  setOperationAction(ISD::FLOG10, MVT::f32, Expand);
-  setOperationAction(ISD::FLOG10, MVT::f64, Expand);
-  setOperationAction(ISD::FEXP, MVT::f32, Expand);
-  setOperationAction(ISD::FEXP, MVT::f64, Expand);
-  setOperationAction(ISD::FEXP2, MVT::f32, Expand);
-  setOperationAction(ISD::FEXP2, MVT::f64, Expand);
-  
   setOperationAction(ISD::SETCC, MVT::f32, Promote);
 
   setOperationAction(ISD::BIT_CONVERT, MVT::f32, Promote);

Modified: llvm/trunk/lib/Target/CellSPU/SPUISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CellSPU/SPUISelLowering.cpp?rev=56471&r1=56470&r2=56471&view=diff

==============================================================================
--- llvm/trunk/lib/Target/CellSPU/SPUISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/CellSPU/SPUISelLowering.cpp Mon Sep 22 16:57:32 2008
@@ -189,19 +189,9 @@
   setOperationAction(ISD::FSIN , MVT::f64, Expand);
   setOperationAction(ISD::FCOS , MVT::f64, Expand);
   setOperationAction(ISD::FREM , MVT::f64, Expand);
-  setOperationAction(ISD::FLOG , MVT::f64, Expand);
-  setOperationAction(ISD::FLOG2, MVT::f64, Expand);
-  setOperationAction(ISD::FLOG10,MVT::f64, Expand);
-  setOperationAction(ISD::FEXP , MVT::f64, Expand);
-  setOperationAction(ISD::FEXP2, MVT::f64, Expand);
   setOperationAction(ISD::FSIN , MVT::f32, Expand);
   setOperationAction(ISD::FCOS , MVT::f32, Expand);
   setOperationAction(ISD::FREM , MVT::f32, Expand);
-  setOperationAction(ISD::FLOG , MVT::f32, Expand);
-  setOperationAction(ISD::FLOG2, MVT::f32, Expand);
-  setOperationAction(ISD::FLOG10,MVT::f32, Expand);
-  setOperationAction(ISD::FEXP , MVT::f32, Expand);
-  setOperationAction(ISD::FEXP2, MVT::f32, Expand);
 
   // If we're enabling GP optimizations, use hardware square root
   setOperationAction(ISD::FSQRT, MVT::f64, Expand);

Modified: llvm/trunk/lib/Target/IA64/IA64ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/IA64/IA64ISelLowering.cpp?rev=56471&r1=56470&r2=56471&view=diff

==============================================================================
--- llvm/trunk/lib/Target/IA64/IA64ISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/IA64/IA64ISelLowering.cpp Mon Sep 22 16:57:32 2008
@@ -75,20 +75,10 @@
   setOperationAction(ISD::FCOS , MVT::f64, Expand);
   setOperationAction(ISD::FSQRT, MVT::f64, Expand);
   setOperationAction(ISD::FPOW , MVT::f64, Expand);
-  setOperationAction(ISD::FLOG , MVT::f64, Expand);
-  setOperationAction(ISD::FLOG2, MVT::f64, Expand);
-  setOperationAction(ISD::FLOG10,MVT::f64, Expand);
-  setOperationAction(ISD::FEXP , MVT::f64, Expand);
-  setOperationAction(ISD::FEXP2, MVT::f64, Expand);
   setOperationAction(ISD::FSIN , MVT::f32, Expand);
   setOperationAction(ISD::FCOS , MVT::f32, Expand);
   setOperationAction(ISD::FSQRT, MVT::f32, Expand);
   setOperationAction(ISD::FPOW , MVT::f32, Expand);
-  setOperationAction(ISD::FLOG , MVT::f32, Expand);
-  setOperationAction(ISD::FLOG2, MVT::f32, Expand);
-  setOperationAction(ISD::FLOG10,MVT::f32, Expand);
-  setOperationAction(ISD::FEXP , MVT::f32, Expand);
-  setOperationAction(ISD::FEXP2, MVT::f32, Expand);
 
   setOperationAction(ISD::SIGN_EXTEND_INREG, MVT::i1   , Expand);
     

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

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp Mon Sep 22 16:57:32 2008
@@ -99,20 +99,10 @@
   setOperationAction(ISD::FCOS , MVT::f64, Expand);
   setOperationAction(ISD::FREM , MVT::f64, Expand);
   setOperationAction(ISD::FPOW , MVT::f64, Expand);
-  setOperationAction(ISD::FLOG , MVT::f64, Expand);
-  setOperationAction(ISD::FLOG2, MVT::f64, Expand);
-  setOperationAction(ISD::FLOG10,MVT::f64, Expand);
-  setOperationAction(ISD::FEXP  ,MVT::f64, Expand);
-  setOperationAction(ISD::FEXP2 ,MVT::f64, Expand);
   setOperationAction(ISD::FSIN , MVT::f32, Expand);
   setOperationAction(ISD::FCOS , MVT::f32, Expand);
   setOperationAction(ISD::FREM , MVT::f32, Expand);
   setOperationAction(ISD::FPOW , MVT::f32, Expand);
-  setOperationAction(ISD::FLOG , MVT::f32, Expand);
-  setOperationAction(ISD::FLOG2 ,MVT::f32, Expand);
-  setOperationAction(ISD::FLOG10,MVT::f32, Expand);
-  setOperationAction(ISD::FEXP  ,MVT::f32, Expand);
-  setOperationAction(ISD::FEXP2 ,MVT::f32, Expand);
 
   setOperationAction(ISD::FLT_ROUNDS_, MVT::i32, Custom);
   

Modified: llvm/trunk/lib/Target/Sparc/SparcISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/SparcISelLowering.cpp?rev=56471&r1=56470&r2=56471&view=diff

==============================================================================
--- llvm/trunk/lib/Target/Sparc/SparcISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/Sparc/SparcISelLowering.cpp Mon Sep 22 16:57:32 2008
@@ -587,16 +587,6 @@
   setOperationAction(ISD::FCOPYSIGN, MVT::f32, Expand);
   setOperationAction(ISD::FPOW , MVT::f64, Expand);
   setOperationAction(ISD::FPOW , MVT::f32, Expand);
-  setOperationAction(ISD::FLOG , MVT::f64, Expand);
-  setOperationAction(ISD::FLOG , MVT::f32, Expand);
-  setOperationAction(ISD::FLOG2, MVT::f64, Expand);
-  setOperationAction(ISD::FLOG2, MVT::f32, Expand);
-  setOperationAction(ISD::FLOG10, MVT::f64, Expand);
-  setOperationAction(ISD::FLOG10, MVT::f32, Expand);
-  setOperationAction(ISD::FEXP , MVT::f64, Expand);
-  setOperationAction(ISD::FEXP , MVT::f32, Expand);
-  setOperationAction(ISD::FEXP2, MVT::f64, Expand);
-  setOperationAction(ISD::FEXP2, MVT::f32, Expand);
 
   setOperationAction(ISD::SHL_PARTS, MVT::i32, Expand);
   setOperationAction(ISD::SRA_PARTS, MVT::i32, Expand);

Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=56471&r1=56470&r2=56471&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Mon Sep 22 16:57:32 2008
@@ -494,20 +494,10 @@
   setOperationAction(ISD::FPOW             , MVT::f64  , Expand);
   setOperationAction(ISD::FPOW             , MVT::f80  , Expand);
 
-  setOperationAction(ISD::FLOG, MVT::f32, Expand);
-  setOperationAction(ISD::FLOG, MVT::f64, Expand);
   setOperationAction(ISD::FLOG, MVT::f80, Expand);
-  setOperationAction(ISD::FLOG2, MVT::f32, Expand);
-  setOperationAction(ISD::FLOG2, MVT::f64, Expand);
   setOperationAction(ISD::FLOG2, MVT::f80, Expand);
-  setOperationAction(ISD::FLOG10, MVT::f32, Expand);
-  setOperationAction(ISD::FLOG10, MVT::f64, Expand);
   setOperationAction(ISD::FLOG10, MVT::f80, Expand);
-  setOperationAction(ISD::FEXP, MVT::f32, Expand);
-  setOperationAction(ISD::FEXP, MVT::f64, Expand);
   setOperationAction(ISD::FEXP, MVT::f80, Expand);
-  setOperationAction(ISD::FEXP2, MVT::f32, Expand);
-  setOperationAction(ISD::FEXP2, MVT::f64, Expand);
   setOperationAction(ISD::FEXP2, MVT::f80, Expand);
 
   // First set operation action for all vector types to expand. Then we




From resistor at mac.com  Mon Sep 22 16:58:58 2008
From: resistor at mac.com (Owen Anderson)
Date: Mon, 22 Sep 2008 21:58:58 -0000
Subject: [llvm-commits] [llvm] r56472 -
	/llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp
Message-ID: <200809222158.m8MLwwtB003795@zion.cs.uiuc.edu>

Author: resistor
Date: Mon Sep 22 16:58:58 2008
New Revision: 56472

URL: http://llvm.org/viewvc/llvm-project?rev=56472&view=rev
Log:
Significant improvements to the logic for merging live intervals.  This code can't
just use LI::MergeValueAsValue, as its behavior in the presence of overlapping ranges
isn't what StrongPHIElimination wants.

Modified:
    llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp

Modified: llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp?rev=56472&r1=56471&r2=56472&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp (original)
+++ llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp Mon Sep 22 16:58:58 2008
@@ -33,6 +33,7 @@
 #include "llvm/ADT/DepthFirstIterator.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/Support/Compiler.h"
+#include "llvm/Support/Debug.h"
 using namespace llvm;
 
 namespace {
@@ -546,6 +547,12 @@
     }
     
     // Add the renaming set for this PHI node to our overall renaming information
+    for (std::map<unsigned, MachineBasicBlock*>::iterator QI = PHIUnion.begin(),
+         QE = PHIUnion.end(); QI != QE; ++QI) {
+      DOUT << "Adding Renaming: " << QI->first << " -> "
+           << P->getOperand(0).getReg() << "\n";
+    }
+    
     RenameSets.insert(std::make_pair(P->getOperand(0).getReg(), PHIUnion));
     
     // Remember which registers are already renamed, so that we don't try to 
@@ -762,10 +769,19 @@
   std::set<unsigned> RegHandled;
   for (SmallVector<std::pair<unsigned, MachineInstr*>, 4>::iterator I =
        InsertedPHIDests.begin(), E = InsertedPHIDests.end(); I != E; ++I) {
-    if (RegHandled.insert(I->first).second &&
-        !LI.getOrCreateInterval(I->first).liveAt(
-                                      LI.getMBBEndIdx(I->second->getParent())))
-      LI.addLiveRangeToEndOfBlock(I->first, I->second);
+    if (RegHandled.insert(I->first).second) {
+      LiveInterval& Int = LI.getOrCreateInterval(I->first);
+      unsigned instrIdx = LI.getInstructionIndex(I->second);
+      if (Int.liveAt(LiveIntervals::getDefIndex(instrIdx)))
+        Int.removeRange(LiveIntervals::getDefIndex(instrIdx),
+                        LI.getMBBEndIdx(I->second->getParent())+1,
+                        true);
+      
+      LiveRange R = LI.addLiveRangeToEndOfBlock(I->first, I->second);
+      R.valno->copy = I->second;
+      R.valno->def =
+                  LiveIntervals::getDefIndex(LI.getInstructionIndex(I->second));
+    }
   }
 }
 
@@ -836,20 +852,39 @@
   LiveInterval& RHS = LI.getOrCreateInterval(secondary);
   
   LI.computeNumbering();
-                     
-  SmallVector<VNInfo*, 4> VNSet (RHS.vni_begin(), RHS.vni_end());
+  
   DenseMap<VNInfo*, VNInfo*> VNMap;
-  for (SmallVector<VNInfo*, 4>::iterator VI = VNSet.begin(),
-       VE = VNSet.end(); VI != VE; ++VI) {
-    VNInfo* NewVN = LHS.getNextValue((*VI)->def,
-                                     (*VI)->copy,
-                                     LI.getVNInfoAllocator());
-    LHS.MergeValueInAsValue(RHS, *VI, NewVN);
-    RHS.removeValNo(*VI);
+  for (LiveInterval::iterator I = RHS.begin(), E = RHS.end(); I != E; ++I) {
+    LiveRange R = *I;
+ 
+    unsigned Start = R.start;
+    unsigned End = R.end;
+    if (LHS.liveAt(Start))
+      LHS.removeRange(Start, End, true);
+    
+    if (const LiveRange* ER = LHS.getLiveRangeContaining(End))
+      End = ER->start;
+    
+    LiveInterval::iterator RI = std::upper_bound(LHS.begin(), LHS.end(), R);
+    if (RI != LHS.end() && RI->start < End)
+      End = RI->start;
+    
+    if (Start != End) {
+      VNInfo* OldVN = R.valno;
+      VNInfo*& NewVN = VNMap[OldVN];
+      if (!NewVN) {
+        NewVN = LHS.getNextValue(OldVN->def,
+                                 OldVN->copy,
+                                 LI.getVNInfoAllocator());
+        NewVN->kills = OldVN->kills;
+      }
+      
+      LiveRange LR (Start, End, NewVN);
+      LHS.addRange(LR);
+    }
   }
   
-  if (RHS.empty())
-    LI.removeInterval(RHS.reg);
+  LI.removeInterval(RHS.reg);
 }
 
 bool StrongPHIElimination::runOnMachineFunction(MachineFunction &Fn) {
@@ -881,6 +916,7 @@
         unsigned reg = OI->first;
         ++OI;
         I->second.erase(reg);
+        DOUT << "Removing Renaming: " << reg << " -> " << I->first << "\n";
       }
     }
   }
@@ -897,6 +933,8 @@
     while (I->second.size()) {
       std::map<unsigned, MachineBasicBlock*>::iterator SI = I->second.begin();
       
+      DOUT << "Renaming: " << SI->first << " -> " << I->first << "\n";
+      
       if (SI->first != I->first) {
         mergeLiveIntervals(I->first, SI->first);
         Fn.getRegInfo().replaceRegWith(SI->first, I->first);




From evan.cheng at apple.com  Mon Sep 22 17:19:05 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Mon, 22 Sep 2008 22:19:05 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r56473 -
	/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
Message-ID: <200809222219.m8MMJ5fp004583@zion.cs.uiuc.edu>

Author: evancheng
Date: Mon Sep 22 17:19:02 2008
New Revision: 56473

URL: http://llvm.org/viewvc/llvm-project?rev=56473&view=rev
Log:
gcc accepts logical operations on floating point values. So llvm-gcc must add the appropriate bitcasts to create legal llvm instructions.

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=56473&r1=56472&r2=56473&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Mon Sep 22 17:19:02 2008
@@ -3284,10 +3284,42 @@
   bool LHSIsSigned = !TYPE_UNSIGNED(TREE_TYPE(TREE_OPERAND(exp, 0)));
   bool RHSIsSigned = !TYPE_UNSIGNED(TREE_TYPE(TREE_OPERAND(exp, 1)));
   bool TyIsSigned  = !TYPE_UNSIGNED(TREE_TYPE(exp));
+
   LHS = CastToAnyType(LHS, LHSIsSigned, Ty, TyIsSigned);
   RHS = CastToAnyType(RHS, RHSIsSigned, Ty, TyIsSigned);
 
-  return Builder.CreateBinOp((Instruction::BinaryOps)Opc, LHS, RHS);
+  // If it's And, Or, or Xor, may sure the oeprands are casted to the right
+  // integer types first.
+  bool isLogicalOp = Opc == Instruction::And || Opc == Instruction::Or ||
+    Opc == Instruction::Xor;
+  const Type *ResTy = Ty;
+  if (isLogicalOp &&
+      (Ty->isFloatingPoint() ||
+       (isa<VectorType>(Ty) && 
+        cast<VectorType>(Ty)->getElementType()->isFloatingPoint()))) {
+    if (Ty == Type::FloatTy)
+      Ty = Type::Int32Ty;
+    else if (Ty == Type::DoubleTy)
+      Ty = Type::Int64Ty;
+    else if (const VectorType *VTy = dyn_cast<VectorType>(Ty)) {
+      unsigned NumElements = VTy->getNumElements();
+      const Type *EltTy = VTy->getElementType();
+      if (EltTy == Type::FloatTy)
+        Ty = VectorType::get(Type::Int32Ty, NumElements);
+      else if (EltTy == Type::DoubleTy)
+        Ty = VectorType::get(Type::Int64Ty, NumElements);
+      else
+        abort();
+    } else
+      abort();
+    LHS = BitCastToType(LHS, Ty);
+    RHS = BitCastToType(RHS, Ty);
+  }
+
+  Value * V = Builder.CreateBinOp((Instruction::BinaryOps)Opc, LHS, RHS);
+  if (ResTy != Ty)
+    V = BitCastToType(V, ResTy);
+  return V;
 }
 
 /// EmitPtrBinOp - Handle binary expressions involving pointers, e.g. "P+4".




From evan.cheng at apple.com  Mon Sep 22 17:19:34 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Mon, 22 Sep 2008 22:19:34 -0000
Subject: [llvm-commits] [llvm] r56474 -
	/llvm/trunk/test/FrontendC/fp-logical.c
Message-ID: <200809222219.m8MMJYPA004605@zion.cs.uiuc.edu>

Author: evancheng
Date: Mon Sep 22 17:19:34 2008
New Revision: 56474

URL: http://llvm.org/viewvc/llvm-project?rev=56474&view=rev
Log:
Test case for fp logical instructions.

Added:
    llvm/trunk/test/FrontendC/fp-logical.c

Added: llvm/trunk/test/FrontendC/fp-logical.c
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendC/fp-logical.c?rev=56474&view=auto

==============================================================================
--- llvm/trunk/test/FrontendC/fp-logical.c (added)
+++ llvm/trunk/test/FrontendC/fp-logical.c Mon Sep 22 17:19:34 2008
@@ -0,0 +1,9 @@
+// RUN: %llvmgcc %s -S -o - | grep bitcast | count 5
+
+typedef float vFloat __attribute__ ((__vector_size__ (16)));
+typedef unsigned int vUInt32 __attribute__ ((__vector_size__ (16)));
+void foo(vFloat *X) {
+  vFloat NoSignBit = (vFloat) ~ (vUInt32) (vFloat) { -0.f, -0.f, -0.f, -0.f };
+  vFloat ExtremeValue = *X & NoSignBit;
+  *X = ExtremeValue;
+}




From evan.cheng at apple.com  Mon Sep 22 17:21:38 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Mon, 22 Sep 2008 22:21:38 -0000
Subject: [llvm-commits] [llvm] r56475 - in /llvm/trunk/lib:
 CodeGen/LiveStackAnalysis.cpp CodeGen/LoopAligner.cpp
 CodeGen/LowerSubregs.cpp CodeGen/MachineModuleInfo.cpp
 CodeGen/PrologEpilogInserter.cpp CodeGen/StackSlotColoring.cpp
 Target/X86/X86FloatingPoint.cpp
Message-ID: <200809222221.m8MMLdI9004696@zion.cs.uiuc.edu>

Author: evancheng
Date: Mon Sep 22 17:21:38 2008
New Revision: 56475

URL: http://llvm.org/viewvc/llvm-project?rev=56475&view=rev
Log:
Instead of setPreservesAll, just mark them preseving machine loop info and machine dominators.

Modified:
    llvm/trunk/lib/CodeGen/LiveStackAnalysis.cpp
    llvm/trunk/lib/CodeGen/LoopAligner.cpp
    llvm/trunk/lib/CodeGen/LowerSubregs.cpp
    llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp
    llvm/trunk/lib/CodeGen/PrologEpilogInserter.cpp
    llvm/trunk/lib/CodeGen/StackSlotColoring.cpp
    llvm/trunk/lib/Target/X86/X86FloatingPoint.cpp

Modified: llvm/trunk/lib/CodeGen/LiveStackAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveStackAnalysis.cpp?rev=56475&r1=56474&r2=56475&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/LiveStackAnalysis.cpp (original)
+++ llvm/trunk/lib/CodeGen/LiveStackAnalysis.cpp Mon Sep 22 17:21:38 2008
@@ -25,7 +25,8 @@
 static RegisterPass<LiveStacks> X("livestacks", "Live Stack Slot Analysis");
 
 void LiveStacks::getAnalysisUsage(AnalysisUsage &AU) const {
-  AU.setPreservesAll();
+  AU.addPreservedID(MachineLoopInfoID);
+  AU.addPreservedID(MachineDominatorsID);
   MachineFunctionPass::getAnalysisUsage(AU);
 }
 

Modified: llvm/trunk/lib/CodeGen/LoopAligner.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LoopAligner.cpp?rev=56475&r1=56474&r2=56475&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/LoopAligner.cpp (original)
+++ llvm/trunk/lib/CodeGen/LoopAligner.cpp Mon Sep 22 17:21:38 2008
@@ -34,7 +34,7 @@
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.addRequired<MachineLoopInfo>();
       AU.addPreserved<MachineLoopInfo>();
-      AU.setPreservesAll();
+      AU.addPreservedID(MachineDominatorsID);
       MachineFunctionPass::getAnalysisUsage(AU);
     }
   };

Modified: llvm/trunk/lib/CodeGen/LowerSubregs.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LowerSubregs.cpp?rev=56475&r1=56474&r2=56475&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/LowerSubregs.cpp (original)
+++ llvm/trunk/lib/CodeGen/LowerSubregs.cpp Mon Sep 22 17:21:38 2008
@@ -31,7 +31,8 @@
     }
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
-      AU.setPreservesAll();
+      AU.addPreservedID(MachineLoopInfoID);
+      AU.addPreservedID(MachineDominatorsID);
       MachineFunctionPass::getAnalysisUsage(AU);
     }
 

Modified: llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp?rev=56475&r1=56474&r2=56475&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp Mon Sep 22 17:21:38 2008
@@ -14,6 +14,7 @@
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineLocation.h"
+#include "llvm/CodeGen/Passes.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetOptions.h"
@@ -2014,7 +2015,8 @@
   DebugLabelFolder() : MachineFunctionPass(&ID) {}
 
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
-    AU.setPreservesAll();
+    AU.addPreservedID(MachineLoopInfoID);
+    AU.addPreservedID(MachineDominatorsID);
     MachineFunctionPass::getAnalysisUsage(AU);
   }
 

Modified: llvm/trunk/lib/CodeGen/PrologEpilogInserter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PrologEpilogInserter.cpp?rev=56475&r1=56474&r2=56475&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/PrologEpilogInserter.cpp (original)
+++ llvm/trunk/lib/CodeGen/PrologEpilogInserter.cpp Mon Sep 22 17:21:38 2008
@@ -42,7 +42,8 @@
     }
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
-      AU.setPreservesAll();
+      AU.addPreservedID(MachineLoopInfoID);
+      AU.addPreservedID(MachineDominatorsID);
       MachineFunctionPass::getAnalysisUsage(AU);
     }
 

Modified: llvm/trunk/lib/CodeGen/StackSlotColoring.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/StackSlotColoring.cpp?rev=56475&r1=56474&r2=56475&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/StackSlotColoring.cpp (original)
+++ llvm/trunk/lib/CodeGen/StackSlotColoring.cpp Mon Sep 22 17:21:38 2008
@@ -66,7 +66,8 @@
     
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.addRequired<LiveStacks>();
-      AU.setPreservesAll();
+      AU.addPreservedID(MachineLoopInfoID);
+      AU.addPreservedID(MachineDominatorsID);
       MachineFunctionPass::getAnalysisUsage(AU);
     }
 

Modified: llvm/trunk/lib/Target/X86/X86FloatingPoint.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86FloatingPoint.cpp?rev=56475&r1=56474&r2=56475&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86FloatingPoint.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86FloatingPoint.cpp Mon Sep 22 17:21:38 2008
@@ -56,7 +56,8 @@
     FPS() : MachineFunctionPass(&ID) {}
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
-      AU.setPreservesAll();
+      AU.addPreservedID(MachineLoopInfoID);
+      AU.addPreservedID(MachineDominatorsID);
       MachineFunctionPass::getAnalysisUsage(AU);
     }
 




From evan.cheng at apple.com  Mon Sep 22 17:26:15 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Mon, 22 Sep 2008 22:26:15 -0000
Subject: [llvm-commits] [llvm] r56476 -
	/llvm/trunk/lib/CodeGen/LiveStackAnalysis.cpp
Message-ID: <200809222226.m8MMQFgL004847@zion.cs.uiuc.edu>

Author: evancheng
Date: Mon Sep 22 17:26:15 2008
New Revision: 56476

URL: http://llvm.org/viewvc/llvm-project?rev=56476&view=rev
Log:
Livestacks really does preserve everything.

Modified:
    llvm/trunk/lib/CodeGen/LiveStackAnalysis.cpp

Modified: llvm/trunk/lib/CodeGen/LiveStackAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveStackAnalysis.cpp?rev=56476&r1=56475&r2=56476&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/LiveStackAnalysis.cpp (original)
+++ llvm/trunk/lib/CodeGen/LiveStackAnalysis.cpp Mon Sep 22 17:26:15 2008
@@ -25,8 +25,7 @@
 static RegisterPass<LiveStacks> X("livestacks", "Live Stack Slot Analysis");
 
 void LiveStacks::getAnalysisUsage(AnalysisUsage &AU) const {
-  AU.addPreservedID(MachineLoopInfoID);
-  AU.addPreservedID(MachineDominatorsID);
+  AU.setPreservesAll();
   MachineFunctionPass::getAnalysisUsage(AU);
 }
 




From dpatel at apple.com  Mon Sep 22 17:32:29 2008
From: dpatel at apple.com (Devang Patel)
Date: Mon, 22 Sep 2008 22:32:29 -0000
Subject: [llvm-commits] [llvm] r56477 - in /llvm/trunk:
 include/llvm/Function.h lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
 lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
 lib/Transforms/IPO/InlineAlways.cpp lib/Transforms/IPO/InlineSimple.cpp
 lib/Transforms/IPO/Inliner.cpp lib/Transforms/Scalar/LoopUnswitch.cpp
 lib/Transforms/Utils/InlineCost.cpp lib/VMCore/AsmWriter.cpp
Message-ID: <200809222232.m8MMWTbv005063@zion.cs.uiuc.edu>

Author: dpatel
Date: Mon Sep 22 17:32:29 2008
New Revision: 56477

URL: http://llvm.org/viewvc/llvm-project?rev=56477&view=rev
Log:
Add hasNote() to check note associated with a function.

Modified:
    llvm/trunk/include/llvm/Function.h
    llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
    llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
    llvm/trunk/lib/Transforms/IPO/InlineAlways.cpp
    llvm/trunk/lib/Transforms/IPO/InlineSimple.cpp
    llvm/trunk/lib/Transforms/IPO/Inliner.cpp
    llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp
    llvm/trunk/lib/Transforms/Utils/InlineCost.cpp
    llvm/trunk/lib/VMCore/AsmWriter.cpp

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

==============================================================================
--- llvm/trunk/include/llvm/Function.h (original)
+++ llvm/trunk/include/llvm/Function.h Mon Sep 22 17:32:29 2008
@@ -159,6 +159,11 @@
   ///
   const FunctionNotes &getNotes() const { return Notes; }
 
+  /// hasNote - Return true if this function has given note.
+  bool hasNote(FunctionNotes N) const {
+    return (!isDeclaration() && (Notes & N));
+  }
+
   /// setNotes - Set notes for this function
   ///
   void setNotes(const FunctionNotes P) { Notes = Notes | P;}

Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp?rev=56477&r1=56476&r2=56477&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp Mon Sep 22 17:32:29 2008
@@ -160,7 +160,7 @@
   SwitchToTextSection(SectionName.c_str());
 
   unsigned FnAlign = OptimizeForSize ? 1 : 4;
-  if (FnAlign == 4 && (F->getNotes() & FN_NOTE_OptimizeForSize))
+  if (F->hasNote(FN_NOTE_OptimizeForSize))
     FnAlign = 1;
   switch (F->getLinkage()) {
   default: assert(0 && "Unknown linkage type!");

Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp?rev=56477&r1=56476&r2=56477&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp Mon Sep 22 17:32:29 2008
@@ -147,7 +147,7 @@
   SwitchToTextSection(getSectionForFunction(*F).c_str(), F);
 
   unsigned FnAlign = OptimizeForSize ? 1 : 4;
-  if (FnAlign == 4 && (F->getNotes() & FN_NOTE_OptimizeForSize))
+  if (F->hasNote(FN_NOTE_OptimizeForSize))
     FnAlign = 1;
   switch (F->getLinkage()) {
   default: assert(0 && "Unsupported linkage type!");

Modified: llvm/trunk/lib/Transforms/IPO/InlineAlways.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/InlineAlways.cpp?rev=56477&r1=56476&r2=56477&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/InlineAlways.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/InlineAlways.cpp Mon Sep 22 17:32:29 2008
@@ -63,7 +63,7 @@
   
   for (Module::iterator I = M.begin(), E = M.end();
        I != E; ++I)
-    if (!I->isDeclaration() && I->getNotes() != FN_NOTE_AlwaysInline)
+    if (!I->isDeclaration() && !I->hasNote(FN_NOTE_AlwaysInline))
       NeverInline.insert(I);
 
   return false;

Modified: llvm/trunk/lib/Transforms/IPO/InlineSimple.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/InlineSimple.cpp?rev=56477&r1=56476&r2=56477&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/InlineSimple.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/InlineSimple.cpp Mon Sep 22 17:32:29 2008
@@ -65,7 +65,7 @@
   
   for (Module::iterator I = M.begin(), E = M.end();
        I != E; ++I)
-    if (!I->isDeclaration() && (I->getNotes() & FN_NOTE_NoInline))
+    if (I->hasNote(FN_NOTE_NoInline))
       NeverInline.insert(I);
 
   // Get llvm.noinline

Modified: llvm/trunk/lib/Transforms/IPO/Inliner.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/Inliner.cpp?rev=56477&r1=56476&r2=56477&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/Inliner.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/Inliner.cpp Mon Sep 22 17:32:29 2008
@@ -141,7 +141,7 @@
         
         int CurrentThreshold = InlineThreshold;
         Function *Fn = CS.getCaller();
-        if (Fn && (Fn->getNotes() & FN_NOTE_OptimizeForSize)
+        if (Fn && Fn->hasNote(FN_NOTE_OptimizeForSize)
             && InlineThreshold != 50) {
           CurrentThreshold = 50;
         }

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

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp Mon Sep 22 17:32:29 2008
@@ -430,7 +430,7 @@
   Function *F = loopHeader->getParent();
 
   // Do not unswitch if the function is optimized for size.
-  if (F->getNotes() & FN_NOTE_OptimizeForSize)
+  if (F->hasNote(FN_NOTE_OptimizeForSize))
     return false;
 
   // Check to see if it would be profitable to unswitch current loop.

Modified: llvm/trunk/lib/Transforms/Utils/InlineCost.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/InlineCost.cpp?rev=56477&r1=56476&r2=56477&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Utils/InlineCost.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/InlineCost.cpp Mon Sep 22 17:32:29 2008
@@ -222,7 +222,7 @@
   if (CalleeFI.NeverInline)
     return 2000000000;
 
-  if (Callee->getNotes() & FN_NOTE_AlwaysInline)
+  if (Callee->hasNote(FN_NOTE_AlwaysInline))
     return -2000000000;
     
   // Add to the inline quality for properties that make the call valuable to

Modified: llvm/trunk/lib/VMCore/AsmWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/AsmWriter.cpp?rev=56477&r1=56476&r2=56477&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/AsmWriter.cpp (original)
+++ llvm/trunk/lib/VMCore/AsmWriter.cpp Mon Sep 22 17:32:29 2008
@@ -1407,28 +1407,37 @@
     Out << " align " << F->getAlignment();
   if (F->hasGC())
     Out << " gc \"" << F->getGC() << '"';
-  FunctionNotes FNotes = F->getNotes();
-  if (FNotes != FN_NOTE_None) {
-    Out << " notes(";
-    bool NeedComma = false;
-    if (FNotes & FN_NOTE_AlwaysInline) {
-      NeedComma = true;
+  if (F->isDeclaration()) {
+    Out << "\n";
+  } else {
+
+    bool insideNotes = false;
+    if (F->hasNote(FN_NOTE_AlwaysInline)) {
+      Out << "notes(";
+      insideNotes = true;
       Out << "inline=always";
     }
-    else if (FNotes & FN_NOTE_NoInline) {
-      NeedComma = true;
+    if (F->hasNote(FN_NOTE_NoInline)) {
+      if (insideNotes) 
+        Out << ",";
+      else {
+        Out << "notes(";
+        insideNotes = true;
+      }
       Out << "inline=never";
     }
-    if (FNotes & FN_NOTE_OptimizeForSize) {
-      if (NeedComma)
+    if (F->hasNote(FN_NOTE_OptimizeForSize)) {
+      if (insideNotes) 
         Out << ",";
+      else {
+        Out << "notes(";
+        insideNotes = true;
+      }
       Out << "opt_size";
     }
-    Out << ")";
-  }
-  if (F->isDeclaration()) {
-    Out << "\n";
-  } else {
+    if (insideNotes)
+      Out << ")";
+    
     Out << " {";
 
     // Output all of its basic blocks... for the function




From dalej at apple.com  Mon Sep 22 17:33:34 2008
From: dalej at apple.com (Dale Johannesen)
Date: Mon, 22 Sep 2008 22:33:34 -0000
Subject: [llvm-commits] [llvm] r56478 -
	/llvm/trunk/include/llvm/CompilerDriver/Plugin.h
Message-ID: <200809222233.m8MMXZLP005109@zion.cs.uiuc.edu>

Author: johannes
Date: Mon Sep 22 17:33:34 2008
New Revision: 56478

URL: http://llvm.org/viewvc/llvm-project?rev=56478&view=rev
Log:
Remove a compiler warning.


Modified:
    llvm/trunk/include/llvm/CompilerDriver/Plugin.h

Modified: llvm/trunk/include/llvm/CompilerDriver/Plugin.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CompilerDriver/Plugin.h?rev=56478&r1=56477&r2=56478&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CompilerDriver/Plugin.h (original)
+++ llvm/trunk/include/llvm/CompilerDriver/Plugin.h Mon Sep 22 17:33:34 2008
@@ -31,6 +31,9 @@
     /// PopulateCompilationGraph - The auto-generated function that
     /// populates the compilation graph with nodes and edges.
     virtual void PopulateCompilationGraph(CompilationGraph&) const = 0;
+
+    /// Needed to avoid a compiler warning.
+    virtual ~BasePlugin() {};
   };
 
   typedef llvm::Registry<BasePlugin> PluginRegistry;




From gohman at apple.com  Mon Sep 22 17:40:09 2008
From: gohman at apple.com (Dan Gohman)
Date: Mon, 22 Sep 2008 22:40:09 -0000
Subject: [llvm-commits] [llvm] r56479 - in
 /llvm/trunk/lib/CodeGen/SelectionDAG: LegalizeDAG.cpp
 LegalizeIntegerTypes.cpp
Message-ID: <200809222240.m8MMeAuW005354@zion.cs.uiuc.edu>

Author: djg
Date: Mon Sep 22 17:40:08 2008
New Revision: 56479

URL: http://llvm.org/viewvc/llvm-project?rev=56479&view=rev
Log:
Fix the alignment of loads from constant pool entries when the
load address has an offset from the base of the constant pool
entry.

Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Mon Sep 22 17:40:08 2008
@@ -5438,6 +5438,7 @@
     SDValue CPIdx = DAG.getConstantPool(FudgeFactor, TLI.getPointerTy());
     unsigned Alignment = 1 << cast<ConstantPoolSDNode>(CPIdx)->getAlignment();
     CPIdx = DAG.getNode(ISD::ADD, TLI.getPointerTy(), CPIdx, CstOffset);
+    Alignment = std::min(Alignment, 4u);
     SDValue FudgeInReg;
     if (DestTy == MVT::f32)
       FudgeInReg = DAG.getLoad(MVT::f32, DAG.getEntryNode(), CPIdx,
@@ -5589,6 +5590,7 @@
   SDValue CPIdx = DAG.getConstantPool(FudgeFactor, TLI.getPointerTy());
   unsigned Alignment = 1 << cast<ConstantPoolSDNode>(CPIdx)->getAlignment();
   CPIdx = DAG.getNode(ISD::ADD, TLI.getPointerTy(), CPIdx, CstOffset);
+  Alignment = std::min(Alignment, 4u);
   SDValue FudgeInReg;
   if (DestVT == MVT::f32)
     FudgeInReg = DAG.getLoad(MVT::f32, DAG.getEntryNode(), CPIdx,

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Mon Sep 22 17:40:08 2008
@@ -2042,12 +2042,16 @@
     if (TLI.isBigEndian()) std::swap(Zero, Four);
     SDValue Offset = DAG.getNode(ISD::SELECT, Zero.getValueType(), SignSet,
                                    Zero, Four);
+    unsigned Alignment =
+      1 << cast<ConstantPoolSDNode>(FudgePtr)->getAlignment();
     FudgePtr = DAG.getNode(ISD::ADD, TLI.getPointerTy(), FudgePtr, Offset);
+    Alignment = std::min(Alignment, 4u);
 
     // Load the value out, extending it from f32 to the destination float type.
     // FIXME: Avoid the extend by constructing the right constant pool?
     SDValue Fudge = DAG.getExtLoad(ISD::EXTLOAD, DstVT, DAG.getEntryNode(),
-                                     FudgePtr, NULL, 0, MVT::f32);
+                                   FudgePtr, NULL, 0, MVT::f32,
+                                   false, Alignment);
     return DAG.getNode(ISD::FADD, DstVT, SignedConv, Fudge);
   }
 




From dpatel at apple.com  Mon Sep 22 17:41:22 2008
From: dpatel at apple.com (Devang Patel)
Date: Mon, 22 Sep 2008 22:41:22 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r56480 -
	/llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp
Message-ID: <200809222241.m8MMfM3I005398@zion.cs.uiuc.edu>

Author: dpatel
Date: Mon Sep 22 17:41:22 2008
New Revision: 56480

URL: http://llvm.org/viewvc/llvm-project?rev=56480&view=rev
Log:
Use hasNote() instead of getNotes().

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-backend.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=56480&r1=56479&r2=56480&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Mon Sep 22 17:41:22 2008
@@ -386,7 +386,7 @@
   // marked as always_inline.
   for (Module::iterator I = TheModule->begin(), E = TheModule->end();
        I != E; ++I)
-    if (!I->isDeclaration() && I->getNotes() == FN_NOTE_AlwaysInline) {
+    if (I->hasNote(FN_NOTE_AlwaysInline)) {
       NeedAlwaysInliner = true;
       break;
     }




From dalej at apple.com  Mon Sep 22 18:28:20 2008
From: dalej at apple.com (Dale Johannesen)
Date: Mon, 22 Sep 2008 23:28:20 -0000
Subject: [llvm-commits] [llvm] r56481 -
	/llvm/trunk/include/llvm/CompilerDriver/Plugin.h
Message-ID: <200809222328.m8MNSK46006830@zion.cs.uiuc.edu>

Author: johannes
Date: Mon Sep 22 18:28:18 2008
New Revision: 56481

URL: http://llvm.org/viewvc/llvm-project?rev=56481&view=rev
Log:
Remove silly semicolon.


Modified:
    llvm/trunk/include/llvm/CompilerDriver/Plugin.h

Modified: llvm/trunk/include/llvm/CompilerDriver/Plugin.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CompilerDriver/Plugin.h?rev=56481&r1=56480&r2=56481&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CompilerDriver/Plugin.h (original)
+++ llvm/trunk/include/llvm/CompilerDriver/Plugin.h Mon Sep 22 18:28:18 2008
@@ -33,7 +33,7 @@
     virtual void PopulateCompilationGraph(CompilationGraph&) const = 0;
 
     /// Needed to avoid a compiler warning.
-    virtual ~BasePlugin() {};
+    virtual ~BasePlugin() {}
   };
 
   typedef llvm::Registry<BasePlugin> PluginRegistry;




From evan.cheng at apple.com  Mon Sep 22 18:57:38 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Mon, 22 Sep 2008 23:57:38 -0000
Subject: [llvm-commits] [llvm] r56483 - in /llvm/trunk:
 lib/Target/X86/X86ISelLowering.cpp test/CodeGen/X86/inline-asm.ll
Message-ID: <200809222357.m8MNvcuk007841@zion.cs.uiuc.edu>

Author: evancheng
Date: Mon Sep 22 18:57:37 2008
New Revision: 56483

URL: http://llvm.org/viewvc/llvm-project?rev=56483&view=rev
Log:
Support x86 specific inline asm modifier 'J'.

Modified:
    llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
    llvm/trunk/test/CodeGen/X86/inline-asm.ll

Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=56483&r1=56482&r2=56483&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Mon Sep 22 18:57:37 2008
@@ -7080,6 +7080,14 @@
       }
     }
     return;
+  case 'J':
+    if (ConstantSDNode *C = dyn_cast<ConstantSDNode>(Op)) {
+      if (C->getZExtValue() <= 63) {
+        Result = DAG.getTargetConstant(C->getZExtValue(), Op.getValueType());
+        break;
+      }
+    }
+    return;
   case 'N':
     if (ConstantSDNode *C = dyn_cast<ConstantSDNode>(Op)) {
       if (C->getZExtValue() <= 255) {

Modified: llvm/trunk/test/CodeGen/X86/inline-asm.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/inline-asm.ll?rev=56483&r1=56482&r2=56483&view=diff

==============================================================================
--- llvm/trunk/test/CodeGen/X86/inline-asm.ll (original)
+++ llvm/trunk/test/CodeGen/X86/inline-asm.ll Mon Sep 22 18:57:37 2008
@@ -1,21 +1,25 @@
 ; RUN: llvm-as < %s | llc -march=x86
 
-define i32 @test1() {
+define i32 @test1() nounwind {
 	; Dest is AX, dest type = i32.
         %tmp4 = call i32 asm sideeffect "FROB $0", "={ax}"()
         ret i32 %tmp4
 }
 
-define void @test2(i32 %V) {
+define void @test2(i32 %V) nounwind {
 	; input is AX, in type = i32.
         call void asm sideeffect "FROB $0", "{ax}"(i32 %V)
         ret void
 }
 
-define void @test3() {
+define void @test3() nounwind {
         ; FP constant as a memory operand.
         tail call void asm sideeffect "frob $0", "m"( float 0x41E0000000000000)
         ret void
 }
 
-
+define void @test4() nounwind {
+       ; J means a constant in range 0 to 63.
+       tail call void asm sideeffect "bork $0", "J"(i32 37) nounwind
+       ret void
+}




From gohman at apple.com  Mon Sep 22 19:08:47 2008
From: gohman at apple.com (Dan Gohman)
Date: Mon, 22 Sep 2008 17:08:47 -0700
Subject: [llvm-commits] [llvm] r55457 - in /llvm/trunk:
	include/llvm/CodeGen/SelectionDAGNodes.h	include/llvm/Target/TargetLowering.h
	lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
	lib/CodeGen/SelectionDAG/SelectionDAG.cpp
	lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp	lib/Target/TargetSelectionDAG.td
	lib/Target/X86/X86ISelLowering.cpp	lib/Target/X86/X86Instr64bit.td
	lib/Target/X86/X86InstrInfo.td
In-Reply-To: <200808291719.00403.baldrick@free.fr>
References: <200808280244.m7S2ioDI016151@zion.cs.uiuc.edu>
	<764F54DD-8DFF-40E2-821D-1308B8B3606E@apple.com>
	<AE3860E4-F22B-4251-89C6-F8D79FD72C47@apple.com>
	<200808291719.00403.baldrick@free.fr>
Message-ID: <5FEEA9C9-F710-42AE-9571-CEEF6B79A715@apple.com>

On Aug 29, 2008, at 8:19 AM, Duncan Sands wrote:

>> Not necessarily. The purpose of MemoryVT is to provide the type
>> when it differs from what the load or store would normally have,
>> in the case of an extending load or truncating store.
>
> This occurs exactly when the type being loaded is not legal for
> the target.

This isn't the only case where MemoryVT is used. We also use
it when folding sext/zext/trunc into loads and stores, as
an optimization on targets that can do such operations natively.

>  For example, suppose in the IR you load an i8, but
> codegen on a target for which i8 is not legal (but i32 is).  This
> gets turned into an extending load with MemoryVT equal to i8 and
> result type equal to i32.  It seems quite similar to the situation
> of doing an atomic operation on an i8 in the IR: it would get
> legalized into an extending operation with MemoryVT equal to i8
> and (assuming the operation returned an i8 value) returning an i32.


I agree with this though.

It seems to me that MemoryVT is very appropriate for these AMOs.
And, it would be a lot cleaner than code like this:

            N->getOpcode() == ISD::ATOMIC_CMP_SWAP_8   ||
            N->getOpcode() == ISD::ATOMIC_SWAP_8       ||
            N->getOpcode() == ISD::ATOMIC_LOAD_ADD_8   ||
            N->getOpcode() == ISD::ATOMIC_LOAD_SUB_8   ||
            N->getOpcode() == ISD::ATOMIC_LOAD_AND_8   ||
            N->getOpcode() == ISD::ATOMIC_LOAD_OR_8    ||
            N->getOpcode() == ISD::ATOMIC_LOAD_XOR_8   ||
            N->getOpcode() == ISD::ATOMIC_LOAD_NAND_8  ||
            N->getOpcode() == ISD::ATOMIC_LOAD_MIN_8   ||
            N->getOpcode() == ISD::ATOMIC_LOAD_MAX_8   ||
            N->getOpcode() == ISD::ATOMIC_LOAD_UMIN_8  ||
            N->getOpcode() == ISD::ATOMIC_LOAD_UMAX_8  ||

            N->getOpcode() == ISD::ATOMIC_CMP_SWAP_16  ||
            N->getOpcode() == ISD::ATOMIC_SWAP_16      ||
            N->getOpcode() == ISD::ATOMIC_LOAD_ADD_16  ||
            N->getOpcode() == ISD::ATOMIC_LOAD_SUB_16  ||
            N->getOpcode() == ISD::ATOMIC_LOAD_AND_16  ||
            N->getOpcode() == ISD::ATOMIC_LOAD_OR_16   ||
            N->getOpcode() == ISD::ATOMIC_LOAD_XOR_16  ||
            N->getOpcode() == ISD::ATOMIC_LOAD_NAND_16 ||
            N->getOpcode() == ISD::ATOMIC_LOAD_MIN_16  ||
            N->getOpcode() == ISD::ATOMIC_LOAD_MAX_16  ||
            N->getOpcode() == ISD::ATOMIC_LOAD_UMIN_16 ||
            N->getOpcode() == ISD::ATOMIC_LOAD_UMAX_16 ||

            N->getOpcode() == ISD::ATOMIC_CMP_SWAP_32  ||
            N->getOpcode() == ISD::ATOMIC_SWAP_32      ||
            N->getOpcode() == ISD::ATOMIC_LOAD_ADD_32  ||
            N->getOpcode() == ISD::ATOMIC_LOAD_SUB_32  ||
            N->getOpcode() == ISD::ATOMIC_LOAD_AND_32  ||
            N->getOpcode() == ISD::ATOMIC_LOAD_OR_32   ||
            N->getOpcode() == ISD::ATOMIC_LOAD_XOR_32  ||
            N->getOpcode() == ISD::ATOMIC_LOAD_NAND_32 ||
            N->getOpcode() == ISD::ATOMIC_LOAD_MIN_32  ||
            N->getOpcode() == ISD::ATOMIC_LOAD_MAX_32  ||
            N->getOpcode() == ISD::ATOMIC_LOAD_UMIN_32 ||
            N->getOpcode() == ISD::ATOMIC_LOAD_UMAX_32 ||

            N->getOpcode() == ISD::ATOMIC_CMP_SWAP_64  ||
            N->getOpcode() == ISD::ATOMIC_SWAP_64      ||
            N->getOpcode() == ISD::ATOMIC_LOAD_ADD_64  ||
            N->getOpcode() == ISD::ATOMIC_LOAD_SUB_64  ||
            N->getOpcode() == ISD::ATOMIC_LOAD_AND_64  ||
            N->getOpcode() == ISD::ATOMIC_LOAD_OR_64   ||
            N->getOpcode() == ISD::ATOMIC_LOAD_XOR_64  ||
            N->getOpcode() == ISD::ATOMIC_LOAD_NAND_64 ||
            N->getOpcode() == ISD::ATOMIC_LOAD_MIN_64  ||
            N->getOpcode() == ISD::ATOMIC_LOAD_MAX_64  ||
            N->getOpcode() == ISD::ATOMIC_LOAD_UMIN_64 ||
            N->getOpcode() == ISD::ATOMIC_LOAD_UMAX_64;

Dale, what do you think?

Dan



From dalej at apple.com  Mon Sep 22 19:22:10 2008
From: dalej at apple.com (Dale Johannesen)
Date: Mon, 22 Sep 2008 17:22:10 -0700
Subject: [llvm-commits] [llvm] r55457 - in /llvm/trunk:
	include/llvm/CodeGen/SelectionDAGNodes.h	include/llvm/Target/TargetLowering.h
	lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
	lib/CodeGen/SelectionDAG/SelectionDAG.cpp
	lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp	lib/Target/TargetSelectionDAG.td
	lib/Target/X86/X86ISelLowering.cpp	lib/Target/X86/X86Instr64bit.td
	lib/Target/X86/X86InstrInfo.td
In-Reply-To: <5FEEA9C9-F710-42AE-9571-CEEF6B79A715@apple.com>
References: <200808280244.m7S2ioDI016151@zion.cs.uiuc.edu>
	<764F54DD-8DFF-40E2-821D-1308B8B3606E@apple.com>
	<AE3860E4-F22B-4251-89C6-F8D79FD72C47@apple.com>
	<200808291719.00403.baldrick@free.fr>
	<5FEEA9C9-F710-42AE-9571-CEEF6B79A715@apple.com>
Message-ID: <A0F17B47-717B-4F57-A49C-A8EA58011717@apple.com>


On Sep 22, 2008, at 5:08 PMPDT, Dan Gohman wrote:

> On Aug 29, 2008, at 8:19 AM, Duncan Sands wrote:
>
>>> Not necessarily. The purpose of MemoryVT is to provide the type
>>> when it differs from what the load or store would normally have,
>>> in the case of an extending load or truncating store.
>>
>> This occurs exactly when the type being loaded is not legal for
>> the target.
>
> This isn't the only case where MemoryVT is used. We also use
> it when folding sext/zext/trunc into loads and stores, as
> an optimization on targets that can do such operations natively.
>
>> For example, suppose in the IR you load an i8, but
>> codegen on a target for which i8 is not legal (but i32 is).  This
>> gets turned into an extending load with MemoryVT equal to i8 and
>> result type equal to i32.  It seems quite similar to the situation
>> of doing an atomic operation on an i8 in the IR: it would get
>> legalized into an extending operation with MemoryVT equal to i8
>> and (assuming the operation returned an i8 value) returning an i32.
>
>
> I agree with this though.

It would be reasonable, and I may get around to it sometime.

> It seems to me that MemoryVT is very appropriate for these AMOs.
> And, it would be a lot cleaner than code like this:
>
>            N->getOpcode() == ISD::ATOMIC_CMP_SWAP_8   ||
>            N->getOpcode() == ISD::ATOMIC_SWAP_8       ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_ADD_8   ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_SUB_8   ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_AND_8   ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_OR_8    ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_XOR_8   ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_NAND_8  ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_MIN_8   ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_MAX_8   ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_UMIN_8  ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_UMAX_8  ||
>
>            N->getOpcode() == ISD::ATOMIC_CMP_SWAP_16  ||
>            N->getOpcode() == ISD::ATOMIC_SWAP_16      ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_ADD_16  ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_SUB_16  ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_AND_16  ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_OR_16   ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_XOR_16  ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_NAND_16 ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_MIN_16  ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_MAX_16  ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_UMIN_16 ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_UMAX_16 ||
>
>            N->getOpcode() == ISD::ATOMIC_CMP_SWAP_32  ||
>            N->getOpcode() == ISD::ATOMIC_SWAP_32      ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_ADD_32  ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_SUB_32  ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_AND_32  ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_OR_32   ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_XOR_32  ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_NAND_32 ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_MIN_32  ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_MAX_32  ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_UMIN_32 ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_UMAX_32 ||
>
>            N->getOpcode() == ISD::ATOMIC_CMP_SWAP_64  ||
>            N->getOpcode() == ISD::ATOMIC_SWAP_64      ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_ADD_64  ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_SUB_64  ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_AND_64  ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_OR_64   ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_XOR_64  ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_NAND_64 ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_MIN_64  ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_MAX_64  ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_UMIN_64 ||
>            N->getOpcode() == ISD::ATOMIC_LOAD_UMAX_64;
>
> Dale, what do you think?
>
> Dan
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From resistor at mac.com  Mon Sep 22 23:37:11 2008
From: resistor at mac.com (Owen Anderson)
Date: Tue, 23 Sep 2008 04:37:11 -0000
Subject: [llvm-commits] [llvm] r56485 -
	/llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp
Message-ID: <200809230437.m8N4bBxk016577@zion.cs.uiuc.edu>

Author: resistor
Date: Mon Sep 22 23:37:10 2008
New Revision: 56485

URL: http://llvm.org/viewvc/llvm-project?rev=56485&view=rev
Log:
Add initial support for inserting last minute copies.

Modified:
    llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp

Modified: llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp?rev=56485&r1=56484&r2=56485&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp (original)
+++ llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp Mon Sep 22 23:37:10 2008
@@ -142,7 +142,7 @@
     void ScheduleCopies(MachineBasicBlock* MBB, std::set<unsigned>& pushed);
     void InsertCopies(MachineDomTreeNode* MBB,
                       SmallPtrSet<MachineBasicBlock*, 16>& v);
-    void mergeLiveIntervals(unsigned primary, unsigned secondary);
+    bool mergeLiveIntervals(unsigned primary, unsigned secondary);
   };
 }
 
@@ -844,7 +844,7 @@
     Stacks[*I].pop_back();
 }
 
-void StrongPHIElimination::mergeLiveIntervals(unsigned primary,
+bool StrongPHIElimination::mergeLiveIntervals(unsigned primary,
                                               unsigned secondary) {
   
   LiveIntervals& LI = getAnalysis<LiveIntervals>();
@@ -859,32 +859,35 @@
  
     unsigned Start = R.start;
     unsigned End = R.end;
-    if (LHS.liveAt(Start))
-      LHS.removeRange(Start, End, true);
+    if (LHS.getLiveRangeContaining(Start))
+      return false;
     
-    if (const LiveRange* ER = LHS.getLiveRangeContaining(End))
-      End = ER->start;
+    if (LHS.getLiveRangeContaining(End))
+      return false;
     
     LiveInterval::iterator RI = std::upper_bound(LHS.begin(), LHS.end(), R);
     if (RI != LHS.end() && RI->start < End)
-      End = RI->start;
-    
-    if (Start != End) {
-      VNInfo* OldVN = R.valno;
-      VNInfo*& NewVN = VNMap[OldVN];
-      if (!NewVN) {
-        NewVN = LHS.getNextValue(OldVN->def,
-                                 OldVN->copy,
-                                 LI.getVNInfoAllocator());
-        NewVN->kills = OldVN->kills;
-      }
-      
-      LiveRange LR (Start, End, NewVN);
-      LHS.addRange(LR);
+      return false;
+  }
+  
+  for (LiveInterval::iterator I = RHS.begin(), E = RHS.end(); I != E; ++I) {
+    LiveRange R = *I;
+    VNInfo* OldVN = R.valno;
+    VNInfo*& NewVN = VNMap[OldVN];
+    if (!NewVN) {
+      NewVN = LHS.getNextValue(OldVN->def,
+                               OldVN->copy,
+                               LI.getVNInfoAllocator());
+      NewVN->kills = OldVN->kills;
     }
+    
+    LiveRange LR (R.start, R.end, NewVN);
+    LHS.addRange(LR);
   }
   
   LI.removeInterval(RHS.reg);
+  
+  return true;
 }
 
 bool StrongPHIElimination::runOnMachineFunction(MachineFunction &Fn) {
@@ -936,21 +939,43 @@
       DOUT << "Renaming: " << SI->first << " -> " << I->first << "\n";
       
       if (SI->first != I->first) {
-        mergeLiveIntervals(I->first, SI->first);
-        Fn.getRegInfo().replaceRegWith(SI->first, I->first);
+        if (mergeLiveIntervals(I->first, SI->first)) {
+          Fn.getRegInfo().replaceRegWith(SI->first, I->first);
       
-        if (RenameSets.count(SI->first)) {
-          I->second.insert(RenameSets[SI->first].begin(),
-                           RenameSets[SI->first].end());
-          RenameSets.erase(SI->first);
+          if (RenameSets.count(SI->first)) {
+            I->second.insert(RenameSets[SI->first].begin(),
+                             RenameSets[SI->first].end());
+            RenameSets.erase(SI->first);
+          }
+        } else {
+          // Insert a last-minute copy if a conflict was detected.
+          const TargetInstrInfo *TII = Fn.getTarget().getInstrInfo();
+          const TargetRegisterClass *RC = Fn.getRegInfo().getRegClass(I->first);
+          TII->copyRegToReg(*SI->second, SI->second->getFirstTerminator(),
+                            I->first, SI->first, RC, RC);
+          
+          LI.computeNumbering();
+          
+          LiveInterval& Int = LI.getOrCreateInterval(I->first);
+          unsigned instrIdx =
+                     LI.getInstructionIndex(--SI->second->getFirstTerminator());
+          if (Int.liveAt(LiveIntervals::getDefIndex(instrIdx)))
+            Int.removeRange(LiveIntervals::getDefIndex(instrIdx),
+                            LI.getMBBEndIdx(SI->second)+1, true);
+
+          LiveRange R = LI.addLiveRangeToEndOfBlock(I->first,
+                                            --SI->second->getFirstTerminator());
+          R.valno->copy = --SI->second->getFirstTerminator();
+          R.valno->def = LiveIntervals::getDefIndex(instrIdx);
+          
+          DOUT << "Renaming failed: " << SI->first << " -> "
+               << I->first << "\n";
         }
       }
       
       I->second.erase(SI->first);
     }
   
-  // FIXME: Insert last-minute copies
-  
   // Remove PHIs
   std::vector<MachineInstr*> phis;
   for (MachineFunction::iterator I = Fn.begin(), E = Fn.end(); I != E; ++I) {




From baldrick at free.fr  Tue Sep 23 02:48:56 2008
From: baldrick at free.fr (Duncan Sands)
Date: Tue, 23 Sep 2008 09:48:56 +0200
Subject: [llvm-commits] [llvm-gcc-4.2] r55650 -
	/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
In-Reply-To: <295D58A1-2BF8-4B8B-8E3C-C4660992F2F4@apple.com>
References: <200809022118.m82LIJeg019335@zion.cs.uiuc.edu>
	<2ABEF97F-1856-4090-B2C8-BE9EC57B2A0E@apple.com>
	<295D58A1-2BF8-4B8B-8E3C-C4660992F2F4@apple.com>
Message-ID: <200809230948.57165.baldrick@free.fr>

> Implementing 64-bit atomic intrinsics on ppc32 makes no sense, because  
> there is no hardware 64-bit atomic operation; these cannot work.

Could some of them be implemented using try-again-if-it-didn't-work style code?

Ciao,

Duncan.


From baldrick at free.fr  Tue Sep 23 02:55:32 2008
From: baldrick at free.fr (Duncan Sands)
Date: Tue, 23 Sep 2008 09:55:32 +0200
Subject: [llvm-commits] [llvm-gcc-4.2] r56473 -
	/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
In-Reply-To: <200809222219.m8MMJ5fp004583@zion.cs.uiuc.edu>
References: <200809222219.m8MMJ5fp004583@zion.cs.uiuc.edu>
Message-ID: <200809230955.32613.baldrick@free.fr>

Hi Evan,

> -  return Builder.CreateBinOp((Instruction::BinaryOps)Opc, LHS, RHS);
> +  // If it's And, Or, or Xor, may sure the oeprands are casted to the right

may sure -> make sure
oeprands -> operands
casted -> cast

> +    if (Ty == Type::FloatTy)
> +      Ty = Type::Int32Ty;
> +    else if (Ty == Type::DoubleTy)
> +      Ty = Type::Int64Ty;

How about IntegerType::get(Ty->getPrimitiveSizeInBits())
instead of these?  This also works with 128 bit floating
point, and 80 bit once legalize types is on :)

> +      if (EltTy == Type::FloatTy)
> +        Ty = VectorType::get(Type::Int32Ty, NumElements);
> +      else if (EltTy == Type::DoubleTy)
> +        Ty = VectorType::get(Type::Int64Ty, NumElements);
> +      else
> +        abort();

Likewise.

Ciao,

Duncan.


From baldrick at free.fr  Tue Sep 23 03:05:32 2008
From: baldrick at free.fr (Duncan Sands)
Date: Tue, 23 Sep 2008 10:05:32 +0200
Subject: [llvm-commits] [llvm-gcc-4.2] r55650 -
	/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
In-Reply-To: <295D58A1-2BF8-4B8B-8E3C-C4660992F2F4@apple.com>
References: <200809022118.m82LIJeg019335@zion.cs.uiuc.edu>
	<2ABEF97F-1856-4090-B2C8-BE9EC57B2A0E@apple.com>
	<295D58A1-2BF8-4B8B-8E3C-C4660992F2F4@apple.com>
Message-ID: <200809231005.32498.baldrick@free.fr>

> > llvm-convert.cpp is target independent code.
> 
> No, it's not; there's lots of #ifdef TARGET_LLVM's in here.  (If  
> you're saying it's not target-dependent because it's using some  
> abstraction rather than TARGET_POWERPC, I strongly disagree.)

Well, there aren't that many!  Most of them are for sync things
and were introduced by you ;)  Otherwise there is this one:

 49950  evancheng #if defined(TARGET_ALPHA) || defined(TARGET_386) || defined(TARGET_POWERPC)

And that's it really.

Teasing aside, I would much rather that LLVM intrinsics were
always output, and that they get turned into library calls by
the LLVM back-end if not supported on the platform.  That
makes things uniform for all front-ends, rather than each one
having to know which intrinsics are supported and which not.

Ciao,

Duncan.


From baldrick at free.fr  Tue Sep 23 03:27:53 2008
From: baldrick at free.fr (Duncan Sands)
Date: Tue, 23 Sep 2008 10:27:53 +0200
Subject: [llvm-commits] r55638 - /llvm/trunk/include/llvm/Function.h
Message-ID: <200809231027.53858.baldrick@free.fr>

> > I guess that I don't understand what you're saying here.  Are you
> > saying that there should be two "namespaces", one for function
> > attributes and one for arg/retval attributes?
>
> Yes. parameter attributes are associated with an arguments. Function
> note is associated with function definition.
>
> > Are you saying that attributes are distinct from notes because
> > attributes are applied to call sites also?
>
> yes, some of the attributes are (e.g. signext) are used in call
> instruction also. Function notes are never specified at call site.

I think specifying noinline or alwaysinline at a call site makes
sense.  It means: don't inline (or always inline) this callsite!
Thus you could have a function that is not itself marked noinline,
but a few special callsites that are marked noinline.  I see no
reason not to make these function attributes.

I thought opt-size was different, and meant: if F is marked opt-size,
then don't inline things into it if that will make F fat.  I peeked
inside the inliner and saw that it seems to mean: only inline F into
callers of F if it won't make them (and not F) fat.  So in fact it is
being used by the inliner exactly like a function attribute
and as such would also make sense to be able to place it on callsites
(meaning: only inline this callsite if it won't fatten it too much).
However other places that use the opt-size note are trying not to make
F itself fat, not callers of F.  So I suspect this was a thinko in the
inliner more than anything else, and that the logic should be: when
inlining into F, only do it if it won't make F fat.

Ciao,

Duncan.


From matthijs at stdin.nl  Tue Sep 23 03:54:42 2008
From: matthijs at stdin.nl (Matthijs Kooijman)
Date: Tue, 23 Sep 2008 08:54:42 -0000
Subject: [llvm-commits] [llvm] r56486 - /llvm/trunk/lib/Target/Mips/Makefile
Message-ID: <200809230854.m8N8shCe001148@zion.cs.uiuc.edu>

Author: matthijs
Date: Tue Sep 23 03:54:41 2008
New Revision: 56486

URL: http://llvm.org/viewvc/llvm-project?rev=56486&view=rev
Log:
Fix indendation.

Modified:
    llvm/trunk/lib/Target/Mips/Makefile

Modified: llvm/trunk/lib/Target/Mips/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/Makefile?rev=56486&r1=56485&r2=56486&view=diff

==============================================================================
--- llvm/trunk/lib/Target/Mips/Makefile (original)
+++ llvm/trunk/lib/Target/Mips/Makefile Tue Sep 23 03:54:41 2008
@@ -12,10 +12,10 @@
 
 # Make sure that tblgen is run, first thing.
 BUILT_SOURCES = MipsGenRegisterInfo.h.inc MipsGenRegisterNames.inc \
-								MipsGenRegisterInfo.inc MipsGenInstrNames.inc \
-								MipsGenInstrInfo.inc MipsGenAsmWriter.inc \
-								MipsGenDAGISel.inc MipsGenCallingConv.inc \
-								MipsGenSubtarget.inc
+                MipsGenRegisterInfo.inc MipsGenInstrNames.inc \
+                MipsGenInstrInfo.inc MipsGenAsmWriter.inc \
+                MipsGenDAGISel.inc MipsGenCallingConv.inc \
+                MipsGenSubtarget.inc
 
 include $(LEVEL)/Makefile.common
 




From baldrick at free.fr  Tue Sep 23 07:47:43 2008
From: baldrick at free.fr (Duncan Sands)
Date: Tue, 23 Sep 2008 12:47:43 -0000
Subject: [llvm-commits] [llvm] r56487 - in /llvm/trunk: docs/Passes.html
 lib/Analysis/CFGPrinter.cpp lib/Analysis/IPA/FindUsedTypes.cpp
 lib/VMCore/AsmWriter.cpp test/Analysis/CallGraph/2008-09-09-DirectCall.ll
 test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll
 test/Other/2002-01-31-CallGraph.ll test/Other/2007-06-05-PassID.ll
 test/Transforms/BlockPlacement/basictest.ll
 test/Transforms/Inline/basictest.ll
 test/Transforms/PruneEH/2008-09-05-CGUpdate.ll
 tools/opt/AnalysisWrappers.cpp tools/opt/GraphPrinters.cpp
 tools/opt/PrintSCC.cpp
Message-ID: <200809231247.m8NCliWf009008@zion.cs.uiuc.edu>

Author: baldrick
Date: Tue Sep 23 07:47:39 2008
New Revision: 56487

URL: http://llvm.org/viewvc/llvm-project?rev=56487&view=rev
Log:
Rationalize the names of passes that print information:
    -callgraph => print-callgraph
    -callscc   => print-callgraph-sccs
    -cfgscc    => print-cfg-sccs
    -externalfnconstants => print-externalfnconstants
    -print               => print-function
    -print-alias-sets (no change)
    -print-callgraph     => dot-callgraph
    -print-cfg           => dot-cfg
    -print-cfg-only      => dot-cfg-only
    -print-dom-info (no change)
    -printm              => print-module
    -printusedtypes      => print-used-types

Modified:
    llvm/trunk/docs/Passes.html
    llvm/trunk/lib/Analysis/CFGPrinter.cpp
    llvm/trunk/lib/Analysis/IPA/FindUsedTypes.cpp
    llvm/trunk/lib/VMCore/AsmWriter.cpp
    llvm/trunk/test/Analysis/CallGraph/2008-09-09-DirectCall.ll
    llvm/trunk/test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll
    llvm/trunk/test/Other/2002-01-31-CallGraph.ll
    llvm/trunk/test/Other/2007-06-05-PassID.ll
    llvm/trunk/test/Transforms/BlockPlacement/basictest.ll
    llvm/trunk/test/Transforms/Inline/basictest.ll
    llvm/trunk/test/Transforms/PruneEH/2008-09-05-CGUpdate.ll
    llvm/trunk/tools/opt/AnalysisWrappers.cpp
    llvm/trunk/tools/opt/GraphPrinters.cpp
    llvm/trunk/tools/opt/PrintSCC.cpp

Modified: llvm/trunk/docs/Passes.html
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/Passes.html?rev=56487&r1=56486&r2=56487&view=diff

==============================================================================
--- llvm/trunk/docs/Passes.html (original)
+++ llvm/trunk/docs/Passes.html Tue Sep 23 07:47:39 2008
@@ -79,15 +79,14 @@
 <tr><td><a href="#basicaa">-basicaa</a></td><td>Basic Alias Analysis (default AA impl)</td></tr>
 <tr><td><a href="#basiccg">-basiccg</a></td><td>Basic CallGraph Construction</td></tr>
 <tr><td><a href="#basicvn">-basicvn</a></td><td>Basic Value Numbering (default GVN impl)</td></tr>
-<tr><td><a href="#callgraph">-callgraph</a></td><td>Print a call graph</td></tr>
-<tr><td><a href="#callscc">-callscc</a></td><td>Print SCCs of the Call Graph</td></tr>
-<tr><td><a href="#cfgscc">-cfgscc</a></td><td>Print SCCs of each function CFG</td></tr>
 <tr><td><a href="#codegenprepare">-codegenprepare</a></td><td>Optimize for code generation</td></tr>
 <tr><td><a href="#count-aa">-count-aa</a></td><td>Count Alias Analysis Query Responses</td></tr>
 <tr><td><a href="#debug-aa">-debug-aa</a></td><td>AA use debugger</td></tr>
 <tr><td><a href="#domfrontier">-domfrontier</a></td><td>Dominance Frontier Construction</td></tr>
 <tr><td><a href="#domtree">-domtree</a></td><td>Dominator Tree Construction</td></tr>
-<tr><td><a href="#externalfnconstants">-externalfnconstants</a></td><td>Print external fn callsites passed constants</td></tr>
+<tr><td><a href="#dot-callgraph">-dot-callgraph</a></td><td>Print Call Graph to 'dot' file</td></tr>
+<tr><td><a href="#dot-cfg">-dot-cfg</a></td><td>Print CFG of function to 'dot' file</td></tr>
+<tr><td><a href="#dot-cfg-only">-dot-cfg-only</a></td><td>Print CFG of function to 'dot' file (with no function bodies)</td></tr>
 <tr><td><a href="#globalsmodref-aa">-globalsmodref-aa</a></td><td>Simple mod/ref analysis for globals</td></tr>
 <tr><td><a href="#instcount">-instcount</a></td><td>Counts the various types of Instructions</td></tr>
 <tr><td><a href="#intervals">-intervals</a></td><td>Interval Partition Construction</td></tr>
@@ -98,13 +97,14 @@
 <tr><td><a href="#no-profile">-no-profile</a></td><td>No Profile Information</td></tr>
 <tr><td><a href="#postdomfrontier">-postdomfrontier</a></td><td>Post-Dominance Frontier Construction</td></tr>
 <tr><td><a href="#postdomtree">-postdomtree</a></td><td>Post-Dominator Tree Construction</td></tr>
-<tr><td><a href="#print">-print</a></td><td>Print function to stderr</td></tr>
 <tr><td><a href="#print-alias-sets">-print-alias-sets</a></td><td>Alias Set Printer</td></tr>
-<tr><td><a href="#print-callgraph">-print-callgraph</a></td><td>Print Call Graph to 'dot' file</td></tr>
-<tr><td><a href="#print-cfg">-print-cfg</a></td><td>Print CFG of function to 'dot' file</td></tr>
-<tr><td><a href="#print-cfg-only">-print-cfg-only</a></td><td>Print CFG of function to 'dot' file (with no function bodies)</td></tr>
-<tr><td><a href="#printm">-printm</a></td><td>Print module to stderr</td></tr>
-<tr><td><a href="#printusedtypes">-printusedtypes</a></td><td>Find Used Types</td></tr>
+<tr><td><a href="#print-callgraph">-print-callgraph</a></td><td>Print a call graph</td></tr>
+<tr><td><a href="#print-callgraph-sccs">-print-callgraph-sccs</a></td><td>Print SCCs of the Call Graph</td></tr>
+<tr><td><a href="#print-cfg-sccs">-print-cfg-sccs</a></td><td>Print SCCs of each function CFG</td></tr>
+<tr><td><a href="#print-externalfnconstants">-print-externalfnconstants</a></td><td>Print external fn callsites passed constants</td></tr>
+<tr><td><a href="#print-function">-print-function</a></td><td>Print function to stderr</td></tr>
+<tr><td><a href="#print-module">-print-module</a></td><td>Print module to stderr</td></tr>
+<tr><td><a href="#print-used-types">-print-used-types</a></td><td>Find Used Types</td></tr>
 <tr><td><a href="#profile-loader">-profile-loader</a></td><td>Load profile information from llvmprof.out</td></tr>
 <tr><td><a href="#scalar-evolution">-scalar-evolution</a></td><td>Scalar Evolution Analysis</td></tr>
 <tr><td><a href="#targetdata">-targetdata</a></td><td>Target Data Layout</td></tr>
@@ -317,39 +317,6 @@
 
 <!-------------------------------------------------------------------------- -->
 <div class="doc_subsection">
-  <a name="callgraph">Print a call graph</a>
-</div>
-<div class="doc_text">
-  <p>
-  This pass, only available in <code>opt</code>, prints the call graph to
-  standard output in a human-readable form.
-  </p>
-</div>
-
-<!-------------------------------------------------------------------------- -->
-<div class="doc_subsection">
-  <a name="callscc">Print SCCs of the Call Graph</a>
-</div>
-<div class="doc_text">
-  <p>
-  This pass, only available in <code>opt</code>, prints the SCCs of the call
-  graph to standard output in a human-readable form.
-  </p>
-</div>
-
-<!-------------------------------------------------------------------------- -->
-<div class="doc_subsection">
-  <a name="cfgscc">Print SCCs of each function CFG</a>
-</div>
-<div class="doc_text">
-  <p>
-  This pass, only available in <code>opt</code>, prints the SCCs of each
-  function CFG to standard output in a human-readable form.
-  </p>
-</div>
-
-<!-------------------------------------------------------------------------- -->
-<div class="doc_subsection">
   <a name="codegenprepare">Optimize for code generation</a>
 </div>
 <div class="doc_text">
@@ -412,14 +379,38 @@
 
 <!-------------------------------------------------------------------------- -->
 <div class="doc_subsection">
-  <a name="externalfnconstants">Print external fn callsites passed constants</a>
+  <a name="dot-callgraph">Print Call Graph to 'dot' file</a>
 </div>
 <div class="doc_text">
   <p>
-  This pass, only available in <code>opt</code>, prints out call sites to
-  external functions that are called with constant arguments.  This can be
-  useful when looking for standard library functions we should constant fold
-  or handle in alias analyses.
+  This pass, only available in <code>opt</code>, prints the call graph into a
+  <code>.dot</code> graph.  This graph can then be processed with the "dot" tool
+  to convert it to postscript or some other suitable format.
+  </p>
+</div>
+
+<!-------------------------------------------------------------------------- -->
+<div class="doc_subsection">
+  <a name="dot-cfg">Print CFG of function to 'dot' file</a>
+</div>
+<div class="doc_text">
+  <p>
+  This pass, only available in <code>opt</code>, prints the control flow graph
+  into a <code>.dot</code> graph.  This graph can then be processed with the
+  "dot" tool to convert it to postscript or some other suitable format.
+  </p>
+</div>
+
+<!-------------------------------------------------------------------------- -->
+<div class="doc_subsection">
+  <a name="dot-cfg-only">Print CFG of function to 'dot' file (with no function bodies)</a>
+</div>
+<div class="doc_text">
+  <p>
+  This pass, only available in <code>opt</code>, prints the control flow graph
+  into a <code>.dot</code> graph, omitting the function bodies.  This graph can
+  then be processed with the "dot" tool to convert it to postscript or some
+  other suitable format.
   </p>
 </div>
 
@@ -557,64 +548,73 @@
 
 <!-------------------------------------------------------------------------- -->
 <div class="doc_subsection">
-  <a name="print">Print function to stderr</a>
+  <a name="print-alias-sets">Alias Set Printer</a>
+</div>
+<div class="doc_text">
+  <p>Yet to be written.</p>
+</div>
+
+<!-------------------------------------------------------------------------- -->
+<div class="doc_subsection">
+  <a name="print-callgraph">Print a call graph</a>
 </div>
 <div class="doc_text">
   <p>
-  The <code>PrintFunctionPass</code> class is designed to be pipelined with
-  other <code>FunctionPass</code>es, and prints out the functions of the module
-  as they are processed.
+  This pass, only available in <code>opt</code>, prints the call graph to
+  standard output in a human-readable form.
   </p>
 </div>
 
 <!-------------------------------------------------------------------------- -->
 <div class="doc_subsection">
-  <a name="print-alias-sets">Alias Set Printer</a>
+  <a name="print-callgraph-sccs">Print SCCs of the Call Graph</a>
 </div>
 <div class="doc_text">
-  <p>Yet to be written.</p>
+  <p>
+  This pass, only available in <code>opt</code>, prints the SCCs of the call
+  graph to standard output in a human-readable form.
+  </p>
 </div>
 
 <!-------------------------------------------------------------------------- -->
 <div class="doc_subsection">
-  <a name="print-callgraph">Print Call Graph to 'dot' file</a>
+  <a name="print-cfg-sccs">Print SCCs of each function CFG</a>
 </div>
 <div class="doc_text">
   <p>
-  This pass, only available in <code>opt</code>, prints the call graph into a
-  <code>.dot</code> graph.  This graph can then be processed with the "dot" tool
-  to convert it to postscript or some other suitable format.
+  This pass, only available in <code>opt</code>, prints the SCCs of each
+  function CFG to standard output in a human-readable form.
   </p>
 </div>
 
 <!-------------------------------------------------------------------------- -->
 <div class="doc_subsection">
-  <a name="print-cfg">Print CFG of function to 'dot' file</a>
+  <a name="print-externalfnconstants">Print external fn callsites passed constants</a>
 </div>
 <div class="doc_text">
   <p>
-  This pass, only available in <code>opt</code>, prints the control flow graph
-  into a <code>.dot</code> graph.  This graph can then be processed with the
-  "dot" tool to convert it to postscript or some other suitable format.
+  This pass, only available in <code>opt</code>, prints out call sites to
+  external functions that are called with constant arguments.  This can be
+  useful when looking for standard library functions we should constant fold
+  or handle in alias analyses.
   </p>
 </div>
 
 <!-------------------------------------------------------------------------- -->
 <div class="doc_subsection">
-  <a name="print-cfg-only">Print CFG of function to 'dot' file (with no function bodies)</a>
+  <a name="print-function">Print function to stderr</a>
 </div>
 <div class="doc_text">
   <p>
-  This pass, only available in <code>opt</code>, prints the control flow graph
-  into a <code>.dot</code> graph, omitting the function bodies.  This graph can
-  then be processed with the "dot" tool to convert it to postscript or some
-  other suitable format.
+  The <code>PrintFunctionPass</code> class is designed to be pipelined with
+  other <code>FunctionPass</code>es, and prints out the functions of the module
+  as they are processed.
   </p>
 </div>
 
 <!-------------------------------------------------------------------------- -->
 <div class="doc_subsection">
-  <a name="printm">Print module to stderr</a>
+  <a name="print-module">Print module to stderr</a>
 </div>
 <div class="doc_text">
   <p>
@@ -624,7 +624,7 @@
 
 <!-------------------------------------------------------------------------- -->
 <div class="doc_subsection">
-  <a name="printusedtypes">Find Used Types</a>
+  <a name="print-used-types">Find Used Types</a>
 </div>
 <div class="doc_text">
   <p>

Modified: llvm/trunk/lib/Analysis/CFGPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/CFGPrinter.cpp?rev=56487&r1=56486&r2=56487&view=diff

==============================================================================
--- llvm/trunk/lib/Analysis/CFGPrinter.cpp (original)
+++ llvm/trunk/lib/Analysis/CFGPrinter.cpp Tue Sep 23 07:47:39 2008
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// This file defines a '-print-cfg' analysis pass, which emits the
+// This file defines a '-dot-cfg' analysis pass, which emits the
 // cfg.<fnname>.dot file for each function in the program, with a graph of the
 // CFG for that function.
 //
@@ -165,7 +165,7 @@
 
 char CFGPrinter::ID = 0;
 static RegisterPass<CFGPrinter>
-P1("print-cfg", "Print CFG of function to 'dot' file", false, true);
+P1("dot-cfg", "Print CFG of function to 'dot' file", false, true);
 
 namespace {
   struct VISIBILITY_HIDDEN CFGOnlyPrinter : public CFGPrinter {
@@ -188,7 +188,7 @@
 
 char CFGOnlyPrinter::ID = 0;
 static RegisterPass<CFGOnlyPrinter>
-P2("print-cfg-only",
+P2("dot-cfg-only",
    "Print CFG of function to 'dot' file (with no function bodies)", false, true);
 
 /// viewCFG - This function is meant for use from the debugger.  You can just

Modified: llvm/trunk/lib/Analysis/IPA/FindUsedTypes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/IPA/FindUsedTypes.cpp?rev=56487&r1=56486&r2=56487&view=diff

==============================================================================
--- llvm/trunk/lib/Analysis/IPA/FindUsedTypes.cpp (original)
+++ llvm/trunk/lib/Analysis/IPA/FindUsedTypes.cpp Tue Sep 23 07:47:39 2008
@@ -23,7 +23,7 @@
 
 char FindUsedTypes::ID = 0;
 static RegisterPass<FindUsedTypes>
-X("printusedtypes", "Find Used Types", false, true);
+X("print-used-types", "Find Used Types", false, true);
 
 // IncorporateType - Incorporate one type and all of its subtypes into the
 // collection of used types.

Modified: llvm/trunk/lib/VMCore/AsmWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/AsmWriter.cpp?rev=56487&r1=56486&r2=56487&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/AsmWriter.cpp (original)
+++ llvm/trunk/lib/VMCore/AsmWriter.cpp Tue Sep 23 07:47:39 2008
@@ -41,10 +41,10 @@
 
 char PrintModulePass::ID = 0;
 static RegisterPass<PrintModulePass>
-X("printm", "Print module to stderr");
+X("print-module", "Print module to stderr");
 char PrintFunctionPass::ID = 0;
 static RegisterPass<PrintFunctionPass>
-Y("print","Print function to stderr");
+Y("print-function","Print function to stderr");
 
 
 //===----------------------------------------------------------------------===//

Modified: llvm/trunk/test/Analysis/CallGraph/2008-09-09-DirectCall.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/CallGraph/2008-09-09-DirectCall.ll?rev=56487&r1=56486&r2=56487&view=diff

==============================================================================
--- llvm/trunk/test/Analysis/CallGraph/2008-09-09-DirectCall.ll (original)
+++ llvm/trunk/test/Analysis/CallGraph/2008-09-09-DirectCall.ll Tue Sep 23 07:47:39 2008
@@ -1,4 +1,5 @@
-; RUN: llvm-as < %s | opt -callgraph -disable-output |& grep {Calls function 'callee'} | count 2
+; RUN: llvm-as < %s | opt -print-callgraph -disable-output |& \
+; RUN:   grep {Calls function 'callee'} | count 2
 
 define internal void @callee(...) {
 entry:

Modified: llvm/trunk/test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll?rev=56487&r1=56486&r2=56487&view=diff

==============================================================================
--- llvm/trunk/test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll (original)
+++ llvm/trunk/test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll Tue Sep 23 07:47:39 2008
@@ -1,4 +1,5 @@
-; RUN: llvm-as < %s | opt -callgraph -disable-output |& grep {Calls function}
+; RUN: llvm-as < %s | opt -print-callgraph -disable-output |& \
+; RUN:   grep {Calls function}
 
 @a = global void ()* @f		; <void ()**> [#uses=0]
 

Modified: llvm/trunk/test/Other/2002-01-31-CallGraph.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Other/2002-01-31-CallGraph.ll?rev=56487&r1=56486&r2=56487&view=diff

==============================================================================
--- llvm/trunk/test/Other/2002-01-31-CallGraph.ll (original)
+++ llvm/trunk/test/Other/2002-01-31-CallGraph.ll Tue Sep 23 07:47:39 2008
@@ -1,6 +1,6 @@
 ;  Call graph construction crash: Not handling indirect calls right
 ;
-; RUN: llvm-as < %s | opt -analyze -callgraph >& /dev/null
+; RUN: llvm-as < %s | opt -analyze -print-callgraph >& /dev/null
 ;
 
         %FunTy = type i32 (i32)

Modified: llvm/trunk/test/Other/2007-06-05-PassID.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Other/2007-06-05-PassID.ll?rev=56487&r1=56486&r2=56487&view=diff

==============================================================================
--- llvm/trunk/test/Other/2007-06-05-PassID.ll (original)
+++ llvm/trunk/test/Other/2007-06-05-PassID.ll Tue Sep 23 07:47:39 2008
@@ -1,4 +1,4 @@
-;RUN: llvm-as < %s | opt -analyze -print-cfg-only -disable-output 2>/dev/null
+;RUN: llvm-as < %s | opt -analyze -dot-cfg-only -disable-output 2>/dev/null
 ;PR 1497
 
 define void @foo() {

Modified: llvm/trunk/test/Transforms/BlockPlacement/basictest.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/BlockPlacement/basictest.ll?rev=56487&r1=56486&r2=56487&view=diff

==============================================================================
--- llvm/trunk/test/Transforms/BlockPlacement/basictest.ll (original)
+++ llvm/trunk/test/Transforms/BlockPlacement/basictest.ll Tue Sep 23 07:47:39 2008
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -block-placement -disable-output -print 2> /dev/null
+; RUN: llvm-as < %s | opt -block-placement -disable-output -print-function 2> /dev/null
 
 define i32 @test() {
         br i1 true, label %X, label %Y

Modified: llvm/trunk/test/Transforms/Inline/basictest.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Inline/basictest.ll?rev=56487&r1=56486&r2=56487&view=diff

==============================================================================
--- llvm/trunk/test/Transforms/Inline/basictest.ll (original)
+++ llvm/trunk/test/Transforms/Inline/basictest.ll Tue Sep 23 07:47:39 2008
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -inline -disable-output -print 2> /dev/null
+; RUN: llvm-as < %s | opt -inline -disable-output -print-function 2> /dev/null
 
 define i32 @func(i32 %i) {
         ret i32 %i

Modified: llvm/trunk/test/Transforms/PruneEH/2008-09-05-CGUpdate.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PruneEH/2008-09-05-CGUpdate.ll?rev=56487&r1=56486&r2=56487&view=diff

==============================================================================
--- llvm/trunk/test/Transforms/PruneEH/2008-09-05-CGUpdate.ll (original)
+++ llvm/trunk/test/Transforms/PruneEH/2008-09-05-CGUpdate.ll Tue Sep 23 07:47:39 2008
@@ -1,5 +1,6 @@
-; RUN: llvm-as < %s | opt -prune-eh -inline -callgraph -disable-output |& \
-; RUN:   grep {Calls.*ce3806g__fxio__put__put_int64__4.1339} | count 2
+; RUN: llvm-as < %s | opt -prune-eh -inline -print-callgraph \
+; RUN:   -disable-output |& \
+; RUN:     grep {Calls.*ce3806g__fxio__put__put_int64__4.1339} | count 2
 	%struct.FRAME.ce3806g = type { %struct.string___XUB, %struct.string___XUB, %struct.string___XUB, %struct.string___XUB }
 	%struct.FRAME.ce3806g__fxio__put__4 = type { i32, i32, i32, %struct.system__file_control_block__pstring*, i32, i32, i8 }
 	%struct.RETURN = type { i8, i32 }

Modified: llvm/trunk/tools/opt/AnalysisWrappers.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/opt/AnalysisWrappers.cpp?rev=56487&r1=56486&r2=56487&view=diff

==============================================================================
--- llvm/trunk/tools/opt/AnalysisWrappers.cpp (original)
+++ llvm/trunk/tools/opt/AnalysisWrappers.cpp Tue Sep 23 07:47:39 2008
@@ -65,7 +65,8 @@
 
   char ExternalFunctionsPassedConstants::ID = 0;
   RegisterPass<ExternalFunctionsPassedConstants>
-  P1("externalfnconstants", "Print external fn callsites passed constants");
+  P1("print-externalfnconstants",
+     "Print external fn callsites passed constants");
 
   struct CallGraphPrinter : public ModulePass {
     static char ID; // Pass ID, replacement for typeid
@@ -83,5 +84,5 @@
 
   char CallGraphPrinter::ID = 0;
   RegisterPass<CallGraphPrinter>
-    P2("callgraph", "Print a call graph");
+    P2("print-callgraph", "Print a call graph");
 }

Modified: llvm/trunk/tools/opt/GraphPrinters.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/opt/GraphPrinters.cpp?rev=56487&r1=56486&r2=56487&view=diff

==============================================================================
--- llvm/trunk/tools/opt/GraphPrinters.cpp (original)
+++ llvm/trunk/tools/opt/GraphPrinters.cpp Tue Sep 23 07:47:39 2008
@@ -79,7 +79,7 @@
   };
 
   char CallGraphPrinter::ID = 0;
-  RegisterPass<CallGraphPrinter> P2("print-callgraph",
+  RegisterPass<CallGraphPrinter> P2("dot-callgraph",
                                     "Print Call Graph to 'dot' file");
 }
 

Modified: llvm/trunk/tools/opt/PrintSCC.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/opt/PrintSCC.cpp?rev=56487&r1=56486&r2=56487&view=diff

==============================================================================
--- llvm/trunk/tools/opt/PrintSCC.cpp (original)
+++ llvm/trunk/tools/opt/PrintSCC.cpp Tue Sep 23 07:47:39 2008
@@ -14,12 +14,12 @@
 //
 // (1) As a reference for how to use the scc_iterator.
 // (2) To print out the SCCs for a CFG or a CallGraph:
-//       analyze -cfgscc            to print the SCCs in each CFG of a module.
-//       analyze -cfgscc -stats     to print the #SCCs and the maximum SCC size.
-//       analyze -cfgscc -debug > /dev/null to watch the algorithm in action.
+//       analyze -print-cfg-sccs            to print the SCCs in each CFG of a module.
+//       analyze -print-cfg-sccs -stats     to print the #SCCs and the maximum SCC size.
+//       analyze -print-cfg-sccs -debug > /dev/null to watch the algorithm in action.
 //
 //     and similarly:
-//       analyze -callscc [-stats] [-debug] to print SCCs in the CallGraph
+//       analyze -print-callgraph-sccs [-stats] [-debug] to print SCCs in the CallGraph
 //
 // (3) To test the scc_iterator.
 //
@@ -64,11 +64,11 @@
 
   char CFGSCC::ID = 0;
   RegisterPass<CFGSCC>
-  Y("cfgscc", "Print SCCs of each function CFG");
+  Y("print-cfg-sccs", "Print SCCs of each function CFG");
 
   char CallGraphSCC::ID = 0;
   RegisterPass<CallGraphSCC>
-  Z("callscc", "Print SCCs of the Call Graph");
+  Z("print-callgraph-sccs", "Print SCCs of the Call Graph");
 }
 
 bool CFGSCC::runOnFunction(Function &F) {




From clattner at apple.com  Tue Sep 23 11:17:30 2008
From: clattner at apple.com (Chris Lattner)
Date: Tue, 23 Sep 2008 09:17:30 -0700
Subject: [llvm-commits] [llvm-gcc-4.2] r55650 -
	/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
In-Reply-To: <200809231005.32498.baldrick@free.fr>
References: <200809022118.m82LIJeg019335@zion.cs.uiuc.edu>
	<2ABEF97F-1856-4090-B2C8-BE9EC57B2A0E@apple.com>
	<295D58A1-2BF8-4B8B-8E3C-C4660992F2F4@apple.com>
	<200809231005.32498.baldrick@free.fr>
Message-ID: <C0D2E806-4F90-49FF-8412-2C4D0772ECE1@apple.com>


On Sep 23, 2008, at 1:05 AM, Duncan Sands wrote:

>>> llvm-convert.cpp is target independent code.
>>
>> No, it's not; there's lots of #ifdef TARGET_LLVM's in here.  (If
>> you're saying it's not target-dependent because it's using some
>> abstraction rather than TARGET_POWERPC, I strongly disagree.)
>
> Well, there aren't that many!  Most of them are for sync things
> and were introduced by you ;)  Otherwise there is this one:
>
> 49950  evancheng #if defined(TARGET_ALPHA) || defined(TARGET_386) ||  
> defined(TARGET_POWERPC)
>
> And that's it really.

Put another way, just because there are *some* TARGET_xxx macros being  
checked doesn't make it right to check more.  The code really should  
be target independent parameterized with target hooks.  GCC does  
target hooks with macros defined in the target.h files, so we should  
use that mechanism.

-Chris


From dpatel at apple.com  Tue Sep 23 11:23:43 2008
From: dpatel at apple.com (Devang Patel)
Date: Tue, 23 Sep 2008 09:23:43 -0700
Subject: [llvm-commits] r55638 - /llvm/trunk/include/llvm/Function.h
In-Reply-To: <200809231027.53858.baldrick@free.fr>
References: <200809231027.53858.baldrick@free.fr>
Message-ID: <77E848E7-62CE-4A78-96B1-B36E110D1469@apple.com>


On Sep 23, 2008, at 1:27 AM, Duncan Sands wrote:

> I thought opt-size was different, and meant: if F is marked opt-size,
> then don't inline things into it if that will make F fat.

Yes, thats the intent....

> I peeked
> inside the inliner and saw that it seems to mean: only inline F into
> callers of F if it won't make them (and not F) fat.

it is quite possible that I did not do the right thing! I'll  
investigate.

-
Devang


From dpatel at apple.com  Tue Sep 23 11:40:25 2008
From: dpatel at apple.com (Devang Patel)
Date: Tue, 23 Sep 2008 09:40:25 -0700
Subject: [llvm-commits] r55638 - /llvm/trunk/include/llvm/Function.h
In-Reply-To: <200809231027.53858.baldrick@free.fr>
References: <200809231027.53858.baldrick@free.fr>
Message-ID: <4198047C-1532-421C-AF0F-56162C4F18E0@apple.com>


On Sep 23, 2008, at 1:27 AM, Duncan Sands wrote:

> I think specifying noinline or alwaysinline at a call site makes
> sense.  It means: don't inline (or always inline) this callsite!
> Thus you could have a function that is not itself marked noinline,
> but a few special callsites that are marked noinline.  I see no
> reason not to make these function attributes.

I do not see what additional value this adds in practice. IMO, let  
caller's threshold influence decision here.

Function A calls Function B. If Function B's code is available and  
inliner can inline B into A, then I view this as  - A is absorbing (or  
digesting) B. B does not have much to say here. A is not destroying B  
and other uses of B. This is my view, and I think you do not  
completely agree with this. My view also makes new policy decisions  
obvious.

	define void @S() notes ("x86.sse3") { ... }

Here, the intent is simple - function S will run on a processor which  
has sse3 support.

	define void @NS() notes ("x86.no-sse") { ... }

Again, the intent is clear and simple - function NS is intended to run  
on a processor that does not have SSE support. Do not use SSE  
instructions.


Now,

- if S calls NS then what to do about these notes ?

	Simple. S absorbs code from NS. After inlining you don't see any  
trace of NS inside S. And function S will run on a processor that has  
sse3 instructions so code generator is free to use sse3 instructions  
for the code copied from function NS.

- what if NS calls S ?

	Simple. After inlining, NS will run on a processor that has no sse  
support. So, inline S into NS only if code generator will not be  
forced to use SSE instructions for the code copied from S.

If XYZ calls S and NS then once again, XYZ's notes win.

-
Devang


From dpatel at apple.com  Tue Sep 23 11:44:13 2008
From: dpatel at apple.com (Devang Patel)
Date: Tue, 23 Sep 2008 09:44:13 -0700
Subject: [llvm-commits] [llvm] r56487 - in /llvm/trunk: docs/Passes.html
	lib/Analysis/CFGPrinter.cpp
	lib/Analysis/IPA/FindUsedTypes.cpp lib/VMCore/AsmWriter.cpp
	test/Analysis/CallGraph/2008-09-09-DirectCall.ll
	test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll
	test/Other/2002-01-31-CallGraph.ll test/Other/2007-06-05-PassID.ll
	test/Transforms/BlockPlacement/basictest.ll
	test/Transforms/Inline/basictest.ll
	test/Transforms/PruneEH/2008-09-05-CGUpdate.ll
	tools/opt/AnalysisWrappers.cpp tools/opt/GraphPrinters.cpp
	tools/opt/PrintSCC.cpp
In-Reply-To: <200809231247.m8NCliWf009008@zion.cs.uiuc.edu>
References: <200809231247.m8NCliWf009008@zion.cs.uiuc.edu>
Message-ID: <3B23CFE3-D8A5-48F0-A9CE-00AEFE5FA8A6@apple.com>


On Sep 23, 2008, at 5:47 AM, Duncan Sands wrote:

> Author: baldrick
> Date: Tue Sep 23 07:47:39 2008
> New Revision: 56487
>
> URL: http://llvm.org/viewvc/llvm-project?rev=56487&view=rev
> Log:
> Rationalize the names of passes that print information:
>    -callgraph => print-callgraph
>    -callscc   => print-callgraph-sccs
>    -cfgscc    => print-cfg-sccs
>    -externalfnconstants => print-externalfnconstants
>    -print               => print-function
>    -print-alias-sets (no change)
>    -print-callgraph     => dot-callgraph
>    -print-cfg           => dot-cfg
>    -print-cfg-only      => dot-cfg-only
>    -print-dom-info (no change)
>    -printm              => print-module
>    -printusedtypes      => print-used-types

Thanks!
-
Devang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20080923/c015deaa/attachment.html 

From dpatel at apple.com  Tue Sep 23 12:14:29 2008
From: dpatel at apple.com (Devang Patel)
Date: Tue, 23 Sep 2008 10:14:29 -0700
Subject: [llvm-commits] [llvm]
	r55638	-	/llvm/trunk/include/llvm/Function.h
In-Reply-To: <200809222058.28125.baldrick@free.fr>
References: <200809021833.m82IXtBb013569@zion.cs.uiuc.edu>
	<B7FF084E-3C04-480E-B0BC-72E16DC8EBD5@apple.com>
	<690E1C5C-04C8-4030-A740-8E3CE1CDE635@apple.com>
	<200809222058.28125.baldrick@free.fr>
Message-ID: <76ED3D4C-F77C-498F-973D-56E0906E2119@apple.com>


On Sep 22, 2008, at 11:58 AM, Duncan Sands wrote:

> actually it is theoretically useful to be able to specify readonly  
> on a
> call to a function that is not readonly: it means that this particular
> call doesn't read memory (presumably because the function is being
> passed a special value for some parameter) even though general calls
> to it might.

How do you distinguish that ?
-
Devang


From dpatel at apple.com  Tue Sep 23 12:22:56 2008
From: dpatel at apple.com (Devang Patel)
Date: Tue, 23 Sep 2008 10:22:56 -0700
Subject: [llvm-commits] [llvm-gcc-4.2] r55718 -
	/llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp
In-Reply-To: <1BAD5C02-8779-40FD-88C6-6C75B33ABA6B@apple.com>
References: <200809032001.m83K1RkI012649@zion.cs.uiuc.edu>
	<4DF68CD0-1A0C-4B54-AE37-0F8D18FDF11D@apple.com>
	<7AE2A0A8-5EFC-4559-A100-14B2BB4C89A5@apple.com>
	<1BAD5C02-8779-40FD-88C6-6C75B33ABA6B@apple.com>
Message-ID: <ADAF4BAD-C7D7-4FF8-8756-CBFA1975DBEE@apple.com>


On Sep 22, 2008, at 1:35 PM, Chris Lattner wrote:

>
> On Sep 22, 2008, at 11:21 AM, Devang Patel wrote:
>
>>
>> On Sep 21, 2008, at 8:43 PM, Chris Lattner wrote:
>>
>>>> +    else {
>>>> +      // The inliner pass won't be inserted based on command  
>>>> line options.
>>>> +      // Use AlwaysInliner to handle functions that are marked  
>>>> as always_inline.
>>>> +      bool NeedAlwaysInliner = false;
>>>> +      for (Module::iterator I = TheModule->begin(), E =  
>>>> TheModule->end();
>>>> +         I != E; ++I)
>>>> +        if (!I->isDeclaration() && I->getNotes() ==  
>>>> FN_NOTE_AlwaysInline) {
>>>> +          NeedAlwaysInliner = true;
>>>> +          break;
>>>> +        }
>>>> +      if (NeedAlwaysInliner)
>>>> +        PM->add(createAlwaysInlinerPass());
>>>
>>> Please don't do this loop here, just unconditionally add it to the  
>>> passmgr.  Is there some advantage to checking here (in llvmgcc)  
>>> rather than in the pass itself?
>>
>>
>> Only one advantage is a small convenience to llvm developers. When  
>> we are using -analyze or -print or intentionally running selected  
>> pass for debugging/testing then you do not want PassManager to  
>> annoy you. This is not a big deal, and I do not see any advantage  
>> for end users.
>
> How would it be annoying?  I don't understand.  It is just an  
> optimization to speed up the pass.

OK.  I spent some time investigating this, now the big question is  
"Where in the pass sequence ?"
-
Devang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20080923/2243ac98/attachment.html 

From tonic at nondot.org  Tue Sep 23 12:31:45 2008
From: tonic at nondot.org (Tanya Lattner)
Date: Tue, 23 Sep 2008 12:31:45 -0500
Subject: [llvm-commits] CVS: llvm-www/robots.txt
Message-ID: <200809231731.m8NHVj5w020282@zion.cs.uiuc.edu>



Changes in directory llvm-www:

robots.txt updated: 1.5 -> 1.6
---
Log message:

Block spiders from dev mtg movies.


---
Diffs of the changes:  (+3 -0)

 robots.txt |    3 +++
 1 files changed, 3 insertions(+)


Index: llvm-www/robots.txt
diff -u llvm-www/robots.txt:1.5 llvm-www/robots.txt:1.6
--- llvm-www/robots.txt:1.5	Wed Jan 23 17:56:51 2008
+++ llvm-www/robots.txt	Tue Sep 23 12:31:03 2008
@@ -6,3 +6,6 @@
 Disallow: /testresults/X86
 Disallow: /nightlytest
 Disallow: /viewvc
+Disallow: /nightlytest2
+Disallow: /devmtg/2008-08/*.m4v$
+Disallow: /devmtg/2008-08/*.3gp$





From gohman at apple.com  Tue Sep 23 13:22:59 2008
From: gohman at apple.com (Dan Gohman)
Date: Tue, 23 Sep 2008 18:22:59 -0000
Subject: [llvm-commits] [llvm] r56494 - in /llvm/trunk/lib/Target/X86:
 X86ISelDAGToDAG.cpp X86InstrInfo.cpp X86InstrInfo.h
Message-ID: <200809231822.m8NIMxUH022273@zion.cs.uiuc.edu>

Author: djg
Date: Tue Sep 23 13:22:58 2008
New Revision: 56494

URL: http://llvm.org/viewvc/llvm-project?rev=56494&view=rev
Log:
Move the code for initializing the global base reg out of
X86ISelDAGToDAG.cpp and into X86InstrInfo.cpp. This will allow
it to be reused by FastISel.

Modified:
    llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp
    llvm/trunk/lib/Target/X86/X86InstrInfo.cpp
    llvm/trunk/lib/Target/X86/X86InstrInfo.h

Modified: llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp?rev=56494&r1=56493&r2=56494&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp Tue Sep 23 13:22:58 2008
@@ -232,8 +232,10 @@
       return CurDAG->getTargetConstant(Imm, MVT::i32);
     }
 
-    /// getGlobalBaseReg - insert code into the entry mbb to materialize the PIC
-    /// base register.  Return the virtual register that holds this value.
+    /// getGlobalBaseReg - Return an SDNode that returns the value of
+    /// the global base register. Output instructions required to
+    /// initialize the global base register, if necessary.
+    ///
     SDNode *getGlobalBaseReg();
 
     /// getTruncateTo8Bit - return an SDNode that implements a subreg based
@@ -1170,36 +1172,14 @@
   return false;
 }
 
-/// getGlobalBaseReg - Output the instructions required to put the
-/// base address to use for accessing globals into a register.
+/// getGlobalBaseReg - Return an SDNode that returns the value of
+/// the global base register. Output instructions required to
+/// initialize the global base register, if necessary.
 ///
 SDNode *X86DAGToDAGISel::getGlobalBaseReg() {
   assert(!Subtarget->is64Bit() && "X86-64 PIC uses RIP relative addressing");
-  if (!GlobalBaseReg) {
-    // Insert the set of GlobalBaseReg into the first MBB of the function
-    MachineFunction *MF = BB->getParent();
-    MachineBasicBlock &FirstMBB = MF->front();
-    MachineBasicBlock::iterator MBBI = FirstMBB.begin();
-    MachineRegisterInfo &RegInfo = MF->getRegInfo();
-    unsigned PC = RegInfo.createVirtualRegister(X86::GR32RegisterClass);
-    
-    const TargetInstrInfo *TII = TM.getInstrInfo();
-    // Operand of MovePCtoStack is completely ignored by asm printer. It's
-    // only used in JIT code emission as displacement to pc.
-    BuildMI(FirstMBB, MBBI, TII->get(X86::MOVPC32r), PC).addImm(0);
-    
-    // If we're using vanilla 'GOT' PIC style, we should use relative addressing
-    // not to pc, but to _GLOBAL_ADDRESS_TABLE_ external
-    if (TM.getRelocationModel() == Reloc::PIC_ &&
-        Subtarget->isPICStyleGOT()) {
-      GlobalBaseReg = RegInfo.createVirtualRegister(X86::GR32RegisterClass);
-      BuildMI(FirstMBB, MBBI, TII->get(X86::ADD32ri), GlobalBaseReg)
-        .addReg(PC).addExternalSymbol("_GLOBAL_OFFSET_TABLE_");
-    } else {
-      GlobalBaseReg = PC;
-    }
-    
-  }
+  if (!GlobalBaseReg)
+    GlobalBaseReg = TM.getInstrInfo()->initializeGlobalBaseReg(BB->getParent());
   return CurDAG->getRegister(GlobalBaseReg, TLI.getPointerTy()).getNode();
 }
 

Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.cpp?rev=56494&r1=56493&r2=56494&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86InstrInfo.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86InstrInfo.cpp Tue Sep 23 13:22:58 2008
@@ -2935,3 +2935,32 @@
   }
   return Size;
 }
+
+/// initializeGlobalBaseReg - Output the instructions required to put the
+/// base address to use for accessing globals into a register.
+///
+unsigned X86InstrInfo::initializeGlobalBaseReg(MachineFunction *MF) const {
+  // Insert the set of GlobalBaseReg into the first MBB of the function
+  MachineBasicBlock &FirstMBB = MF->front();
+  MachineBasicBlock::iterator MBBI = FirstMBB.begin();
+  MachineRegisterInfo &RegInfo = MF->getRegInfo();
+  unsigned PC = RegInfo.createVirtualRegister(X86::GR32RegisterClass);
+  
+  const TargetInstrInfo *TII = TM.getInstrInfo();
+  // Operand of MovePCtoStack is completely ignored by asm printer. It's
+  // only used in JIT code emission as displacement to pc.
+  BuildMI(FirstMBB, MBBI, TII->get(X86::MOVPC32r), PC).addImm(0);
+  
+  // If we're using vanilla 'GOT' PIC style, we should use relative addressing
+  // not to pc, but to _GLOBAL_ADDRESS_TABLE_ external
+  if (TM.getRelocationModel() == Reloc::PIC_ &&
+      TM.getSubtarget<X86Subtarget>().isPICStyleGOT()) {
+    unsigned GlobalBaseReg =
+      RegInfo.createVirtualRegister(X86::GR32RegisterClass);
+    BuildMI(FirstMBB, MBBI, TII->get(X86::ADD32ri), GlobalBaseReg)
+      .addReg(PC).addExternalSymbol("_GLOBAL_OFFSET_TABLE_");
+    return GlobalBaseReg;
+  }
+
+  return PC;
+}

Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.h?rev=56494&r1=56493&r2=56494&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86InstrInfo.h (original)
+++ llvm/trunk/lib/Target/X86/X86InstrInfo.h Tue Sep 23 13:22:58 2008
@@ -414,6 +414,11 @@
   ///
   virtual unsigned GetInstSizeInBytes(const MachineInstr *MI) const;
 
+  /// initializeGlobalBaseReg - Output the instructions required to put the
+  /// base address to use for accessing globals into a register.
+  ///
+  unsigned initializeGlobalBaseReg(MachineFunction *MF) const;
+
 private:
   MachineInstr* foldMemoryOperand(MachineFunction &MF,
                                   MachineInstr* MI,




From gohman at apple.com  Tue Sep 23 13:26:47 2008
From: gohman at apple.com (Dan Gohman)
Date: Tue, 23 Sep 2008 18:26:47 -0000
Subject: [llvm-commits] [llvm] r56495 -
	/llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp
Message-ID: <200809231826.m8NIQl2o022403@zion.cs.uiuc.edu>

Author: djg
Date: Tue Sep 23 13:26:47 2008
New Revision: 56495

URL: http://llvm.org/viewvc/llvm-project?rev=56495&view=rev
Log:
Delete an unused function.

Modified:
    llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp

Modified: llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp?rev=56495&r1=56494&r2=56495&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp Tue Sep 23 13:26:47 2008
@@ -1057,16 +1057,6 @@
   return true;
 }
 
-/// isZeroNode - Returns true if Elt is a constant zero or a floating point
-/// constant +0.0.
-static inline bool isZeroNode(SDValue Elt) {
-  return ((isa<ConstantSDNode>(Elt) &&
-  cast<ConstantSDNode>(Elt)->getZExtValue() == 0) ||
-  (isa<ConstantFPSDNode>(Elt) &&
-  cast<ConstantFPSDNode>(Elt)->getValueAPF().isPosZero()));
-}
-
-
 /// SelectScalarSSELoad - Match a scalar SSE load.  In particular, we want to
 /// match a load whose top elements are either undef or zeros.  The load flavor
 /// is derived from the type of N, which is either v4f32 or v2f64.




From gohman at apple.com  Tue Sep 23 13:27:53 2008
From: gohman at apple.com (Dan Gohman)
Date: Tue, 23 Sep 2008 18:27:53 -0000
Subject: [llvm-commits] [llvm] r56496 -
	/llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h
Message-ID: <200809231827.m8NIRrZ0022443@zion.cs.uiuc.edu>

Author: djg
Date: Tue Sep 23 13:27:53 2008
New Revision: 56496

URL: http://llvm.org/viewvc/llvm-project?rev=56496&view=rev
Log:
Update the comment to reflect the new name.

Modified:
    llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h

Modified: llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h?rev=56496&r1=56495&r2=56496&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h (original)
+++ llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h Tue Sep 23 13:27:53 2008
@@ -207,7 +207,7 @@
     FUNC_CODE_INST_EXTRACTVAL  = 26, // EXTRACTVAL: [n x operands]
     FUNC_CODE_INST_INSERTVAL   = 27, // INSERTVAL:  [n x operands]
     // fcmp/icmp returning Int1TY or vector of Int1Ty, NOT for vicmp/vfcmp
-    FUNC_CODE_INST_CMP2        = 28, // VCMP:       [opty, opval, opval, pred]
+    FUNC_CODE_INST_CMP2        = 28, // CMP2:       [opty, opval, opval, pred]
     // new select on i1 or [N x i1]
     FUNC_CODE_INST_VSELECT     = 29  // VSELECT:    [ty,opval,opval,predty,pred]
   };




From gohman at apple.com  Tue Sep 23 13:42:33 2008
From: gohman at apple.com (Dan Gohman)
Date: Tue, 23 Sep 2008 18:42:33 -0000
Subject: [llvm-commits] [llvm] r56497 - in /llvm/trunk/lib/Target:
 ARM/ARMISelLowering.h Alpha/AlphaISelLowering.h CellSPU/SPUISelLowering.h
 IA64/IA64ISelLowering.h Mips/MipsISelLowering.h PIC16/PIC16ISelLowering.h
 PowerPC/PPCISelLowering.h Sparc/SparcISelLowering.h X86/X86ISelLowering.h
Message-ID: <200809231842.m8NIgXLd022935@zion.cs.uiuc.edu>

Author: djg
Date: Tue Sep 23 13:42:32 2008
New Revision: 56497

URL: http://llvm.org/viewvc/llvm-project?rev=56497&view=rev
Log:
Fix these enums' starting values to reflect the way that
instruction opcodes are now numbered. No functionality change.

Modified:
    llvm/trunk/lib/Target/ARM/ARMISelLowering.h
    llvm/trunk/lib/Target/Alpha/AlphaISelLowering.h
    llvm/trunk/lib/Target/CellSPU/SPUISelLowering.h
    llvm/trunk/lib/Target/IA64/IA64ISelLowering.h
    llvm/trunk/lib/Target/Mips/MipsISelLowering.h
    llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.h
    llvm/trunk/lib/Target/PowerPC/PPCISelLowering.h
    llvm/trunk/lib/Target/Sparc/SparcISelLowering.h
    llvm/trunk/lib/Target/X86/X86ISelLowering.h

Modified: llvm/trunk/lib/Target/ARM/ARMISelLowering.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMISelLowering.h?rev=56497&r1=56496&r2=56497&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMISelLowering.h (original)
+++ llvm/trunk/lib/Target/ARM/ARMISelLowering.h Tue Sep 23 13:42:32 2008
@@ -27,7 +27,7 @@
     // ARM Specific DAG Nodes
     enum NodeType {
       // Start the numbering where the builting ops and target ops leave off.
-      FIRST_NUMBER = ISD::BUILTIN_OP_END+ARM::INSTRUCTION_LIST_END,
+      FIRST_NUMBER = ISD::BUILTIN_OP_END,
 
       Wrapper,      // Wrapper - A wrapper node for TargetConstantPool,
                     // TargetExternalSymbol, and TargetGlobalAddress.

Modified: llvm/trunk/lib/Target/Alpha/AlphaISelLowering.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Alpha/AlphaISelLowering.h?rev=56497&r1=56496&r2=56497&view=diff

==============================================================================
--- llvm/trunk/lib/Target/Alpha/AlphaISelLowering.h (original)
+++ llvm/trunk/lib/Target/Alpha/AlphaISelLowering.h Tue Sep 23 13:42:32 2008
@@ -25,7 +25,7 @@
   namespace AlphaISD {
     enum NodeType {
       // Start the numbering where the builting ops and target ops leave off.
-      FIRST_NUMBER = ISD::BUILTIN_OP_END+Alpha::INSTRUCTION_LIST_END,
+      FIRST_NUMBER = ISD::BUILTIN_OP_END,
       //These corrospond to the identical Instruction
       CVTQT_, CVTQS_, CVTTQ_,
 

Modified: llvm/trunk/lib/Target/CellSPU/SPUISelLowering.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CellSPU/SPUISelLowering.h?rev=56497&r1=56496&r2=56497&view=diff

==============================================================================
--- llvm/trunk/lib/Target/CellSPU/SPUISelLowering.h (original)
+++ llvm/trunk/lib/Target/CellSPU/SPUISelLowering.h Tue Sep 23 13:42:32 2008
@@ -23,7 +23,7 @@
   namespace SPUISD {
     enum NodeType {
       // Start the numbering where the builting ops and target ops leave off.
-      FIRST_NUMBER = ISD::BUILTIN_OP_END+SPU::INSTRUCTION_LIST_END,
+      FIRST_NUMBER = ISD::BUILTIN_OP_END,
       
       // Pseudo instructions:
       RET_FLAG,                 ///< Return with flag, matched by bi instruction

Modified: llvm/trunk/lib/Target/IA64/IA64ISelLowering.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/IA64/IA64ISelLowering.h?rev=56497&r1=56496&r2=56497&view=diff

==============================================================================
--- llvm/trunk/lib/Target/IA64/IA64ISelLowering.h (original)
+++ llvm/trunk/lib/Target/IA64/IA64ISelLowering.h Tue Sep 23 13:42:32 2008
@@ -23,7 +23,7 @@
   namespace IA64ISD {
     enum NodeType {
       // Start the numbering where the builting ops and target ops leave off.
-      FIRST_NUMBER = ISD::BUILTIN_OP_END+IA64::INSTRUCTION_LIST_END,
+      FIRST_NUMBER = ISD::BUILTIN_OP_END,
 
       /// GETFD - the getf.d instruction takes a floating point operand and
       /// returns its 64-bit memory representation as an i64

Modified: llvm/trunk/lib/Target/Mips/MipsISelLowering.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsISelLowering.h?rev=56497&r1=56496&r2=56497&view=diff

==============================================================================
--- llvm/trunk/lib/Target/Mips/MipsISelLowering.h (original)
+++ llvm/trunk/lib/Target/Mips/MipsISelLowering.h Tue Sep 23 13:42:32 2008
@@ -24,7 +24,7 @@
   namespace MipsISD {
     enum NodeType {
       // Start the numbering from where ISD NodeType finishes.
-      FIRST_NUMBER = ISD::BUILTIN_OP_END+Mips::INSTRUCTION_LIST_END,
+      FIRST_NUMBER = ISD::BUILTIN_OP_END,
 
       // Jump and link (call)
       JmpLink,

Modified: llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.h?rev=56497&r1=56496&r2=56497&view=diff

==============================================================================
--- llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.h (original)
+++ llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.h Tue Sep 23 13:42:32 2008
@@ -24,7 +24,7 @@
   namespace PIC16ISD {
     enum NodeType {
       // Start the numbering from where ISD NodeType finishes.
-      FIRST_NUMBER = ISD::BUILTIN_OP_END+PIC16::INSTRUCTION_LIST_END,
+      FIRST_NUMBER = ISD::BUILTIN_OP_END,
 
       // used for encapsulating the expanded nodes into one node.
       Package,

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

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCISelLowering.h (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCISelLowering.h Tue Sep 23 13:42:32 2008
@@ -24,7 +24,7 @@
   namespace PPCISD {
     enum NodeType {
       // Start the numbering where the builtin ops and target ops leave off.
-      FIRST_NUMBER = ISD::BUILTIN_OP_END+PPC::INSTRUCTION_LIST_END,
+      FIRST_NUMBER = ISD::BUILTIN_OP_END,
 
       /// FSEL - Traditional three-operand fsel node.
       ///

Modified: llvm/trunk/lib/Target/Sparc/SparcISelLowering.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/SparcISelLowering.h?rev=56497&r1=56496&r2=56497&view=diff

==============================================================================
--- llvm/trunk/lib/Target/Sparc/SparcISelLowering.h (original)
+++ llvm/trunk/lib/Target/Sparc/SparcISelLowering.h Tue Sep 23 13:42:32 2008
@@ -21,7 +21,7 @@
 namespace llvm {
   namespace SPISD {
     enum {
-      FIRST_NUMBER = ISD::BUILTIN_OP_END+SP::INSTRUCTION_LIST_END,
+      FIRST_NUMBER = ISD::BUILTIN_OP_END,
       CMPICC,      // Compare two GPR operands, set icc.
       CMPFCC,      // Compare two FP operands, set fcc.
       BRICC,       // Branch to dest on icc condition

Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.h?rev=56497&r1=56496&r2=56497&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelLowering.h (original)
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.h Tue Sep 23 13:42:32 2008
@@ -28,7 +28,7 @@
     // X86 Specific DAG Nodes
     enum NodeType {
       // Start the numbering where the builtin ops leave off.
-      FIRST_NUMBER = ISD::BUILTIN_OP_END+X86::INSTRUCTION_LIST_END,
+      FIRST_NUMBER = ISD::BUILTIN_OP_END,
 
       /// BSF - Bit scan forward.
       /// BSR - Bit scan reverse.




From gohman at apple.com  Tue Sep 23 13:50:54 2008
From: gohman at apple.com (Dan Gohman)
Date: Tue, 23 Sep 2008 18:50:54 -0000
Subject: [llvm-commits] [llvm] r56498 - in
 /llvm/trunk/lib/CodeGen/SelectionDAG: ScheduleDAGFast.cpp
 ScheduleDAGRRList.cpp
Message-ID: <200809231850.m8NIotuA023167@zion.cs.uiuc.edu>

Author: djg
Date: Tue Sep 23 13:50:48 2008
New Revision: 56498

URL: http://llvm.org/viewvc/llvm-project?rev=56498&view=rev
Log:
Replace the LiveRegs SmallSet with a simple counter that keeps
track of the number of live registers, which is all the set was
being used for.

Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp Tue Sep 23 13:50:48 2008
@@ -39,7 +39,7 @@
   /// all nodes to have the same priority.
   ///
   struct VISIBILITY_HIDDEN FastPriorityQueue {
-    std::vector<SUnit *> Queue;
+    SmallVector<SUnit *, 16> Queue;
 
     bool empty() const { return Queue.empty(); }
     
@@ -63,10 +63,10 @@
   /// AvailableQueue - The priority queue to use for the available SUnits.
   FastPriorityQueue AvailableQueue;
 
-  /// LiveRegs / LiveRegDefs - A set of physical registers and their definition
+  /// LiveRegDefs - A set of physical registers and their definition
   /// that are "live". These nodes must be scheduled before any other nodes that
   /// modifies the registers can be scheduled.
-  SmallSet<unsigned, 4> LiveRegs;
+  unsigned NumLiveRegs;
   std::vector<SUnit*> LiveRegDefs;
   std::vector<unsigned> LiveRegCycles;
 
@@ -117,6 +117,7 @@
 void ScheduleDAGFast::Schedule() {
   DOUT << "********** List Scheduling **********\n";
 
+  NumLiveRegs = 0;
   LiveRegDefs.resize(TRI->getNumRegs(), NULL);  
   LiveRegCycles.resize(TRI->getNumRegs(), 0);
 
@@ -178,7 +179,8 @@
       // expensive to copy the register. Make sure nothing that can 
       // clobber the register is scheduled between the predecessor and
       // this node.
-      if (LiveRegs.insert(I->Reg)) {
+      if (!LiveRegDefs[I->Reg]) {
+        ++NumLiveRegs;
         LiveRegDefs[I->Reg] = I->Dep;
         LiveRegCycles[I->Reg] = CurCycle;
       }
@@ -190,9 +192,10 @@
        I != E; ++I) {
     if (I->Cost < 0)  {
       if (LiveRegCycles[I->Reg] == I->Dep->Cycle) {
-        LiveRegs.erase(I->Reg);
+        assert(NumLiveRegs > 0 && "NumLiveRegs is already zero!");
         assert(LiveRegDefs[I->Reg] == SU &&
                "Physical register dependency violated?");
+        --NumLiveRegs;
         LiveRegDefs[I->Reg] = NULL;
         LiveRegCycles[I->Reg] = 0;
       }
@@ -460,7 +463,7 @@
 /// whatever is necessary (i.e. backtracking or cloning) to make it possible.
 bool ScheduleDAGFast::DelayForLiveRegsBottomUp(SUnit *SU,
                                                SmallVector<unsigned, 4> &LRegs){
-  if (LiveRegs.empty())
+  if (NumLiveRegs == 0)
     return false;
 
   SmallSet<unsigned, 4> RegAdded;
@@ -469,13 +472,13 @@
        I != E; ++I) {
     if (I->Cost < 0)  {
       unsigned Reg = I->Reg;
-      if (LiveRegs.count(Reg) && LiveRegDefs[Reg] != I->Dep) {
+      if (LiveRegDefs[Reg] && LiveRegDefs[Reg] != I->Dep) {
         if (RegAdded.insert(Reg))
           LRegs.push_back(Reg);
       }
       for (const unsigned *Alias = TRI->getAliasSet(Reg);
            *Alias; ++Alias)
-        if (LiveRegs.count(*Alias) && LiveRegDefs[*Alias] != I->Dep) {
+        if (LiveRegDefs[*Alias] && LiveRegDefs[*Alias] != I->Dep) {
           if (RegAdded.insert(*Alias))
             LRegs.push_back(*Alias);
         }
@@ -490,13 +493,13 @@
     if (!TID.ImplicitDefs)
       continue;
     for (const unsigned *Reg = TID.ImplicitDefs; *Reg; ++Reg) {
-      if (LiveRegs.count(*Reg) && LiveRegDefs[*Reg] != SU) {
+      if (LiveRegDefs[*Reg] && LiveRegDefs[*Reg] != SU) {
         if (RegAdded.insert(*Reg))
           LRegs.push_back(*Reg);
       }
       for (const unsigned *Alias = TRI->getAliasSet(*Reg);
            *Alias; ++Alias)
-        if (LiveRegs.count(*Alias) && LiveRegDefs[*Alias] != SU) {
+        if (LiveRegDefs[*Alias] && LiveRegDefs[*Alias] != SU) {
           if (RegAdded.insert(*Alias))
             LRegs.push_back(*Alias);
         }

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp Tue Sep 23 13:50:48 2008
@@ -66,10 +66,10 @@
   /// AvailableQueue - The priority queue to use for the available SUnits.
   SchedulingPriorityQueue *AvailableQueue;
 
-  /// LiveRegs / LiveRegDefs - A set of physical registers and their definition
+  /// LiveRegDefs - A set of physical registers and their definition
   /// that are "live". These nodes must be scheduled before any other nodes that
   /// modifies the registers can be scheduled.
-  SmallSet<unsigned, 4> LiveRegs;
+  unsigned NumLiveRegs;
   std::vector<SUnit*> LiveRegDefs;
   std::vector<unsigned> LiveRegCycles;
 
@@ -178,6 +178,7 @@
 void ScheduleDAGRRList::Schedule() {
   DOUT << "********** List Scheduling **********\n";
 
+  NumLiveRegs = 0;
   LiveRegDefs.resize(TRI->getNumRegs(), NULL);  
   LiveRegCycles.resize(TRI->getNumRegs(), 0);
 
@@ -308,7 +309,8 @@
       // expensive to copy the register. Make sure nothing that can 
       // clobber the register is scheduled between the predecessor and
       // this node.
-      if (LiveRegs.insert(I->Reg)) {
+      if (!LiveRegDefs[I->Reg]) {
+        ++NumLiveRegs;
         LiveRegDefs[I->Reg] = I->Dep;
         LiveRegCycles[I->Reg] = CurCycle;
       }
@@ -320,9 +322,10 @@
        I != E; ++I) {
     if (I->Cost < 0)  {
       if (LiveRegCycles[I->Reg] == I->Dep->Cycle) {
-        LiveRegs.erase(I->Reg);
+        assert(NumLiveRegs > 0 && "NumLiveRegs is already zero!");
         assert(LiveRegDefs[I->Reg] == SU &&
                "Physical register dependency violated?");
+        --NumLiveRegs;
         LiveRegDefs[I->Reg] = NULL;
         LiveRegCycles[I->Reg] = 0;
       }
@@ -367,9 +370,10 @@
        I != E; ++I) {
     CapturePred(I->Dep, SU, I->isCtrl);
     if (I->Cost < 0 && SU->Cycle == LiveRegCycles[I->Reg])  {
-      LiveRegs.erase(I->Reg);
+      assert(NumLiveRegs > 0 && "NumLiveRegs is already zero!");
       assert(LiveRegDefs[I->Reg] == I->Dep &&
              "Physical register dependency violated?");
+      --NumLiveRegs;
       LiveRegDefs[I->Reg] = NULL;
       LiveRegCycles[I->Reg] = 0;
     }
@@ -378,10 +382,9 @@
   for (SUnit::succ_iterator I = SU->Succs.begin(), E = SU->Succs.end();
        I != E; ++I) {
     if (I->Cost < 0)  {
-      if (LiveRegs.insert(I->Reg)) {
-        assert(!LiveRegDefs[I->Reg] &&
-               "Physical register dependency violated?");
+      if (!LiveRegDefs[I->Reg]) {
         LiveRegDefs[I->Reg] = SU;
+        ++NumLiveRegs;
       }
       if (I->Dep->Cycle < LiveRegCycles[I->Reg])
         LiveRegCycles[I->Reg] = I->Dep->Cycle;
@@ -878,7 +881,7 @@
 /// whatever is necessary (i.e. backtracking or cloning) to make it possible.
 bool ScheduleDAGRRList::DelayForLiveRegsBottomUp(SUnit *SU,
                                                  SmallVector<unsigned, 4> &LRegs){
-  if (LiveRegs.empty())
+  if (NumLiveRegs == 0)
     return false;
 
   SmallSet<unsigned, 4> RegAdded;
@@ -887,13 +890,13 @@
        I != E; ++I) {
     if (I->Cost < 0)  {
       unsigned Reg = I->Reg;
-      if (LiveRegs.count(Reg) && LiveRegDefs[Reg] != I->Dep) {
+      if (LiveRegDefs[Reg] && LiveRegDefs[Reg] != I->Dep) {
         if (RegAdded.insert(Reg))
           LRegs.push_back(Reg);
       }
       for (const unsigned *Alias = TRI->getAliasSet(Reg);
            *Alias; ++Alias)
-        if (LiveRegs.count(*Alias) && LiveRegDefs[*Alias] != I->Dep) {
+        if (LiveRegDefs[*Alias] && LiveRegDefs[*Alias] != I->Dep) {
           if (RegAdded.insert(*Alias))
             LRegs.push_back(*Alias);
         }
@@ -908,13 +911,13 @@
     if (!TID.ImplicitDefs)
       continue;
     for (const unsigned *Reg = TID.ImplicitDefs; *Reg; ++Reg) {
-      if (LiveRegs.count(*Reg) && LiveRegDefs[*Reg] != SU) {
+      if (LiveRegDefs[*Reg] && LiveRegDefs[*Reg] != SU) {
         if (RegAdded.insert(*Reg))
           LRegs.push_back(*Reg);
       }
       for (const unsigned *Alias = TRI->getAliasSet(*Reg);
            *Alias; ++Alias)
-        if (LiveRegs.count(*Alias) && LiveRegDefs[*Alias] != SU) {
+        if (LiveRegDefs[*Alias] && LiveRegDefs[*Alias] != SU) {
           if (RegAdded.insert(*Alias))
             LRegs.push_back(*Alias);
         }




From sabre at nondot.org  Tue Sep 23 16:18:08 2008
From: sabre at nondot.org (Chris Lattner)
Date: Tue, 23 Sep 2008 21:18:08 -0000
Subject: [llvm-commits] [llvm] r56501 - in /llvm/trunk:
 include/llvm/ParameterAttributes.h lib/AsmParser/llvmAsmParser.y
Message-ID: <200809232118.m8NLI8gO027591@zion.cs.uiuc.edu>

Author: lattner
Date: Tue Sep 23 16:18:08 2008
New Revision: 56501

URL: http://llvm.org/viewvc/llvm-project?rev=56501&view=rev
Log:
allow inreg on the result of a function

Modified:
    llvm/trunk/include/llvm/ParameterAttributes.h
    llvm/trunk/lib/AsmParser/llvmAsmParser.y

Modified: llvm/trunk/include/llvm/ParameterAttributes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ParameterAttributes.h?rev=56501&r1=56500&r2=56501&view=diff

==============================================================================
--- llvm/trunk/include/llvm/ParameterAttributes.h (original)
+++ llvm/trunk/include/llvm/ParameterAttributes.h Tue Sep 23 16:18:08 2008
@@ -48,7 +48,7 @@
                                     // 0 = unknown, else in clear (not log)
 
 /// @brief Attributes that only apply to function parameters.
-const Attributes ParameterOnly = ByVal | InReg | Nest | StructRet;
+const Attributes ParameterOnly = ByVal | Nest | StructRet;
 
 /// @brief Attributes that only apply to function return values.
 const Attributes ReturnOnly = NoReturn | NoUnwind | ReadNone | ReadOnly;

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

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.y (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.y Tue Sep 23 16:18:08 2008
@@ -1282,6 +1282,7 @@
 
 FuncAttr      : NORETURN { $$ = ParamAttr::NoReturn; }
               | NOUNWIND { $$ = ParamAttr::NoUnwind; }
+              | INREG    { $$ = ParamAttr::InReg;     }
               | ZEROEXT  { $$ = ParamAttr::ZExt;     }
               | SIGNEXT  { $$ = ParamAttr::SExt;     }
               | READNONE { $$ = ParamAttr::ReadNone; }




From sabre at nondot.org  Tue Sep 23 16:18:31 2008
From: sabre at nondot.org (Chris Lattner)
Date: Tue, 23 Sep 2008 21:18:31 -0000
Subject: [llvm-commits] [llvm] r56502 - in /llvm/trunk/lib/AsmParser:
 llvmAsmParser.cpp.cvs llvmAsmParser.h.cvs llvmAsmParser.y.cvs
Message-ID: <200809232118.m8NLIWi2027613@zion.cs.uiuc.edu>

Author: lattner
Date: Tue Sep 23 16:18:31 2008
New Revision: 56502

URL: http://llvm.org/viewvc/llvm-project?rev=56502&view=rev
Log:
regenerate

Modified:
    llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs
    llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs
    llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs

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

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs Tue Sep 23 16:18:31 2008
@@ -400,7 +400,7 @@
 
 
 /* Copy the first part of user declarations.  */
-#line 14 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 14 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
 
 #include "ParserInternals.h"
 #include "llvm/CallingConv.h"
@@ -1377,7 +1377,7 @@
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 970 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 970 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
@@ -1655,16 +1655,16 @@
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  44
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   2421
+#define YYLAST   2384
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  176
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  90
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  353
+#define YYNRULES  354
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  720
+#define YYNSTATES  721
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
@@ -1737,30 +1737,30 @@
      179,   181,   183,   184,   186,   188,   190,   192,   193,   195,
      197,   198,   200,   202,   204,   206,   208,   210,   213,   215,
      217,   219,   221,   223,   225,   227,   229,   231,   234,   235,
-     238,   240,   242,   244,   246,   248,   250,   251,   254,   256,
-     260,   264,   268,   270,   271,   276,   277,   280,   281,   284,
-     285,   289,   292,   293,   295,   296,   300,   302,   305,   307,
-     309,   311,   313,   315,   317,   319,   321,   323,   327,   329,
-     332,   338,   344,   350,   356,   360,   363,   369,   374,   377,
-     379,   381,   383,   387,   389,   393,   395,   396,   398,   402,
-     407,   411,   415,   420,   425,   429,   436,   442,   445,   448,
-     451,   454,   457,   460,   463,   466,   469,   472,   475,   478,
-     485,   491,   500,   507,   514,   522,   530,   538,   546,   553,
-     562,   571,   577,   585,   589,   591,   593,   595,   597,   598,
-     601,   608,   610,   611,   613,   616,   617,   621,   622,   626,
-     630,   634,   638,   639,   648,   649,   659,   660,   670,   676,
-     679,   683,   685,   689,   693,   697,   701,   703,   704,   710,
-     714,   716,   720,   722,   723,   735,   737,   739,   744,   746,
-     748,   751,   755,   756,   758,   760,   762,   764,   766,   768,
-     770,   772,   774,   776,   778,   782,   786,   789,   792,   796,
-     799,   805,   810,   812,   818,   820,   822,   824,   826,   828,
-     830,   833,   835,   839,   842,   845,   849,   853,   856,   857,
-     859,   862,   865,   869,   879,   889,   898,   913,   915,   917,
-     924,   930,   933,   936,   943,   951,   956,   961,   968,   975,
-     976,   977,   981,   984,   988,   991,   993,   999,  1005,  1012,
-    1019,  1026,  1033,  1038,  1045,  1050,  1055,  1062,  1069,  1072,
-    1081,  1083,  1085,  1086,  1090,  1097,  1101,  1108,  1111,  1117,
-    1125,  1131,  1136,  1141
+     238,   240,   242,   244,   246,   248,   250,   252,   253,   256,
+     258,   262,   266,   270,   272,   273,   278,   279,   282,   283,
+     286,   287,   291,   294,   295,   297,   298,   302,   304,   307,
+     309,   311,   313,   315,   317,   319,   321,   323,   325,   329,
+     331,   334,   340,   346,   352,   358,   362,   365,   371,   376,
+     379,   381,   383,   385,   389,   391,   395,   397,   398,   400,
+     404,   409,   413,   417,   422,   427,   431,   438,   444,   447,
+     450,   453,   456,   459,   462,   465,   468,   471,   474,   477,
+     480,   487,   493,   502,   509,   516,   524,   532,   540,   548,
+     555,   564,   573,   579,   587,   591,   593,   595,   597,   599,
+     600,   603,   610,   612,   613,   615,   618,   619,   623,   624,
+     628,   632,   636,   640,   641,   650,   651,   661,   662,   672,
+     678,   681,   685,   687,   691,   695,   699,   703,   705,   706,
+     712,   716,   718,   722,   724,   725,   737,   739,   741,   746,
+     748,   750,   753,   757,   758,   760,   762,   764,   766,   768,
+     770,   772,   774,   776,   778,   780,   784,   788,   791,   794,
+     798,   801,   807,   812,   814,   820,   822,   824,   826,   828,
+     830,   832,   835,   837,   841,   844,   847,   851,   855,   858,
+     859,   861,   864,   867,   871,   881,   891,   900,   915,   917,
+     919,   926,   932,   935,   938,   945,   953,   958,   963,   970,
+     977,   978,   979,   983,   986,   990,   993,   995,  1001,  1007,
+    1014,  1021,  1028,  1035,  1040,  1047,  1052,  1057,  1064,  1071,
+    1074,  1083,  1085,  1087,  1088,  1092,  1099,  1103,  1110,  1113,
+    1119,  1127,  1133,  1138,  1143
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
@@ -1790,97 +1790,98 @@
       62,     4,    -1,   143,    -1,   122,    -1,   142,    -1,   123,
       -1,   145,    -1,   146,    -1,   148,    -1,   149,    -1,   150,
       -1,    54,     4,    -1,    -1,   200,   199,    -1,   144,    -1,
-     147,    -1,   143,    -1,   142,    -1,   151,    -1,   152,    -1,
-      -1,   202,   201,    -1,   204,    -1,   203,   165,   204,    -1,
-     155,   164,   157,    -1,   155,   164,   156,    -1,   158,    -1,
-      -1,   154,   162,   203,   163,    -1,    -1,   153,    22,    -1,
-      -1,    54,     4,    -1,    -1,   165,    54,     4,    -1,    34,
-      22,    -1,    -1,   209,    -1,    -1,   165,   212,   211,    -1,
-     209,    -1,    54,     4,    -1,    11,    -1,    12,    -1,    13,
-      -1,    16,    -1,    15,    -1,    14,    -1,    17,    -1,    50,
-      -1,   213,    -1,   214,   186,   166,    -1,   248,    -1,   167,
-       4,    -1,   214,   162,   218,   163,   202,    -1,    10,   162,
-     218,   163,   202,    -1,   168,     4,   169,   214,   170,    -1,
-     171,     4,   169,   214,   172,    -1,   173,   219,   174,    -1,
-     173,   174,    -1,   171,   173,   219,   174,   172,    -1,   171,
-     173,   174,   172,    -1,   214,   200,    -1,   214,    -1,    10,
-      -1,   215,    -1,   217,   165,   215,    -1,   217,    -1,   217,
-     165,    39,    -1,    39,    -1,    -1,   214,    -1,   219,   165,
-     214,    -1,   214,   168,   222,   170,    -1,   214,   168,   170,
-      -1,   214,   175,    22,    -1,   214,   171,   222,   172,    -1,
-     214,   173,   222,   174,    -1,   214,   173,   174,    -1,   214,
-     171,   173,   222,   174,   172,    -1,   214,   171,   173,   174,
-     172,    -1,   214,    40,    -1,   214,    41,    -1,   214,   248,
-      -1,   214,   221,    -1,   214,    25,    -1,   182,     3,    -1,
-     182,     5,    -1,   182,     4,    -1,   182,     6,    -1,    11,
-      26,    -1,    11,    27,    -1,   183,     9,    -1,   179,   162,
-     220,    38,   214,   163,    -1,   120,   162,   220,   260,   163,
-      -1,   134,   162,   220,   165,   220,   165,   220,   163,    -1,
-     177,   162,   220,   165,   220,   163,    -1,   178,   162,   220,
-     165,   220,   163,    -1,    91,   180,   162,   220,   165,   220,
-     163,    -1,    92,   181,   162,   220,   165,   220,   163,    -1,
-      93,   180,   162,   220,   165,   220,   163,    -1,    94,   181,
-     162,   220,   165,   220,   163,    -1,   136,   162,   220,   165,
-     220,   163,    -1,   137,   162,   220,   165,   220,   165,   220,
-     163,    -1,   138,   162,   220,   165,   220,   165,   220,   163,
-      -1,   140,   162,   220,   261,   163,    -1,   141,   162,   220,
-     165,   220,   261,   163,    -1,   222,   165,   220,    -1,   220,
-      -1,    32,    -1,    33,    -1,    37,    -1,    -1,   216,   248,
-      -1,   126,   162,   225,    38,   214,   163,    -1,   227,    -1,
-      -1,   228,    -1,   227,   228,    -1,    -1,    31,   229,   244,
-      -1,    -1,    30,   230,   245,    -1,    60,    59,   234,    -1,
-     187,    18,   214,    -1,   187,    18,    10,    -1,    -1,   190,
-     194,   224,   223,   220,   186,   231,   211,    -1,    -1,   190,
-     192,   194,   224,   223,   220,   186,   232,   211,    -1,    -1,
-     190,   193,   194,   224,   223,   214,   186,   233,   211,    -1,
-     190,   194,    35,   197,   225,    -1,    52,   235,    -1,    56,
-     164,   236,    -1,    22,    -1,    53,   164,    22,    -1,    69,
-     164,    22,    -1,   168,   237,   170,    -1,   237,   165,    22,
-      -1,    22,    -1,    -1,   238,   165,   214,   200,   185,    -1,
-     214,   200,   185,    -1,   238,    -1,   238,   165,    39,    -1,
-      39,    -1,    -1,   198,   216,   189,   162,   239,   163,   202,
-     210,   207,   206,   205,    -1,    28,    -1,   173,    -1,   196,
-     194,   240,   241,    -1,    29,    -1,   174,    -1,   252,   243,
-      -1,   195,   194,   240,    -1,    -1,    61,    -1,     3,    -1,
-       4,    -1,     5,    -1,     6,    -1,     9,    -1,    26,    -1,
-      27,    -1,    40,    -1,    41,    -1,    25,    -1,   171,   222,
-     172,    -1,   168,   222,   170,    -1,   168,   170,    -1,   175,
-      22,    -1,   173,   222,   174,    -1,   173,   174,    -1,   171,
-     173,   222,   174,   172,    -1,   171,   173,   174,   172,    -1,
-     221,    -1,    59,   246,    22,   165,    22,    -1,     7,    -1,
-       8,    -1,   184,    -1,   189,    -1,   248,    -1,   247,    -1,
-     214,   249,    -1,   250,    -1,   251,   165,   250,    -1,   252,
-     253,    -1,   242,   253,    -1,   254,   187,   255,    -1,   254,
-     188,   255,    -1,   254,   257,    -1,    -1,    21,    -1,    70,
-     251,    -1,    70,    10,    -1,    71,    17,   249,    -1,    71,
-      11,   249,   165,    17,   249,   165,    17,   249,    -1,    72,
-     182,   249,   165,    17,   249,   168,   256,   170,    -1,    72,
-     182,   249,   165,    17,   249,   168,   170,    -1,    73,   198,
-     216,   249,   162,   259,   163,   202,    38,    17,   249,    74,
-      17,   249,    -1,    74,    -1,    75,    -1,   256,   182,   247,
-     165,    17,   249,    -1,   182,   247,   165,    17,   249,    -1,
-     187,   263,    -1,   188,   263,    -1,   214,   168,   249,   165,
-     249,   170,    -1,   258,   165,   168,   249,   165,   249,   170,
-      -1,   214,   200,   249,   200,    -1,    17,   200,   249,   200,
-      -1,   259,   165,   214,   200,   249,   200,    -1,   259,   165,
-      17,   200,   249,   200,    -1,    -1,    -1,   260,   165,   250,
-      -1,   165,     4,    -1,   261,   165,     4,    -1,    58,    57,
-      -1,    57,    -1,   177,   214,   249,   165,   249,    -1,   178,
-     214,   249,   165,   249,    -1,    91,   180,   214,   249,   165,
-     249,    -1,    92,   181,   214,   249,   165,   249,    -1,    93,
-     180,   214,   249,   165,   249,    -1,    94,   181,   214,   249,
-     165,   249,    -1,   179,   250,    38,   214,    -1,   134,   250,
-     165,   250,   165,   250,    -1,   135,   250,   165,   214,    -1,
-     136,   250,   165,   250,    -1,   137,   250,   165,   250,   165,
-     250,    -1,   138,   250,   165,   250,   165,   250,    -1,   133,
-     258,    -1,   262,   198,   216,   249,   162,   259,   163,   202,
-      -1,   265,    -1,    36,    -1,    -1,   115,   214,   208,    -1,
-     115,   214,   165,    11,   249,   208,    -1,   116,   214,   208,
-      -1,   116,   214,   165,    11,   249,   208,    -1,   117,   250,
-      -1,   264,   118,   214,   249,   208,    -1,   264,   119,   250,
-     165,   214,   249,   208,    -1,   139,   214,   249,   165,     4,
-      -1,   120,   214,   249,   260,    -1,   140,   214,   249,   261,
-      -1,   141,   214,   249,   165,   214,   249,   261,    -1
+     147,    -1,   145,    -1,   143,    -1,   142,    -1,   151,    -1,
+     152,    -1,    -1,   202,   201,    -1,   204,    -1,   203,   165,
+     204,    -1,   155,   164,   157,    -1,   155,   164,   156,    -1,
+     158,    -1,    -1,   154,   162,   203,   163,    -1,    -1,   153,
+      22,    -1,    -1,    54,     4,    -1,    -1,   165,    54,     4,
+      -1,    34,    22,    -1,    -1,   209,    -1,    -1,   165,   212,
+     211,    -1,   209,    -1,    54,     4,    -1,    11,    -1,    12,
+      -1,    13,    -1,    16,    -1,    15,    -1,    14,    -1,    17,
+      -1,    50,    -1,   213,    -1,   214,   186,   166,    -1,   248,
+      -1,   167,     4,    -1,   214,   162,   218,   163,   202,    -1,
+      10,   162,   218,   163,   202,    -1,   168,     4,   169,   214,
+     170,    -1,   171,     4,   169,   214,   172,    -1,   173,   219,
+     174,    -1,   173,   174,    -1,   171,   173,   219,   174,   172,
+      -1,   171,   173,   174,   172,    -1,   214,   200,    -1,   214,
+      -1,    10,    -1,   215,    -1,   217,   165,   215,    -1,   217,
+      -1,   217,   165,    39,    -1,    39,    -1,    -1,   214,    -1,
+     219,   165,   214,    -1,   214,   168,   222,   170,    -1,   214,
+     168,   170,    -1,   214,   175,    22,    -1,   214,   171,   222,
+     172,    -1,   214,   173,   222,   174,    -1,   214,   173,   174,
+      -1,   214,   171,   173,   222,   174,   172,    -1,   214,   171,
+     173,   174,   172,    -1,   214,    40,    -1,   214,    41,    -1,
+     214,   248,    -1,   214,   221,    -1,   214,    25,    -1,   182,
+       3,    -1,   182,     5,    -1,   182,     4,    -1,   182,     6,
+      -1,    11,    26,    -1,    11,    27,    -1,   183,     9,    -1,
+     179,   162,   220,    38,   214,   163,    -1,   120,   162,   220,
+     260,   163,    -1,   134,   162,   220,   165,   220,   165,   220,
+     163,    -1,   177,   162,   220,   165,   220,   163,    -1,   178,
+     162,   220,   165,   220,   163,    -1,    91,   180,   162,   220,
+     165,   220,   163,    -1,    92,   181,   162,   220,   165,   220,
+     163,    -1,    93,   180,   162,   220,   165,   220,   163,    -1,
+      94,   181,   162,   220,   165,   220,   163,    -1,   136,   162,
+     220,   165,   220,   163,    -1,   137,   162,   220,   165,   220,
+     165,   220,   163,    -1,   138,   162,   220,   165,   220,   165,
+     220,   163,    -1,   140,   162,   220,   261,   163,    -1,   141,
+     162,   220,   165,   220,   261,   163,    -1,   222,   165,   220,
+      -1,   220,    -1,    32,    -1,    33,    -1,    37,    -1,    -1,
+     216,   248,    -1,   126,   162,   225,    38,   214,   163,    -1,
+     227,    -1,    -1,   228,    -1,   227,   228,    -1,    -1,    31,
+     229,   244,    -1,    -1,    30,   230,   245,    -1,    60,    59,
+     234,    -1,   187,    18,   214,    -1,   187,    18,    10,    -1,
+      -1,   190,   194,   224,   223,   220,   186,   231,   211,    -1,
+      -1,   190,   192,   194,   224,   223,   220,   186,   232,   211,
+      -1,    -1,   190,   193,   194,   224,   223,   214,   186,   233,
+     211,    -1,   190,   194,    35,   197,   225,    -1,    52,   235,
+      -1,    56,   164,   236,    -1,    22,    -1,    53,   164,    22,
+      -1,    69,   164,    22,    -1,   168,   237,   170,    -1,   237,
+     165,    22,    -1,    22,    -1,    -1,   238,   165,   214,   200,
+     185,    -1,   214,   200,   185,    -1,   238,    -1,   238,   165,
+      39,    -1,    39,    -1,    -1,   198,   216,   189,   162,   239,
+     163,   202,   210,   207,   206,   205,    -1,    28,    -1,   173,
+      -1,   196,   194,   240,   241,    -1,    29,    -1,   174,    -1,
+     252,   243,    -1,   195,   194,   240,    -1,    -1,    61,    -1,
+       3,    -1,     4,    -1,     5,    -1,     6,    -1,     9,    -1,
+      26,    -1,    27,    -1,    40,    -1,    41,    -1,    25,    -1,
+     171,   222,   172,    -1,   168,   222,   170,    -1,   168,   170,
+      -1,   175,    22,    -1,   173,   222,   174,    -1,   173,   174,
+      -1,   171,   173,   222,   174,   172,    -1,   171,   173,   174,
+     172,    -1,   221,    -1,    59,   246,    22,   165,    22,    -1,
+       7,    -1,     8,    -1,   184,    -1,   189,    -1,   248,    -1,
+     247,    -1,   214,   249,    -1,   250,    -1,   251,   165,   250,
+      -1,   252,   253,    -1,   242,   253,    -1,   254,   187,   255,
+      -1,   254,   188,   255,    -1,   254,   257,    -1,    -1,    21,
+      -1,    70,   251,    -1,    70,    10,    -1,    71,    17,   249,
+      -1,    71,    11,   249,   165,    17,   249,   165,    17,   249,
+      -1,    72,   182,   249,   165,    17,   249,   168,   256,   170,
+      -1,    72,   182,   249,   165,    17,   249,   168,   170,    -1,
+      73,   198,   216,   249,   162,   259,   163,   202,    38,    17,
+     249,    74,    17,   249,    -1,    74,    -1,    75,    -1,   256,
+     182,   247,   165,    17,   249,    -1,   182,   247,   165,    17,
+     249,    -1,   187,   263,    -1,   188,   263,    -1,   214,   168,
+     249,   165,   249,   170,    -1,   258,   165,   168,   249,   165,
+     249,   170,    -1,   214,   200,   249,   200,    -1,    17,   200,
+     249,   200,    -1,   259,   165,   214,   200,   249,   200,    -1,
+     259,   165,    17,   200,   249,   200,    -1,    -1,    -1,   260,
+     165,   250,    -1,   165,     4,    -1,   261,   165,     4,    -1,
+      58,    57,    -1,    57,    -1,   177,   214,   249,   165,   249,
+      -1,   178,   214,   249,   165,   249,    -1,    91,   180,   214,
+     249,   165,   249,    -1,    92,   181,   214,   249,   165,   249,
+      -1,    93,   180,   214,   249,   165,   249,    -1,    94,   181,
+     214,   249,   165,   249,    -1,   179,   250,    38,   214,    -1,
+     134,   250,   165,   250,   165,   250,    -1,   135,   250,   165,
+     214,    -1,   136,   250,   165,   250,    -1,   137,   250,   165,
+     250,   165,   250,    -1,   138,   250,   165,   250,   165,   250,
+      -1,   133,   258,    -1,   262,   198,   216,   249,   162,   259,
+     163,   202,    -1,   265,    -1,    36,    -1,    -1,   115,   214,
+     208,    -1,   115,   214,   165,    11,   249,   208,    -1,   116,
+     214,   208,    -1,   116,   214,   165,    11,   249,   208,    -1,
+     117,   250,    -1,   264,   118,   214,   249,   208,    -1,   264,
+     119,   250,   165,   214,   249,   208,    -1,   139,   214,   249,
+     165,     4,    -1,   120,   214,   249,   260,    -1,   140,   214,
+     249,   261,    -1,   141,   214,   249,   165,   214,   249,   261,
+      -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
@@ -1898,30 +1899,30 @@
     1232,  1233,  1237,  1238,  1239,  1240,  1241,  1245,  1246,  1247,
     1250,  1251,  1252,  1253,  1254,  1255,  1256,  1257,  1264,  1265,
     1266,  1267,  1268,  1269,  1270,  1271,  1272,  1273,  1277,  1278,
-    1283,  1284,  1285,  1286,  1287,  1288,  1291,  1292,  1297,  1298,
-    1309,  1310,  1311,  1314,  1315,  1320,  1321,  1328,  1329,  1335,
-    1336,  1345,  1353,  1354,  1359,  1360,  1361,  1366,  1379,  1379,
-    1379,  1379,  1379,  1379,  1379,  1382,  1386,  1390,  1397,  1402,
-    1410,  1439,  1464,  1469,  1479,  1489,  1493,  1503,  1510,  1519,
-    1526,  1531,  1536,  1543,  1544,  1551,  1558,  1566,  1572,  1584,
-    1612,  1628,  1655,  1683,  1709,  1729,  1755,  1775,  1787,  1794,
-    1860,  1870,  1880,  1886,  1896,  1902,  1912,  1918,  1924,  1937,
-    1949,  1970,  1978,  1984,  1995,  2000,  2005,  2010,  2015,  2021,
-    2027,  2033,  2041,  2052,  2056,  2064,  2064,  2067,  2067,  2070,
-    2082,  2103,  2108,  2116,  2117,  2121,  2121,  2125,  2125,  2128,
-    2131,  2155,  2167,  2166,  2178,  2177,  2187,  2186,  2197,  2237,
-    2240,  2246,  2256,  2260,  2265,  2267,  2272,  2277,  2286,  2296,
-    2307,  2311,  2320,  2329,  2334,  2466,  2466,  2468,  2477,  2477,
-    2479,  2484,  2496,  2500,  2505,  2509,  2513,  2518,  2523,  2527,
-    2531,  2535,  2539,  2543,  2547,  2569,  2591,  2597,  2610,  2622,
-    2627,  2639,  2645,  2649,  2659,  2663,  2667,  2672,  2679,  2679,
-    2685,  2694,  2699,  2704,  2708,  2717,  2726,  2739,  2748,  2752,
-    2760,  2780,  2784,  2789,  2800,  2819,  2828,  2914,  2918,  2925,
-    2936,  2949,  2958,  2971,  2982,  2992,  3003,  3011,  3021,  3028,
-    3031,  3032,  3040,  3046,  3055,  3059,  3064,  3080,  3097,  3109,
-    3121,  3135,  3149,  3161,  3182,  3189,  3195,  3201,  3207,  3222,
-    3312,  3317,  3321,  3328,  3335,  3345,  3352,  3362,  3370,  3384,
-    3401,  3415,  3430,  3445
+    1283,  1284,  1285,  1286,  1287,  1288,  1289,  1292,  1293,  1298,
+    1299,  1310,  1311,  1312,  1315,  1316,  1321,  1322,  1329,  1330,
+    1336,  1337,  1346,  1354,  1355,  1360,  1361,  1362,  1367,  1380,
+    1380,  1380,  1380,  1380,  1380,  1380,  1383,  1387,  1391,  1398,
+    1403,  1411,  1440,  1465,  1470,  1480,  1490,  1494,  1504,  1511,
+    1520,  1527,  1532,  1537,  1544,  1545,  1552,  1559,  1567,  1573,
+    1585,  1613,  1629,  1656,  1684,  1710,  1730,  1756,  1776,  1788,
+    1795,  1861,  1871,  1881,  1887,  1897,  1903,  1913,  1919,  1925,
+    1938,  1950,  1971,  1979,  1985,  1996,  2001,  2006,  2011,  2016,
+    2022,  2028,  2034,  2042,  2053,  2057,  2065,  2065,  2068,  2068,
+    2071,  2083,  2104,  2109,  2117,  2118,  2122,  2122,  2126,  2126,
+    2129,  2132,  2156,  2168,  2167,  2179,  2178,  2188,  2187,  2198,
+    2238,  2241,  2247,  2257,  2261,  2266,  2268,  2273,  2278,  2287,
+    2297,  2308,  2312,  2321,  2330,  2335,  2467,  2467,  2469,  2478,
+    2478,  2480,  2485,  2497,  2501,  2506,  2510,  2514,  2519,  2524,
+    2528,  2532,  2536,  2540,  2544,  2548,  2570,  2592,  2598,  2611,
+    2623,  2628,  2640,  2646,  2650,  2660,  2664,  2668,  2673,  2680,
+    2680,  2686,  2695,  2700,  2705,  2709,  2718,  2727,  2740,  2749,
+    2753,  2761,  2781,  2785,  2790,  2801,  2820,  2829,  2915,  2919,
+    2926,  2937,  2950,  2959,  2972,  2983,  2993,  3004,  3012,  3022,
+    3029,  3032,  3033,  3041,  3047,  3056,  3060,  3065,  3081,  3098,
+    3110,  3122,  3136,  3150,  3162,  3183,  3190,  3196,  3202,  3208,
+    3223,  3313,  3318,  3322,  3329,  3336,  3346,  3353,  3363,  3371,
+    3385,  3402,  3416,  3431,  3446
 };
 #endif
 
@@ -2020,30 +2021,30 @@
      195,   195,   196,   196,   196,   196,   196,   197,   197,   197,
      198,   198,   198,   198,   198,   198,   198,   198,   199,   199,
      199,   199,   199,   199,   199,   199,   199,   199,   200,   200,
-     201,   201,   201,   201,   201,   201,   202,   202,   203,   203,
-     204,   204,   204,   205,   205,   206,   206,   207,   207,   208,
-     208,   209,   210,   210,   211,   211,   212,   212,   213,   213,
-     213,   213,   213,   213,   213,   214,   214,   214,   214,   214,
-     214,   214,   214,   214,   214,   214,   214,   214,   215,   216,
-     216,   217,   217,   218,   218,   218,   218,   219,   219,   220,
+     201,   201,   201,   201,   201,   201,   201,   202,   202,   203,
+     203,   204,   204,   204,   205,   205,   206,   206,   207,   207,
+     208,   208,   209,   210,   210,   211,   211,   212,   212,   213,
+     213,   213,   213,   213,   213,   213,   214,   214,   214,   214,
+     214,   214,   214,   214,   214,   214,   214,   214,   214,   215,
+     216,   216,   217,   217,   218,   218,   218,   218,   219,   219,
+     220,   220,   220,   220,   220,   220,   220,   220,   220,   220,
      220,   220,   220,   220,   220,   220,   220,   220,   220,   220,
-     220,   220,   220,   220,   220,   220,   220,   220,   220,   221,
      221,   221,   221,   221,   221,   221,   221,   221,   221,   221,
-     221,   221,   221,   222,   222,   223,   223,   224,   224,   225,
-     225,   226,   226,   227,   227,   229,   228,   230,   228,   228,
-     228,   228,   231,   228,   232,   228,   233,   228,   228,   228,
-     228,   234,   235,   235,   236,   237,   237,   237,   238,   238,
-     239,   239,   239,   239,   240,   241,   241,   242,   243,   243,
-     244,   245,   246,   246,   247,   247,   247,   247,   247,   247,
+     221,   221,   221,   221,   222,   222,   223,   223,   224,   224,
+     225,   225,   226,   226,   227,   227,   229,   228,   230,   228,
+     228,   228,   228,   231,   228,   232,   228,   233,   228,   228,
+     228,   228,   234,   235,   235,   236,   237,   237,   237,   238,
+     238,   239,   239,   239,   239,   240,   241,   241,   242,   243,
+     243,   244,   245,   246,   246,   247,   247,   247,   247,   247,
      247,   247,   247,   247,   247,   247,   247,   247,   247,   247,
-     247,   247,   247,   247,   248,   248,   248,   248,   249,   249,
-     250,   251,   251,   252,   252,   253,   253,   254,   254,   254,
-     255,   255,   255,   255,   255,   255,   255,   255,   255,   256,
-     256,   257,   257,   258,   258,   259,   259,   259,   259,   259,
-     260,   260,   261,   261,   262,   262,   263,   263,   263,   263,
+     247,   247,   247,   247,   247,   248,   248,   248,   248,   249,
+     249,   250,   251,   251,   252,   252,   253,   253,   254,   254,
+     254,   255,   255,   255,   255,   255,   255,   255,   255,   255,
+     256,   256,   257,   257,   258,   258,   259,   259,   259,   259,
+     259,   260,   260,   261,   261,   262,   262,   263,   263,   263,
      263,   263,   263,   263,   263,   263,   263,   263,   263,   263,
-     263,   264,   264,   265,   265,   265,   265,   265,   265,   265,
-     265,   265,   265,   265
+     263,   263,   264,   264,   265,   265,   265,   265,   265,   265,
+     265,   265,   265,   265,   265
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -2061,30 +2062,30 @@
        1,     1,     0,     1,     1,     1,     1,     0,     1,     1,
        0,     1,     1,     1,     1,     1,     1,     2,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     2,     0,     2,
-       1,     1,     1,     1,     1,     1,     0,     2,     1,     3,
-       3,     3,     1,     0,     4,     0,     2,     0,     2,     0,
-       3,     2,     0,     1,     0,     3,     1,     2,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     3,     1,     2,
-       5,     5,     5,     5,     3,     2,     5,     4,     2,     1,
-       1,     1,     3,     1,     3,     1,     0,     1,     3,     4,
-       3,     3,     4,     4,     3,     6,     5,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     6,
-       5,     8,     6,     6,     7,     7,     7,     7,     6,     8,
-       8,     5,     7,     3,     1,     1,     1,     1,     0,     2,
-       6,     1,     0,     1,     2,     0,     3,     0,     3,     3,
-       3,     3,     0,     8,     0,     9,     0,     9,     5,     2,
-       3,     1,     3,     3,     3,     3,     1,     0,     5,     3,
-       1,     3,     1,     0,    11,     1,     1,     4,     1,     1,
-       2,     3,     0,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     3,     3,     2,     2,     3,     2,
-       5,     4,     1,     5,     1,     1,     1,     1,     1,     1,
-       2,     1,     3,     2,     2,     3,     3,     2,     0,     1,
-       2,     2,     3,     9,     9,     8,    14,     1,     1,     6,
-       5,     2,     2,     6,     7,     4,     4,     6,     6,     0,
-       0,     3,     2,     3,     2,     1,     5,     5,     6,     6,
-       6,     6,     4,     6,     4,     4,     6,     6,     2,     8,
-       1,     1,     0,     3,     6,     3,     6,     2,     5,     7,
-       5,     4,     4,     7
+       1,     1,     1,     1,     1,     1,     1,     0,     2,     1,
+       3,     3,     3,     1,     0,     4,     0,     2,     0,     2,
+       0,     3,     2,     0,     1,     0,     3,     1,     2,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     3,     1,
+       2,     5,     5,     5,     5,     3,     2,     5,     4,     2,
+       1,     1,     1,     3,     1,     3,     1,     0,     1,     3,
+       4,     3,     3,     4,     4,     3,     6,     5,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       6,     5,     8,     6,     6,     7,     7,     7,     7,     6,
+       8,     8,     5,     7,     3,     1,     1,     1,     1,     0,
+       2,     6,     1,     0,     1,     2,     0,     3,     0,     3,
+       3,     3,     3,     0,     8,     0,     9,     0,     9,     5,
+       2,     3,     1,     3,     3,     3,     3,     1,     0,     5,
+       3,     1,     3,     1,     0,    11,     1,     1,     4,     1,
+       1,     2,     3,     0,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     3,     3,     2,     2,     3,
+       2,     5,     4,     1,     5,     1,     1,     1,     1,     1,
+       1,     2,     1,     3,     2,     2,     3,     3,     2,     0,
+       1,     2,     2,     3,     9,     9,     8,    14,     1,     1,
+       6,     5,     2,     2,     6,     7,     4,     4,     6,     6,
+       0,     0,     3,     2,     3,     2,     1,     5,     5,     6,
+       6,     6,     6,     4,     6,     4,     4,     6,     6,     2,
+       8,     1,     1,     0,     3,     6,     3,     6,     2,     5,
+       7,     5,     4,     4,     7
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -2092,344 +2093,320 @@
    means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
-      74,    61,    71,    62,    72,    63,   227,   225,     0,     0,
-       0,     0,     0,     0,    85,    73,     0,    74,   223,    89,
-      92,     0,     0,   239,     0,     0,    68,     0,    75,    76,
+      74,    61,    71,    62,    72,    63,   228,   226,     0,     0,
+       0,     0,     0,     0,    85,    73,     0,    74,   224,    89,
+      92,     0,     0,   240,     0,     0,    68,     0,    75,    76,
       78,    77,    79,    82,    80,    83,    81,    84,    86,    87,
-      88,    85,    85,   218,     1,   224,    90,    91,    85,   228,
-      93,    94,    95,    96,    85,   298,   226,   298,     0,     0,
-     247,   240,   241,   229,   284,   285,   231,   148,   149,   150,
-     153,   152,   151,   154,   155,     0,     0,     0,     0,   286,
-     287,   156,   230,   158,   218,   218,    97,   217,     0,   100,
-     100,   299,   294,    69,   258,   259,   260,   293,   242,   243,
-     246,     0,   176,   159,     0,     0,     0,     0,   165,   177,
-       0,     0,   176,     0,     0,     0,    99,    98,     0,   215,
-     216,     0,     0,   101,   102,   103,   104,   105,   106,     0,
-     261,     0,     0,   342,   342,   297,     0,   244,   175,   118,
-     171,   173,     0,     0,     0,     0,     0,     0,   164,     0,
-       0,   157,     0,     0,   170,     0,   169,     0,   238,   148,
-     149,   150,   153,   152,   151,     0,     0,    67,    67,   107,
-       0,   255,   256,   257,    70,   341,   325,     0,     0,     0,
-       0,   100,   307,   308,     2,     3,     4,     5,     6,     7,
+      88,    85,    85,   219,     1,   225,    90,    91,    85,   229,
+      93,    94,    95,    96,    85,   299,   227,   299,     0,     0,
+     248,   241,   242,   230,   285,   286,   232,   149,   150,   151,
+     154,   153,   152,   155,   156,     0,     0,     0,     0,   287,
+     288,   157,   231,   159,   219,   219,    97,   218,     0,   100,
+     100,   300,   295,    69,   259,   260,   261,   294,   243,   244,
+     247,     0,   177,   160,     0,     0,     0,     0,   166,   178,
+       0,     0,   177,     0,     0,     0,    99,    98,     0,   216,
+     217,     0,     0,   101,   102,   103,   104,   105,   106,     0,
+     262,     0,     0,   343,   343,   298,     0,   245,   176,   118,
+     172,   174,     0,     0,     0,     0,     0,     0,   165,     0,
+       0,   158,     0,     0,   171,     0,   170,     0,   239,   149,
+     150,   151,   154,   153,   152,     0,     0,    67,    67,   107,
+       0,   256,   257,   258,    70,   342,   326,     0,     0,     0,
+       0,   100,   308,   309,     2,     3,     4,     5,     6,     7,
        8,     9,    10,    14,    15,    16,    11,    12,    13,     0,
        0,     0,     0,     0,     0,     0,     0,    17,    18,    19,
       20,    21,    22,    23,    24,    25,    26,    27,    28,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   295,   100,   311,     0,   340,   296,   312,   245,   168,
-       0,   126,    67,    67,   167,     0,   178,     0,   126,    67,
-      67,     0,   219,   196,   197,   192,   194,   193,   195,   198,
-     191,   187,   188,     0,     0,     0,     0,     0,     0,     0,
+       0,   296,   100,   312,     0,   341,   297,   313,   246,   169,
+       0,   127,    67,    67,   168,     0,   179,     0,   127,    67,
+      67,     0,   220,   197,   198,   193,   195,   194,   196,   199,
+     192,   188,   189,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   190,   189,   232,     0,   324,   301,    67,   291,   300,
+       0,   191,   190,   233,     0,   325,   302,    67,   292,   301,
        0,     0,    55,     0,     0,    29,    30,    31,    32,    33,
       34,    35,    36,    37,    38,     0,    53,    54,    49,    50,
       51,    52,    39,    40,    41,    42,    43,    44,    45,    46,
-      47,    48,     0,     0,     0,   139,   139,   347,    67,    67,
-     338,     0,     0,     0,     0,     0,    67,    67,    67,    67,
+      47,    48,     0,     0,     0,   140,   140,   348,    67,    67,
+     339,     0,     0,     0,     0,     0,    67,    67,    67,    67,
       67,     0,     0,     0,     0,     0,   109,   111,   110,   108,
-     112,   113,   114,   115,   116,   119,   174,   172,   161,   162,
-     163,   166,    66,   160,   234,   236,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   180,   214,
-       0,     0,     0,   184,     0,   181,     0,     0,     0,   144,
-     253,   264,   265,   266,   267,   268,   273,   269,   270,   271,
-     272,   262,     0,     0,     0,     0,   282,   289,   288,   290,
-       0,     0,   302,     0,     0,    67,    67,    67,    67,     0,
-     343,     0,   345,   320,     0,     0,     0,     0,     0,     0,
+     112,   113,   114,   115,   116,   119,   175,   173,   162,   163,
+     164,   167,    66,   161,   235,   237,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   181,   215,
+       0,     0,     0,   185,     0,   182,     0,     0,     0,   145,
+     254,   265,   266,   267,   268,   269,   274,   270,   271,   272,
+     273,   263,     0,     0,     0,     0,   283,   290,   289,   291,
+       0,     0,   303,     0,     0,    67,    67,    67,    67,     0,
+     344,     0,   346,   321,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,    67,     0,
-     117,   123,   122,   120,   121,   124,   125,   127,   144,   144,
-       0,     0,     0,     0,     0,   320,     0,     0,     0,     0,
-       0,     0,     0,   179,   165,   177,     0,   182,   183,     0,
-       0,     0,     0,   233,   252,   118,   250,     0,   263,     0,
-     276,     0,     0,     0,   279,     0,   277,   292,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   351,     0,
-       0,     0,   334,   335,     0,     0,     0,     0,   352,     0,
-       0,     0,   332,     0,   139,     0,   235,   237,    67,     0,
+     117,   124,   123,   120,   122,   121,   125,   126,   128,   145,
+     145,     0,     0,     0,     0,     0,   321,     0,     0,     0,
+       0,     0,     0,     0,   180,   166,   178,     0,   183,   184,
+       0,     0,     0,     0,   234,   253,   118,   251,     0,   264,
+       0,   277,     0,     0,     0,   280,     0,   278,   293,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   352,
+       0,     0,     0,   335,   336,     0,     0,     0,     0,   353,
+       0,     0,     0,   333,     0,   140,     0,   236,   238,    67,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     213,   186,     0,     0,     0,     0,     0,     0,   146,   144,
-      65,     0,   126,     0,   275,   165,     0,   274,   278,     0,
-       0,   319,     0,     0,     0,     0,   139,   140,   139,     0,
-       0,     0,     0,     0,     0,   350,   322,     0,    67,   326,
-     327,   319,     0,   348,    67,   220,     0,     0,     0,     0,
-     200,     0,     0,     0,     0,   211,     0,   185,     0,     0,
-      67,   141,   147,   145,    64,   249,   251,   118,   142,     0,
-     281,     0,     0,     0,   118,   118,     0,   328,   329,   330,
-     331,   344,   346,   321,     0,     0,   333,   336,   337,   323,
-       0,     0,   139,     0,     0,     0,     0,     0,   208,     0,
-       0,     0,   202,   203,   199,    65,   143,   137,   283,   280,
-       0,     0,     0,     0,   126,     0,   313,     0,   353,   126,
-     349,   204,   205,   206,   207,     0,     0,     0,   212,   248,
-       0,   135,     0,   305,     0,     0,   109,   111,   118,   118,
-       0,   118,   118,   314,   339,   201,   209,   210,   138,     0,
-     133,   303,     0,   304,     0,   316,   315,     0,     0,     0,
-     136,     0,   254,     0,     0,     0,   118,   118,     0,     0,
-       0,     0,   318,   317,     0,   132,     0,   128,   310,     0,
-       0,     0,   134,     0,   309,     0,   131,   130,   129,   306
+       0,   214,   187,     0,     0,     0,     0,     0,     0,   147,
+     145,    65,     0,   127,     0,   276,   166,     0,   275,   279,
+       0,     0,   320,     0,     0,     0,     0,   140,   141,   140,
+       0,     0,     0,     0,     0,     0,   351,   323,     0,    67,
+     327,   328,   320,     0,   349,    67,   221,     0,     0,     0,
+       0,   201,     0,     0,     0,     0,   212,     0,   186,     0,
+       0,    67,   142,   148,   146,    64,   250,   252,   118,   143,
+       0,   282,     0,     0,     0,   118,   118,     0,   329,   330,
+     331,   332,   345,   347,   322,     0,     0,   334,   337,   338,
+     324,     0,     0,   140,     0,     0,     0,     0,     0,   209,
+       0,     0,     0,   203,   204,   200,    65,   144,   138,   284,
+     281,     0,     0,     0,     0,   127,     0,   314,     0,   354,
+     127,   350,   205,   206,   207,   208,     0,     0,     0,   213,
+     249,     0,   136,     0,   306,     0,     0,   109,   111,   118,
+     118,     0,   118,   118,   315,   340,   202,   210,   211,   139,
+       0,   134,   304,     0,   305,     0,   317,   316,     0,     0,
+       0,   137,     0,   255,     0,     0,     0,   118,   118,     0,
+       0,     0,     0,   319,   318,     0,   133,     0,   129,   311,
+       0,     0,     0,   135,     0,   310,     0,   132,   131,   130,
+     307
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,   278,   279,   280,   305,   322,   165,   166,    79,   595,
+      -1,   278,   279,   280,   305,   322,   165,   166,    79,   596,
      113,    12,   134,    80,    14,    15,    41,    42,    43,    48,
-      54,   118,   129,   355,   239,   447,   358,   706,   707,   692,
-     680,   661,   420,   538,   637,   473,   539,    81,   167,   140,
+      54,   118,   129,   355,   239,   448,   358,   707,   708,   693,
+     681,   662,   420,   539,   638,   474,   540,    81,   167,   140,
      157,   141,   142,   110,   379,   406,   380,   121,    88,   158,
-      16,    17,    18,    20,    19,   389,   448,   449,    63,    23,
-      61,   101,   476,   477,   130,   173,    55,    96,    56,    49,
-     479,   407,    83,   409,   288,   289,    57,    92,    93,   231,
-     665,   135,   330,   606,   498,   508,   232,   233,   234,   235
+      16,    17,    18,    20,    19,   389,   449,   450,    63,    23,
+      61,   101,   477,   478,   130,   173,    55,    96,    56,    49,
+     480,   407,    83,   409,   288,   289,    57,    92,    93,   231,
+     666,   135,   330,   607,   499,   509,   232,   233,   234,   235
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -630
+#define YYPACT_NINF -613
 static const yytype_int16 yypact[] =
 {
-     247,  -630,  -630,  -630,  -630,  -630,  -630,  -630,    30,  -108,
-      28,   -66,   102,   -40,    -1,  -630,   128,   668,  -630,    29,
-     248,    21,    44,  -630,   -28,   143,  -630,  1914,  -630,  -630,
-    -630,  -630,  -630,  -630,  -630,  -630,  -630,  -630,  -630,  -630,
-    -630,   191,   191,   170,  -630,  -630,  -630,  -630,   191,  -630,
-    -630,  -630,  -630,  -630,   191,   167,  -630,    -7,   190,   210,
-     221,  -630,  -630,  -630,  -630,  -630,   114,  -630,  -630,  -630,
-    -630,  -630,  -630,  -630,  -630,   289,   315,     3,    50,  -630,
-    -630,  -630,   -32,  -630,   252,   252,   171,  -630,   280,   189,
-     189,  -630,  -630,   324,  -630,  -630,  -630,  -630,  -630,  -630,
-    -630,    57,  1662,  -630,   153,   165,   313,   114,  -630,   -32,
-     -84,   204,  1662,   214,   280,   280,  -630,  -630,  1614,  -630,
-    -630,  1955,   366,  -630,  -630,  -630,  -630,  -630,  -630,  1996,
-    -630,   -18,   219,  2230,  2230,  -630,   354,  -630,  -630,   -32,
-    -630,   234,   260,  2040,  2040,   256,   -80,  2040,  -630,   411,
-     275,  -630,  1955,  2040,   114,   278,   -32,   222,  -630,   282,
-     438,   439,   440,   441,   442,   158,   443,  1568,   398,  -630,
-      86,  -630,  -630,  -630,  -630,  -630,  -630,   400,  2081,   105,
-     447,   189,  -630,  -630,  -630,  -630,  -630,  -630,  -630,  -630,
-    -630,  -630,  -630,  -630,  -630,  -630,  -630,  -630,  -630,   480,
-     284,   480,   284,  2040,  2040,  2040,  2040,  -630,  -630,  -630,
-    -630,  -630,  -630,  -630,  -630,  -630,  -630,  -630,  -630,  2040,
-    2040,  2040,  2040,  2040,  2040,  2040,  2040,  2040,  2040,  2040,
-    2040,  -630,   189,  -630,    55,  -630,  -630,  -630,  -630,   424,
-    1703,  -630,   -19,   -36,  -630,   287,   -32,   297,  -630,   398,
-      13,  1614,  -630,  -630,  -630,  -630,  -630,  -630,  -630,  -630,
-    -630,  -630,  -630,   480,   284,   480,   284,   299,   300,   306,
-     307,   310,   317,   320,  1744,  2122,   541,   453,   323,   326,
-     328,  -630,  -630,  -630,   330,  -630,   114,   984,  -630,   312,
-    1157,  1157,  -630,  1157,  1996,  -630,  -630,  -630,  -630,  -630,
-    -630,  -630,  -630,  -630,  -630,  2040,  -630,  -630,  -630,  -630,
-    -630,  -630,  -630,  -630,  -630,  -630,  -630,  -630,  -630,  -630,
-    -630,  -630,  2040,  2040,  2040,   -17,    24,  -630,   984,   -39,
-     336,   337,   341,   342,   343,   345,   984,   984,   984,   984,
-     984,   457,  1996,  2040,  2040,   509,  -630,  -630,  -630,  -630,
-    -630,  -630,  -630,  -630,  -630,  -630,  -630,  -630,   283,  -630,
-    -630,  -630,  -630,   283,  -630,   214,   486,   364,   365,   367,
-     368,  1955,  1955,  1955,  1955,  1955,  1955,  1955,  -630,  -630,
-      63,   650,    54,  -630,   -70,  -630,  1955,  1955,  1955,   363,
-    1788,  -630,  -630,  -630,  -630,  -630,  -630,  -630,  -630,  -630,
-    -630,   470,  1829,  2166,   755,   510,  -630,  -630,  -630,  -630,
-    2040,   369,  -630,   374,  1157,   984,   984,   984,   984,    42,
-    -630,    43,  -630,  -630,  1157,   373,  2040,  2040,  2040,  2040,
-    2040,   377,   378,   379,   385,   397,  2040,  1157,   984,   403,
-    -630,  -630,  -630,  -630,  -630,  -630,  -630,  -630,   363,   363,
-    2040,  1955,  1955,  1955,  1955,  -630,   406,   420,   423,   425,
-     378,   427,  1955,  -630,   417,  1432,   -60,  -630,  -630,   428,
-     429,   557,    17,  -630,  -630,   -32,   431,   445,  -630,   580,
-    -630,   177,  1034,   129,  -630,   -24,  -630,  -630,   588,   592,
-     448,   446,   449,   450,   451,  1157,   608,  1157,   452,   460,
-    1157,   463,   -32,  -630,   469,   471,   609,   614,   472,  2040,
-    1157,  1157,   -32,   476,   475,  2040,  -630,  -630,    -6,   477,
-     479,   482,   483,   141,  1955,  1955,  1955,  1955,   202,  1955,
-    -630,  -630,   473,  1955,  1955,  2040,   600,   637,  -630,   363,
-     481,  1870,  -630,   484,  -630,   474,   -21,  -630,  -630,  1157,
-    1157,  2207,  1157,  1157,  1157,  1157,   475,  -630,   475,  2040,
-    1157,   485,  2040,  2040,  2040,  -630,  -630,   647,   984,  -630,
-    -630,  2207,   598,  -630,   984,  -630,  1955,  1955,  1955,  1955,
-    -630,   489,   492,   491,   506,  -630,   378,  -630,   512,   513,
-      47,  -630,  -630,  -630,  -630,  -630,  -630,   -32,    -5,   655,
-    -630,   507,   516,   514,     4,   -32,   212,  -630,  -630,  -630,
-    -630,  -630,  -630,  -630,   515,  1157,  -630,  -630,  -630,  -630,
-     378,   242,   475,   521,   526,   532,   533,  1955,  -630,  1955,
-    1955,   243,  -630,  -630,  -630,   481,  -630,   643,  -630,  -630,
-     684,     1,   827,   827,  -630,  2248,  -630,   534,   472,  -630,
-    -630,  -630,  -630,  -630,  -630,   539,   540,   542,  -630,  -630,
-     702,   554,  1157,  -630,  1296,     2,   548,   549,  -630,  -630,
-      40,     4,   -32,  -630,   283,  -630,  -630,  -630,  -630,   691,
-     562,  -630,   552,  -630,  1296,   424,   424,   701,   827,   827,
-    -630,   559,  -630,   705,   558,  1157,  -630,  -630,   147,  1157,
-     708,   645,   424,   424,   563,  -630,   266,  -630,  -630,  1157,
-     709,   188,  -630,   147,  -630,  1157,  -630,  -630,  -630,  -630
+     872,  -613,  -613,  -613,  -613,  -613,  -613,  -613,    37,  -106,
+      25,   -23,   155,    44,   -11,  -613,   189,  1045,  -613,    66,
+     239,    56,    60,  -613,    64,   218,  -613,  1877,  -613,  -613,
+    -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,
+    -613,   178,   178,   181,  -613,  -613,  -613,  -613,   178,  -613,
+    -613,  -613,  -613,  -613,   178,   223,  -613,     1,   226,   230,
+     237,  -613,  -613,  -613,  -613,  -613,   116,  -613,  -613,  -613,
+    -613,  -613,  -613,  -613,  -613,   291,   296,     3,    55,  -613,
+    -613,  -613,    49,  -613,   278,   278,   194,  -613,   252,   485,
+     485,  -613,  -613,   144,  -613,  -613,  -613,  -613,  -613,  -613,
+    -613,  -109,  1581,  -613,   152,   161,   312,   116,  -613,    49,
+    -117,   171,  1581,   174,   252,   252,  -613,  -613,  1625,  -613,
+    -613,  1918,   342,  -613,  -613,  -613,  -613,  -613,  -613,  1959,
+    -613,   -14,   186,  2193,  2193,  -613,   331,  -613,  -613,    49,
+    -613,   192,   200,  2003,  2003,   193,  -115,  2003,  -613,   371,
+     214,  -613,  1918,  2003,   116,   220,    49,   163,  -613,   267,
+     376,   384,   390,   396,   400,   305,   413,  1444,   375,  -613,
+     279,  -613,  -613,  -613,  -613,  -613,  -613,   377,  2044,   173,
+     427,   485,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,
+    -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,   594,
+     574,   594,   574,  2003,  2003,  2003,  2003,  -613,  -613,  -613,
+    -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  2003,
+    2003,  2003,  2003,  2003,  2003,  2003,  2003,  2003,  2003,  2003,
+    2003,  -613,   485,  -613,   253,  -613,  -613,  -613,  -613,   108,
+    1666,  -613,   -31,   -36,  -613,   271,    49,   276,  -613,   375,
+      -1,  1625,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,
+    -613,  -613,  -613,   594,   574,   594,   574,   282,   283,   285,
+     289,   290,   292,   293,  1707,  2085,   566,   424,   294,   297,
+     299,  -613,  -613,  -613,   300,  -613,   116,   860,  -613,   295,
+    1033,  1033,  -613,  1033,  1959,  -613,  -613,  -613,  -613,  -613,
+    -613,  -613,  -613,  -613,  -613,  2003,  -613,  -613,  -613,  -613,
+    -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,
+    -613,  -613,  2003,  2003,  2003,   -37,    26,  -613,   860,    65,
+     306,   313,   316,   322,   323,   326,   860,   860,   860,   860,
+     860,   411,  1959,  2003,  2003,   454,  -613,  -613,  -613,  -613,
+    -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,   284,  -613,
+    -613,  -613,  -613,   284,  -613,   174,   432,   315,   330,   332,
+     335,  1918,  1918,  1918,  1918,  1918,  1918,  1918,  -613,  -613,
+     -55,   792,   -28,  -613,  -114,  -613,  1918,  1918,  1918,   328,
+    1751,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,
+    -613,   437,  1792,  2129,  1490,   477,  -613,  -613,  -613,  -613,
+    2003,   336,  -613,   339,  1033,   860,   860,   860,   860,    33,
+    -613,    34,  -613,  -613,  1033,   341,  2003,  2003,  2003,  2003,
+    2003,   346,   347,   349,   350,   353,  2003,  1033,   860,   357,
+    -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,   328,
+     328,  2003,  1918,  1918,  1918,  1918,  -613,   358,   359,   360,
+     363,   347,   364,  1918,  -613,   361,  1308,  -110,  -613,  -613,
+     365,   366,   462,    -5,  -613,  -613,    49,   367,   372,  -613,
+     514,  -613,   -25,  1536,    47,  -613,   -52,  -613,  -613,   525,
+     527,   393,   392,   395,   397,   398,  1033,   554,  1033,   399,
+     401,  1033,   402,    49,  -613,   406,   407,   557,   561,   419,
+    2003,  1033,  1033,    49,   425,   426,  2003,  -613,  -613,   -16,
+     428,   429,   433,   434,   104,  1918,  1918,  1918,  1918,   149,
+    1918,  -613,  -613,   420,  1918,  1918,  2003,   575,   598,  -613,
+     328,   521,  1833,  -613,   438,  -613,   435,    81,  -613,  -613,
+    1033,  1033,  2170,  1033,  1033,  1033,  1033,   426,  -613,   426,
+    2003,  1033,   439,  2003,  2003,  2003,  -613,  -613,   601,   860,
+    -613,  -613,  2170,   552,  -613,   860,  -613,  1918,  1918,  1918,
+    1918,  -613,   445,   455,   452,   456,  -613,   347,  -613,   459,
+     460,    -9,  -613,  -613,  -613,  -613,  -613,  -613,    49,    13,
+     602,  -613,   453,   461,   463,    75,    49,   182,  -613,  -613,
+    -613,  -613,  -613,  -613,  -613,   458,  1033,  -613,  -613,  -613,
+    -613,   347,   191,   426,   466,   467,   469,   471,  1918,  -613,
+    1918,  1918,   195,  -613,  -613,  -613,   521,  -613,   581,  -613,
+    -613,   620,    -3,   703,   703,  -613,  2211,  -613,   468,   419,
+    -613,  -613,  -613,  -613,  -613,  -613,   476,   482,   483,  -613,
+    -613,   636,   494,  1033,  -613,  1172,     4,   487,   488,  -613,
+    -613,   236,    75,    49,  -613,   284,  -613,  -613,  -613,  -613,
+     629,   499,  -613,   489,  -613,  1172,   108,   108,   638,   703,
+     703,  -613,   495,  -613,   639,   493,  1033,  -613,  -613,  -135,
+    1033,   642,   586,   108,   108,   497,  -613,   196,  -613,  -613,
+    1033,   648,   217,  -613,  -135,  -613,  1033,  -613,  -613,  -613,
+    -613
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -630,   220,   223,   285,  -181,  -175,  -174,  -630,     0,    94,
-    -142,   638,  -630,    11,  -630,  -630,  -630,  -630,    71,  -630,
-    -630,  -630,  -144,  -630,  -226,  -630,  -227,  -630,    26,  -630,
-    -630,  -630,  -308,   132,  -630,  -424,  -630,  -630,   -26,   494,
-    -126,  -630,   628,   635,  -113,  -165,  -271,   318,   352,   493,
-    -630,  -630,   725,  -630,  -630,  -630,  -630,  -630,  -630,  -630,
-    -630,  -630,  -630,  -630,   656,  -630,  -630,  -630,  -630,  -630,
-    -630,  -629,   -56,   183,  -190,  -630,  -630,   688,  -630,   613,
-    -630,  -630,  -630,   178,   293,  -451,  -630,   616,  -630,  -630
+    -613,   258,   274,   287,  -180,  -175,  -177,  -613,     0,    36,
+    -126,   580,  -613,    11,  -613,  -613,  -613,  -613,    54,  -613,
+    -613,  -613,  -138,  -613,  -463,  -613,  -239,  -613,   -15,  -613,
+    -613,  -613,  -310,   101,  -613,  -424,  -613,  -613,   -26,   464,
+    -125,  -613,   591,   599,  -111,  -165,  -270,   298,   348,   465,
+    -613,  -613,   696,  -613,  -613,  -613,  -613,  -613,  -613,  -613,
+    -613,  -613,  -613,  -613,   624,  -613,  -613,  -613,  -613,  -613,
+    -613,  -612,   -48,    58,  -123,  -613,  -613,   658,  -613,   583,
+    -613,  -613,  -613,   146,   263,  -449,  -613,   590,  -613,  -613
 };
 
 /* 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 -223
+#define YYTABLE_NINF -224
 static const yytype_int16 yytable[] =
 {
-      11,    82,   281,   170,   382,   384,   293,   105,   168,   528,
-     171,    13,   292,   292,    91,   327,   111,    11,   422,   111,
-     323,   363,    94,   111,   516,   517,   283,   324,    13,   536,
-     331,   332,   333,   334,   335,   682,   111,   294,   111,   249,
-     341,    29,    30,    31,    32,    33,    34,    35,    36,   111,
-      37,   536,   109,   495,   497,   694,    24,    64,    65,  -154,
-     107,    67,    68,    69,    70,    71,    72,    73,   111,     1,
-       2,   537,     3,     4,     5,    46,   139,    47,   687,   111,
-     109,   147,   367,    21,   369,   147,   139,    25,   342,   368,
-     148,   370,   156,    11,   245,   462,   496,   496,    26,    22,
-      74,   252,   111,   156,   468,   462,     2,   364,   365,     4,
-     466,   282,    84,    85,   532,   593,   290,   242,   243,    89,
-      27,   246,   291,   112,    28,    90,   112,   250,    44,   424,
-     112,   481,   483,   485,   -67,   631,   360,   441,   442,   443,
-      60,   462,   444,   112,   462,   112,   445,   446,   419,   -67,
-     548,   359,   287,   601,   439,   172,   112,   575,    38,    39,
-      40,   255,   256,   257,   258,    62,  -154,    95,   414,   648,
-    -154,   663,   683,   343,   344,   112,   106,   325,   326,   287,
-     328,   284,   441,   442,   443,    58,   112,   444,    91,   421,
-     -67,   445,   446,   329,   287,   287,   287,   287,   287,   336,
-     337,   338,   339,   340,   287,    86,   573,    87,    59,   112,
-     634,   546,    98,   116,   139,   117,   437,    75,    76,   462,
-     487,    77,   136,    78,   108,   156,   467,   137,   462,    64,
-      65,   408,    99,   463,   408,   408,   501,   408,   503,   504,
-     505,     1,     2,   100,     3,     4,     5,  -222,   611,   540,
-     612,   122,   123,   124,   125,   126,   127,   128,   455,   456,
-     457,   458,   459,   460,   461,   -69,     1,     2,   156,     3,
-       4,     5,   408,   469,   470,   471,   102,     6,     7,   415,
-     408,   408,   408,   408,   408,   -55,   -55,   -55,   -55,    87,
-      50,    51,    52,   103,   462,    53,   416,   417,   418,     8,
-     281,   547,   704,     9,   580,   705,   559,    10,   253,   254,
-     306,   307,   119,   120,   650,   598,   156,   438,   287,   104,
-      64,    65,   143,   107,    67,    68,    69,    70,    71,    72,
-      73,   132,     1,     2,   144,     3,     4,     5,   519,   520,
-     521,   522,   462,     1,   716,   717,     3,   544,     5,   530,
-      38,    39,    40,   228,   228,   465,   229,   229,   408,   408,
-     408,   408,   408,    74,   475,   585,   149,   567,   408,   613,
-     169,   635,   616,   617,   618,   644,   238,   645,   642,   643,
-     151,   408,   408,   174,   287,   308,   309,   310,   311,   312,
-     313,   314,   315,   316,   317,   318,   319,   320,   321,   240,
-     287,   502,   287,   287,   287,   649,   658,   645,   567,   282,
-     512,   581,   582,   583,   584,   247,   586,   670,   230,   230,
-     588,   589,   674,   241,   518,   441,   442,   443,   244,   712,
-     444,   713,   152,   153,   445,   446,   114,   115,   248,   408,
-     251,   408,   685,   686,   408,   688,   689,   -56,   -57,   -60,
-     -59,   -58,   259,   111,   408,   408,   465,   285,   292,   361,
-     362,   371,   372,   623,   624,   625,   626,   664,   373,   374,
-     702,   703,   375,   411,   412,   385,   413,   410,   345,   376,
-      75,    76,   377,   568,    77,   386,    78,   145,   387,   574,
-     388,   684,   390,   408,   408,   436,   408,   408,   408,   408,
-       1,   425,   426,     3,   408,     5,   427,   428,   429,   590,
-     430,   423,   408,   440,   655,   597,   656,   657,   408,   431,
-     432,   433,   434,   435,   450,   605,   451,   452,   472,   453,
-     454,   478,   486,   287,   488,   345,   287,   287,   287,   489,
-     594,   500,   506,   507,   509,   605,   346,   347,    64,    65,
-     510,   107,   159,   160,   161,   162,   163,   164,    73,   408,
-       1,     2,   511,     3,     4,     5,   348,   349,   515,   350,
-     351,   524,   352,   353,   354,   295,   296,   297,   298,   299,
-     300,   301,   302,   303,   304,   525,   408,   408,   526,   531,
-     527,    74,   529,   533,   534,   535,   541,   490,   491,   492,
-     493,   494,   543,   346,   347,   549,   408,   499,   542,   550,
-     551,   552,   557,   565,   553,   554,   555,   559,   566,   672,
-     513,   514,   591,   348,   349,   560,   350,   351,   562,   352,
-     353,   354,   408,   408,   563,   594,   564,   567,   571,   408,
-     572,   592,   576,   408,   577,   587,   600,   578,   579,   599,
-     615,   619,   496,   408,   627,   628,   629,    64,    65,   408,
-     107,   159,   160,   161,   162,   163,   164,    73,  -221,     1,
-       2,   630,     3,     4,     5,   632,   633,   638,   556,   639,
-     558,   640,   641,   561,   651,   646,   -69,     1,     2,   652,
-       3,     4,     5,   569,   570,   653,   654,   660,     6,     7,
-      74,   662,   675,   676,   673,   677,   678,   679,    75,    76,
-     -18,   -19,    77,   690,    78,   383,   691,   693,   695,   710,
-       8,   698,   699,   700,     9,   709,   715,   711,    10,   659,
-     636,   133,   602,   603,   357,   607,   608,   609,   610,   718,
-     150,   146,    45,   614,   366,    97,   131,   236,   523,   621,
-     237,   620,     0,     0,     0,     0,     0,   622,     0,     0,
-       0,     0,    64,    65,     0,   107,   159,   160,   161,   162,
-     163,   164,    73,     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,   647,     0,
-       0,     0,     0,     0,     0,    74,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    75,    76,     0,
-       0,    77,     0,    78,   464,   668,   669,     0,     0,     0,
-     391,   392,   393,   394,    64,    65,   395,     0,     0,     0,
-       0,     0,     0,     0,     0,   681,     1,     2,     0,     3,
-       4,     5,   396,   397,   398,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   399,   400,     0,
-       0,   696,   697,     0,     0,     0,     0,     0,   701,     0,
-       0,   345,   708,     0,     0,     0,   401,     0,     0,     0,
-       0,     0,   714,     0,     0,     0,     0,     0,   719,     0,
-       0,     0,     0,   184,   185,   186,   187,   188,   189,   190,
-     191,   192,   193,   194,   195,   196,   197,   198,   263,   264,
-     265,   266,    75,    76,     0,     0,    77,     0,    78,   484,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   267,   207,   666,
-     667,   210,   211,   212,   213,   214,   215,   216,   217,   218,
-       0,   268,     0,   269,   270,   271,     0,   272,   273,   348,
-     349,     0,   350,   351,     0,   352,   353,   354,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   391,   392,   393,
-     394,    64,    65,   395,     0,   402,     0,     0,   403,     0,
-     404,     0,   405,     1,     2,     0,     3,     4,     5,   396,
-     397,   398,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   399,   400,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   111,
-       0,    64,    65,   401,   107,   159,   160,   161,   162,   163,
-     164,    73,     0,     1,     2,     0,     3,     4,     5,     0,
-     184,   185,   186,   187,   188,   189,   190,   191,   192,   193,
-     194,   195,   196,   197,   198,   263,   264,   265,   266,     0,
-       0,     0,     0,     0,    74,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   267,   207,   208,   209,   210,   211,
-     212,   213,   214,   215,   216,   217,   218,     0,   268,     0,
-     269,   270,   271,     0,   272,   273,     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,   402,     0,     0,   403,     0,   404,     0,   405,
-     391,   392,   393,   394,    64,    65,   395,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     1,     2,     0,     3,
-       4,     5,   396,   397,   398,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   399,   400,     0,
-       0,    75,    76,     0,     0,    77,     0,    78,   545,     0,
-       0,     0,     0,     0,     0,     0,   401,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   184,   185,   186,   187,   188,   189,   190,
-     191,   192,   193,   194,   195,   196,   197,   198,   263,   264,
-     265,   266,     0,     0,     0,     0,     0,     0,     0,     0,
+      11,    82,   281,   293,   170,   382,   384,   105,   292,   363,
+     168,    13,   529,   541,   171,   292,   422,    11,   111,   111,
+     705,   323,    91,   706,   111,   517,   518,   324,    13,   537,
+      94,    29,    30,    31,    32,    33,    34,    35,    36,   111,
+      37,   249,   283,   294,   496,   498,   111,   537,   147,   538,
+     147,   463,   109,   683,   111,   463,   136,   148,    24,   245,
+     469,   137,    64,    65,   533,   107,    67,    68,    69,    70,
+      71,    72,    73,   695,     1,     2,   139,     3,     4,     5,
+     109,   111,   327,   367,    25,   369,   139,   497,   497,   368,
+      21,   370,   156,    11,   342,    84,    85,   331,   332,   333,
+     334,   335,    89,   156,   111,    74,    22,   341,    90,   252,
+     463,   467,    46,   463,    47,   464,   594,   242,   243,   282,
+     111,   246,   549,   364,   365,   112,   112,   250,   419,   -67,
+    -155,   112,   482,   484,   486,   636,   360,   463,   632,   359,
+     463,    26,   643,   644,   468,   545,   112,   576,    38,    39,
+      40,   132,   287,   112,   635,   441,   442,   443,   444,   172,
+     445,   112,   345,     1,   446,   447,     3,   664,     5,   414,
+      64,    65,   649,    27,   684,    95,   106,   325,   326,   287,
+     328,   284,     1,     2,   290,     3,     4,     5,   112,    44,
+     291,   421,   -67,   329,   287,   287,   287,   287,   287,   336,
+     337,   338,   339,   340,   287,   574,   686,   687,    28,   689,
+     690,   112,   463,   547,   139,   -67,    86,   437,    87,   548,
+      58,   439,    75,    76,    59,   156,    77,   112,    78,   108,
+     346,   347,    60,   424,   703,   704,   116,  -155,   117,   408,
+      62,  -155,   408,   408,    91,   408,   463,   612,    98,   613,
+     348,   349,    99,   350,   351,   602,   352,   353,   354,   100,
+     456,   457,   458,   459,   460,   461,   462,   581,   156,   560,
+     -55,   -55,   -55,   -55,   688,   470,   471,   472,   102,   415,
+     408,    50,    51,    52,   119,   120,    53,   488,   408,   408,
+     408,   408,   408,   253,   254,   103,   416,   417,   418,     2,
+     104,   281,     4,   502,   599,   504,   505,   506,   255,   256,
+     257,   258,   586,   651,   568,    87,   156,   438,   287,    64,
+      65,   143,   107,    67,    68,    69,    70,    71,    72,    73,
+     144,     1,     2,   149,     3,     4,     5,    38,    39,    40,
+     151,   520,   521,   522,   523,   645,   169,   646,   411,   412,
+     174,   413,   531,   238,   650,   466,   646,   240,   659,   713,
+     568,   714,    74,   241,   476,   244,   408,   408,   408,   408,
+     408,   343,   344,   717,   718,   247,   408,   248,   441,   442,
+     443,   444,   251,   445,   287,   -56,   423,   446,   447,   408,
+     408,   228,   228,   -57,   431,   432,   433,   434,   435,   -60,
+     287,   503,   287,   287,   287,   -59,   671,   229,   229,   -58,
+     513,   675,   152,   153,   582,   583,   584,   585,   282,   587,
+     230,   230,   259,   589,   590,   519,   441,   442,   443,   444,
+     111,   445,   114,   115,   285,   446,   447,   614,   292,   362,
+     617,   618,   619,   361,   371,   372,   385,   373,   408,   436,
+     408,   374,   375,   408,   376,   377,   386,   466,   440,   387,
+     410,   388,   390,   408,   408,   665,   624,   625,   626,   627,
+     451,   425,   491,   492,   493,   494,   495,   452,   426,    75,
+      76,   427,   500,    77,   569,    78,   145,   428,   429,   685,
+     575,   430,   453,   473,   454,   514,   515,   455,   479,   487,
+     536,   489,   408,   408,   490,   408,   408,   408,   408,   501,
+     591,   507,   508,   408,   510,   511,   598,   656,   512,   657,
+     658,   408,   516,   525,   526,   527,   606,   408,   528,   530,
+     534,   535,   542,   532,   287,   543,   544,   287,   287,   287,
+       1,   595,   550,     3,   551,     5,   606,   122,   123,   124,
+     125,   126,   127,   128,   557,   552,   559,   553,   558,   562,
+     554,   566,   555,   556,   560,   567,   561,   563,   408,   570,
+     571,   564,   565,    64,    65,   345,   107,   159,   160,   161,
+     162,   163,   164,    73,   568,     1,     2,   572,     3,     4,
+       5,   573,   588,   577,   578,   408,   408,   592,   579,   580,
+     306,   307,   593,   600,   616,   620,   497,   601,   603,   604,
+     628,   608,   609,   610,   611,   408,    74,   630,   629,   615,
+     673,   631,   633,   634,   639,   640,   641,   621,   647,   652,
+     653,   642,   654,   623,   655,   661,   595,   663,   674,   676,
+     679,   408,   408,   346,   347,   677,   678,   680,   408,   -18,
+     -19,   691,   408,   692,   694,   696,   700,   699,   701,   710,
+     711,   712,   408,   348,   349,   716,   350,   351,   408,   352,
+     353,   354,   660,   133,   648,   308,   309,   310,   311,   312,
+     313,   314,   315,   316,   317,   318,   319,   320,   321,   295,
+     296,   297,   298,   299,   300,   301,   302,   303,   304,   719,
+     637,   669,   670,   150,   357,   146,   391,   392,   393,   394,
+      64,    65,   395,    45,   131,    97,   366,   236,   622,   524,
+       0,   682,     1,     2,   237,     3,     4,     5,   396,   397,
+     398,     0,     0,    75,    76,     0,     0,    77,     0,    78,
+     383,     0,     0,   399,   400,     0,     0,   697,   698,     0,
+       0,     0,     0,     0,   702,     0,     0,   345,   709,     0,
+       0,     0,   401,     0,     0,     0,     0,     0,   715,     0,
+       0,     0,     0,     0,   720,     0,     0,     0,     0,   184,
+     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
+     195,   196,   197,   198,   263,   264,   265,   266,     0,    64,
+      65,     0,   107,   159,   160,   161,   162,   163,   164,    73,
+       0,     1,     2,     0,     3,     4,     5,     0,     0,     0,
+       0,     0,     0,   267,   207,   667,   668,   210,   211,   212,
+     213,   214,   215,   216,   217,   218,     0,   268,     0,   269,
+     270,   271,    74,   272,   273,   348,   349,     0,   350,   351,
+       0,   352,   353,   354,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   391,   392,   393,   394,    64,    65,   395,
+       0,   402,  -223,     0,   403,     0,   404,     0,   405,     1,
+       2,     0,     3,     4,     5,   396,   397,   398,     0,     0,
+     -69,     1,     2,     0,     3,     4,     5,     0,     0,     0,
+     399,   400,     6,     7,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   111,     0,     0,     0,   401,
+       0,     0,     0,     0,     8,     0,     0,     0,     9,     0,
+       0,     0,    10,     0,     0,     0,   184,   185,   186,   187,
+     188,   189,   190,   191,   192,   193,   194,   195,   196,   197,
+     198,   263,   264,   265,   266,     0,     0,     0,     0,    75,
+      76,     0,     0,    77,     0,    78,   465,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   267,   207,   208,
-     209,   210,   211,   212,   213,   214,   215,   216,   217,   218,
-       0,   268,     0,   269,   270,   271,     0,   272,   273,   391,
-     392,   393,   394,     0,     0,   395,     0,     0,     0,     0,
+     267,   207,   208,   209,   210,   211,   212,   213,   214,   215,
+     216,   217,   218,     0,   268,     0,   269,   270,   271,     0,
+     272,   273,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   396,   397,   398,     0,   402,     0,     0,   403,     0,
-     404,     0,   405,     0,     0,     0,   399,   400,     0,     0,
+       0,     0,   112,     0,     0,     0,     0,     0,   402,     0,
+       0,   403,     0,   404,     0,   405,   391,   392,   393,   394,
+      64,    65,   395,     0,     0,  -222,     0,     0,     0,     0,
+       0,     0,     1,     2,     0,     3,     4,     5,   396,   397,
+     398,     0,     0,   -69,     1,     2,     0,     3,     4,     5,
+       0,     0,     0,   399,   400,     6,     7,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   401,     0,     0,     0,     0,
+       0,     0,   401,     0,     0,     0,     0,     8,     0,     0,
+       0,     9,     0,     0,     0,    10,     0,     0,     0,   184,
+     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
+     195,   196,   197,   198,   263,   264,   265,   266,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   184,   185,   186,   187,   188,   189,   190,   191,
-     192,   193,   194,   195,   196,   197,   198,   263,   264,   265,
-     266,     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,   267,   207,   208,   209,
-     210,   211,   212,   213,   214,   215,   216,   217,   218,     0,
-     268,     0,   269,   270,   271,     0,   272,   273,     0,    64,
-      65,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     1,     2,     0,     3,     4,     5,   260,     0,     0,
-       0,     0,     0,     0,   402,     0,     0,   403,     0,   404,
-       0,   405,   261,   262,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   111,     0,     0,
+       0,     0,     0,   267,   207,   208,   209,   210,   211,   212,
+     213,   214,   215,   216,   217,   218,     0,   268,     0,   269,
+     270,   271,     0,   272,   273,   391,   392,   393,   394,     0,
+       0,   395,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   396,   397,   398,
+       0,   402,     0,     0,   403,     0,   404,     0,   405,     0,
+       0,     0,   399,   400,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   401,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,   184,   185,
      186,   187,   188,   189,   190,   191,   192,   193,   194,   195,
      196,   197,   198,   263,   264,   265,   266,     0,     0,     0,
@@ -2439,244 +2416,240 @@
      214,   215,   216,   217,   218,     0,   268,     0,   269,   270,
      271,     0,   272,   273,     0,    64,    65,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     1,     2,     0,
-       3,     4,     5,   260,   112,     0,     0,     0,   -67,     0,
-     274,     0,     0,   275,     0,   276,     0,   277,   261,   262,
+       3,     4,     5,   260,     0,     0,     0,     0,     0,     0,
+     402,     0,     0,   403,     0,   404,     0,   405,   261,   262,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   111,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    64,    65,   111,   154,    67,    68,    69,    70,    71,
-      72,    73,     0,     1,     2,     0,     3,     4,     5,     0,
        0,     0,     0,     0,   184,   185,   186,   187,   188,   189,
      190,   191,   192,   193,   194,   195,   196,   197,   198,   263,
-     264,   265,   266,     0,    74,     0,     0,     0,     0,    64,
-      65,     0,   107,    67,    68,    69,    70,    71,    72,    73,
-       0,     1,     2,     0,     3,     4,     5,     0,   267,   207,
+     264,   265,   266,     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,   267,   207,
      208,   209,   210,   211,   212,   213,   214,   215,   216,   217,
-     218,   138,   268,     0,   269,   270,   271,     0,   272,   273,
+     218,     0,   268,     0,   269,   270,   271,     0,   272,   273,
+       0,    64,    65,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     1,     2,     0,     3,     4,     5,   260,
+     112,     0,     0,     0,   -67,     0,   274,     0,     0,   275,
+       0,   276,     0,   277,   261,   262,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    64,    65,   111,
+     107,   159,   160,   161,   162,   163,   164,    73,     0,     1,
+       2,     0,     3,     4,     5,     0,     0,     0,     0,     0,
+     184,   185,   186,   187,   188,   189,   190,   191,   192,   193,
+     194,   195,   196,   197,   198,   263,   264,   265,   266,     0,
+      74,     0,     0,    64,    65,     0,   107,   159,   160,   161,
+     162,   163,   164,    73,     0,     1,     2,     0,     3,     4,
+       5,     0,     0,     0,   267,   207,   208,   209,   210,   211,
+     212,   213,   214,   215,   216,   217,   218,     0,   268,     0,
+     269,   270,   271,     0,   272,   273,    74,     0,    64,    65,
+       0,   107,    67,    68,    69,    70,    71,    72,    73,     0,
+       1,     2,     0,     3,     4,     5,   112,     0,     0,     0,
+       0,     0,   274,     0,     0,   275,     0,   276,     0,   277,
+     138,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    74,    64,    65,     0,   154,    67,    68,    69,    70,
+      71,    72,    73,     0,     1,     2,     0,     3,     4,     5,
+       0,     0,     0,     0,     0,     0,     0,    75,    76,     0,
+       0,    77,     0,    78,   485,     0,     0,     0,     0,     0,
+       0,     0,     0,    64,    65,    74,   107,    67,    68,    69,
+      70,    71,    72,    73,     0,     1,     2,     0,     3,     4,
+       5,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    75,    76,   356,     0,    77,     0,    78,
+     546,     0,     0,     0,    64,    65,    74,   107,   159,   160,
+     161,   162,   163,   164,    73,     0,     1,     2,     0,     3,
+       4,     5,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    75,    76,
+       0,   155,    77,     0,    78,     0,     0,    74,    64,    65,
+       0,   107,    67,    68,    69,    70,    71,    72,    73,     0,
+       1,     2,     0,     3,     4,     5,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     475,     0,    75,    76,     0,     0,    77,     0,    78,    64,
+      65,    74,   107,   159,   160,   161,   162,   163,   164,    73,
+       0,     1,     2,     0,     3,     4,     5,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    75,    76,     0,     0,    77,     0,    78,
       64,    65,    74,   107,    67,    68,    69,    70,    71,    72,
       73,     0,     1,     2,     0,     3,     4,     5,     0,     0,
-     112,     0,     0,     0,     0,     0,   274,     0,     0,   275,
-     155,   276,   356,   277,     0,     0,     0,     0,     0,     0,
-       0,    64,    65,    74,   107,   159,   160,   161,   162,   163,
-     164,    73,     0,     1,     2,     0,     3,     4,     5,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    75,    76,     0,     0,    77,     0,    78,     0,     0,
-       0,     0,     0,     0,    74,    64,    65,     0,   107,    67,
-      68,    69,    70,    71,    72,    73,     0,     1,     2,     0,
+       0,     0,   597,     0,    75,    76,     0,   378,    77,     0,
+      78,     0,     0,    74,    64,    65,     0,    66,    67,    68,
+      69,    70,    71,    72,    73,     0,     1,     2,     0,     3,
+       4,     5,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    75,    76,
+       0,     0,    77,     0,    78,    64,    65,    74,   107,   159,
+     160,   161,   162,   163,   164,    73,     0,     1,     2,     0,
        3,     4,     5,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   474,     0,    75,
-      76,     0,     0,    77,     0,    78,    64,    65,    74,   107,
-     159,   160,   161,   162,   163,   164,    73,     0,     1,     2,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    75,
+      76,     0,   481,    77,     0,    78,    64,    65,    74,   154,
+      67,    68,    69,    70,    71,    72,    73,     0,     1,     2,
        0,     3,     4,     5,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      75,    76,     0,     0,    77,     0,    78,    64,    65,    74,
-     107,    67,    68,    69,    70,    71,    72,    73,     0,     1,
-       2,     0,     3,     4,     5,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   596,
-       0,    75,    76,     0,   378,    77,     0,    78,     0,     0,
-      74,    64,    65,     0,    66,    67,    68,    69,    70,    71,
+      75,    76,     0,     0,    77,     0,    78,     0,     0,    74,
+      64,    65,     0,   107,    67,    68,    69,    70,    71,    72,
+      73,     0,     1,     2,     0,     3,     4,     5,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    75,    76,     0,     0,    77,     0,
+      78,    64,    65,    74,   286,    67,    68,    69,    70,    71,
       72,    73,     0,     1,     2,     0,     3,     4,     5,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,    75,    76,     0,     0,    77,
        0,    78,    64,    65,    74,   107,   159,   160,   161,   162,
      163,   164,    73,     0,     1,     2,     0,     3,     4,     5,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    75,    76,     0,   480,
-      77,     0,    78,    64,    65,    74,   154,    67,    68,    69,
-      70,    71,    72,    73,     0,     1,     2,     0,     3,     4,
-       5,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    75,    76,     0,
-       0,    77,     0,    78,     0,     0,    74,    64,    65,     0,
-     107,    67,    68,    69,    70,    71,    72,    73,     0,     1,
+       0,     0,     0,     0,     0,     0,    75,    76,     0,     0,
+      77,     0,    78,     0,     0,    74,    64,    65,     0,   107,
+     159,   160,   161,   162,   163,   164,    73,     0,     1,     2,
+       0,     3,     4,     5,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      75,    76,     0,     0,    77,     0,    78,    64,    65,    74,
+     107,    67,    68,    69,    70,    71,    72,   605,     0,     1,
        2,     0,     3,     4,     5,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,    75,    76,     0,     0,    77,     0,    78,    64,    65,
-      74,   286,    67,    68,    69,    70,    71,    72,    73,     0,
+      74,   107,    67,    68,    69,    70,    71,    72,   672,   175,
        1,     2,     0,     3,     4,     5,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    75,    76,     0,     0,    77,     0,    78,    64,
-      65,    74,   107,   159,   160,   161,   162,   163,   164,    73,
-       0,     1,     2,     0,     3,     4,     5,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    75,    76,     0,     0,    77,     0,    78,
-       0,     0,    74,    64,    65,     0,   107,   159,   160,   161,
-     162,   163,   164,    73,     0,     1,     2,     0,     3,     4,
-       5,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    75,    76,     0,
-       0,    77,     0,    78,    64,    65,    74,   107,    67,    68,
-      69,    70,    71,    72,   604,     0,     1,     2,     0,     3,
-       4,     5,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    75,    76,
-       0,     0,    77,     0,    78,    64,    65,    74,   107,    67,
-      68,    69,    70,    71,    72,   671,   175,     1,     2,     0,
-       3,     4,     5,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   176,   177,    75,
-      76,     0,     0,    77,     0,   381,     0,     0,    74,     0,
-     178,   179,   180,   181,   182,   183,   184,   185,   186,   187,
-     188,   189,   190,   191,   192,   193,   194,   195,   196,   197,
-     198,   199,   200,   201,   202,     0,     0,     0,     0,     0,
-       0,     0,     0,    75,    76,     0,     0,    77,     0,   482,
-       0,     0,     0,     0,     0,   203,   204,   205,     0,     0,
-     206,   207,   208,   209,   210,   211,   212,   213,   214,   215,
-     216,   217,   218,   219,   220,   221,   222,   223,   224,   225,
-     226,   227,     0,     0,    75,    76,     0,     0,    77,     0,
-      78,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     176,   177,    75,    76,     0,     0,    77,     0,   381,     0,
+       0,    74,     0,   178,   179,   180,   181,   182,   183,   184,
+     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
+     195,   196,   197,   198,   199,   200,   201,   202,     0,     0,
+       0,     0,     0,     0,     0,     0,    75,    76,     0,     0,
+      77,     0,   483,     0,     0,     0,     0,     0,   203,   204,
+     205,     0,     0,   206,   207,   208,   209,   210,   211,   212,
+     213,   214,   215,   216,   217,   218,   219,   220,   221,   222,
+     223,   224,   225,   226,   227,     0,     0,    75,    76,     0,
+       0,    77,     0,    78,     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,     0,
-       0,     0,     0,     0,     0,    75,    76,     0,     0,    77,
-       0,    78
+       0,     0,     0,     0,     0,     0,     0,     0,    75,    76,
+       0,     0,    77,     0,    78
 };
 
 static const yytype_int16 yycheck[] =
 {
-       0,    27,   167,   129,   275,   276,   180,     4,   121,   460,
-      28,     0,    11,    11,    21,   205,    55,    17,   326,    55,
-     201,   248,    29,    55,   448,   449,   168,   202,    17,    34,
-     220,   221,   222,   223,   224,   664,    55,   181,    55,   152,
-     230,    42,    43,    44,    45,    46,    47,    48,    49,    55,
-      51,    34,    78,    11,    11,   684,   164,     7,     8,    55,
-      10,    11,    12,    13,    14,    15,    16,    17,    55,    19,
-      20,    54,    22,    23,    24,    46,   102,    48,    38,    55,
-     106,   165,   263,    53,   265,   165,   112,    59,   232,   264,
-     174,   266,   118,    93,   174,   165,    54,    54,   164,    69,
-      50,   157,    55,   129,   174,   165,    20,   249,   250,    23,
-     381,   167,    41,    42,   174,   539,    11,   143,   144,    48,
-      18,   147,    17,   162,   164,    54,   162,   153,     0,   168,
-     162,   402,   403,   404,   166,   586,   172,   142,   143,   144,
-     168,   165,   147,   162,   165,   162,   151,   152,   165,   166,
-     174,   170,   178,   174,   344,   173,   162,   163,   159,   160,
-     161,     3,     4,     5,     6,    22,   162,   174,   294,   620,
-     166,   170,   170,   118,   119,   162,   173,   203,   204,   205,
-     206,   170,   142,   143,   144,   164,   162,   147,    21,   165,
-     166,   151,   152,   219,   220,   221,   222,   223,   224,   225,
-     226,   227,   228,   229,   230,    35,   514,    37,   164,   162,
-     163,   482,    22,    42,   240,    44,   342,   167,   168,   165,
-     410,   171,   165,   173,   174,   251,   172,   170,   165,     7,
-       8,   287,    22,   170,   290,   291,   426,   293,   428,   429,
-     430,    19,    20,    22,    22,    23,    24,     0,   556,   475,
-     558,    62,    63,    64,    65,    66,    67,    68,   371,   372,
-     373,   374,   375,   376,   377,    18,    19,    20,   294,    22,
-      23,    24,   328,   386,   387,   388,   162,    30,    31,   305,
-     336,   337,   338,   339,   340,     3,     4,     5,     6,    37,
-      42,    43,    44,     4,   165,    47,   322,   323,   324,    52,
-     465,   172,   155,    56,   163,   158,   165,    60,    26,    27,
-      26,    27,    32,    33,   622,   542,   342,   343,   344,     4,
-       7,     8,   169,    10,    11,    12,    13,    14,    15,    16,
-      17,     7,    19,    20,   169,    22,    23,    24,   451,   452,
-     453,   454,   165,    19,   156,   157,    22,   170,    24,   462,
-     159,   160,   161,   133,   134,   381,   133,   134,   414,   415,
-     416,   417,   418,    50,   390,   163,   162,   165,   424,   559,
-       4,   597,   562,   563,   564,   163,    22,   165,   604,   605,
-     166,   437,   438,   164,   410,   101,   102,   103,   104,   105,
-     106,   107,   108,   109,   110,   111,   112,   113,   114,   165,
-     426,   427,   428,   429,   430,   163,   163,   165,   165,   465,
-     436,   524,   525,   526,   527,     4,   529,   644,   133,   134,
-     533,   534,   649,   163,   450,   142,   143,   144,   172,   163,
-     147,   165,   114,   115,   151,   152,    84,    85,   163,   495,
-     162,   497,   668,   669,   500,   671,   672,     9,     9,     9,
-       9,     9,     9,    55,   510,   511,   482,    57,    11,   172,
-     163,   162,   162,   576,   577,   578,   579,   641,   162,   162,
-     696,   697,   162,   290,   291,    22,   293,   165,    54,   162,
-     167,   168,   162,   509,   171,   162,   173,   174,   162,   515,
-     162,   665,   162,   549,   550,    38,   552,   553,   554,   555,
-      19,   165,   165,    22,   560,    24,   165,   165,   165,   535,
-     165,   328,   568,     4,   627,   541,   629,   630,   574,   336,
-     337,   338,   339,   340,    38,   551,   162,   162,   165,   162,
-     162,    61,    22,   559,   165,    54,   562,   563,   564,   165,
-     540,   168,   165,   165,   165,   571,   122,   123,     7,     8,
-     165,    10,    11,    12,    13,    14,    15,    16,    17,   615,
-      19,    20,   165,    22,    23,    24,   142,   143,   165,   145,
-     146,   165,   148,   149,   150,    95,    96,    97,    98,    99,
-     100,   101,   102,   103,   104,   165,   642,   643,   165,   172,
-     165,    50,   165,   165,   165,    38,   165,   414,   415,   416,
-     417,   418,    22,   122,   123,    17,   662,   424,   163,    17,
-     162,   165,     4,     4,   165,   165,   165,   165,     4,   645,
-     437,   438,    22,   142,   143,   165,   145,   146,   165,   148,
-     149,   150,   688,   689,   165,   635,   165,   165,   162,   695,
-     165,     4,   165,   699,   165,   172,   172,   165,   165,   165,
-     165,     4,    54,   709,   165,   163,   165,     7,     8,   715,
-      10,    11,    12,    13,    14,    15,    16,    17,     0,    19,
-      20,   165,    22,    23,    24,   163,   163,    22,   495,   172,
-     497,   165,   168,   500,   163,   170,    18,    19,    20,   163,
-      22,    23,    24,   510,   511,   163,   163,    54,    30,    31,
-      50,    17,   163,   163,   170,   163,     4,   153,   167,   168,
-     162,   162,   171,    22,   173,   174,   154,   165,    17,    74,
-      52,   162,    17,   165,    56,    17,    17,   164,    60,   635,
-     598,    93,   549,   550,   240,   552,   553,   554,   555,   713,
-     112,   106,    17,   560,   251,    57,    90,   134,   455,   571,
-     134,   568,    -1,    -1,    -1,    -1,    -1,   574,    -1,    -1,
-      -1,    -1,     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,    -1,    -1,    -1,    -1,    -1,   615,    -1,
-      -1,    -1,    -1,    -1,    -1,    50,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   167,   168,    -1,
-      -1,   171,    -1,   173,   174,   642,   643,    -1,    -1,    -1,
-       3,     4,     5,     6,     7,     8,     9,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   662,    19,    20,    -1,    22,
-      23,    24,    25,    26,    27,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    40,    41,    -1,
-      -1,   688,   689,    -1,    -1,    -1,    -1,    -1,   695,    -1,
-      -1,    54,   699,    -1,    -1,    -1,    59,    -1,    -1,    -1,
-      -1,    -1,   709,    -1,    -1,    -1,    -1,    -1,   715,    -1,
-      -1,    -1,    -1,    76,    77,    78,    79,    80,    81,    82,
-      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
-      93,    94,   167,   168,    -1,    -1,   171,    -1,   173,   174,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   120,   121,   122,
-     123,   124,   125,   126,   127,   128,   129,   130,   131,   132,
-      -1,   134,    -1,   136,   137,   138,    -1,   140,   141,   142,
-     143,    -1,   145,   146,    -1,   148,   149,   150,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,     5,
-       6,     7,     8,     9,    -1,   168,    -1,    -1,   171,    -1,
-     173,    -1,   175,    19,    20,    -1,    22,    23,    24,    25,
-      26,    27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    40,    41,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    55,
-      -1,     7,     8,    59,    10,    11,    12,    13,    14,    15,
-      16,    17,    -1,    19,    20,    -1,    22,    23,    24,    -1,
-      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
-      86,    87,    88,    89,    90,    91,    92,    93,    94,    -1,
-      -1,    -1,    -1,    -1,    50,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   120,   121,   122,   123,   124,   125,
-     126,   127,   128,   129,   130,   131,   132,    -1,   134,    -1,
-     136,   137,   138,    -1,   140,   141,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   162,    -1,    -1,    -1,
-      -1,    -1,   168,    -1,    -1,   171,    -1,   173,    -1,   175,
-       3,     4,     5,     6,     7,     8,     9,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    19,    20,    -1,    22,
-      23,    24,    25,    26,    27,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    40,    41,    -1,
-      -1,   167,   168,    -1,    -1,   171,    -1,   173,   174,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    59,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    76,    77,    78,    79,    80,    81,    82,
-      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
-      93,    94,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       0,    27,   167,   180,   129,   275,   276,     4,    11,   248,
+     121,     0,   461,   476,    28,    11,   326,    17,    55,    55,
+     155,   201,    21,   158,    55,   449,   450,   202,    17,    34,
+      29,    42,    43,    44,    45,    46,    47,    48,    49,    55,
+      51,   152,   168,   181,    11,    11,    55,    34,   165,    54,
+     165,   165,    78,   665,    55,   165,   165,   174,   164,   174,
+     174,   170,     7,     8,   174,    10,    11,    12,    13,    14,
+      15,    16,    17,   685,    19,    20,   102,    22,    23,    24,
+     106,    55,   205,   263,    59,   265,   112,    54,    54,   264,
+      53,   266,   118,    93,   232,    41,    42,   220,   221,   222,
+     223,   224,    48,   129,    55,    50,    69,   230,    54,   157,
+     165,   381,    46,   165,    48,   170,   540,   143,   144,   167,
+      55,   147,   174,   249,   250,   162,   162,   153,   165,   166,
+      55,   162,   402,   403,   404,   598,   172,   165,   587,   170,
+     165,   164,   605,   606,   172,   170,   162,   163,   159,   160,
+     161,     7,   178,   162,   163,   142,   143,   144,   145,   173,
+     147,   162,    54,    19,   151,   152,    22,   170,    24,   294,
+       7,     8,   621,    18,   170,   174,   173,   203,   204,   205,
+     206,   170,    19,    20,    11,    22,    23,    24,   162,     0,
+      17,   165,   166,   219,   220,   221,   222,   223,   224,   225,
+     226,   227,   228,   229,   230,   515,   669,   670,   164,   672,
+     673,   162,   165,   483,   240,   166,    35,   342,    37,   172,
+     164,   344,   167,   168,   164,   251,   171,   162,   173,   174,
+     122,   123,   168,   168,   697,   698,    42,   162,    44,   287,
+      22,   166,   290,   291,    21,   293,   165,   557,    22,   559,
+     142,   143,    22,   145,   146,   174,   148,   149,   150,    22,
+     371,   372,   373,   374,   375,   376,   377,   163,   294,   165,
+       3,     4,     5,     6,    38,   386,   387,   388,   162,   305,
+     328,    42,    43,    44,    32,    33,    47,   410,   336,   337,
+     338,   339,   340,    26,    27,     4,   322,   323,   324,    20,
+       4,   466,    23,   426,   543,   428,   429,   430,     3,     4,
+       5,     6,   163,   623,   165,    37,   342,   343,   344,     7,
+       8,   169,    10,    11,    12,    13,    14,    15,    16,    17,
+     169,    19,    20,   162,    22,    23,    24,   159,   160,   161,
+     166,   452,   453,   454,   455,   163,     4,   165,   290,   291,
+     164,   293,   463,    22,   163,   381,   165,   165,   163,   163,
+     165,   165,    50,   163,   390,   172,   414,   415,   416,   417,
+     418,   118,   119,   156,   157,     4,   424,   163,   142,   143,
+     144,   145,   162,   147,   410,     9,   328,   151,   152,   437,
+     438,   133,   134,     9,   336,   337,   338,   339,   340,     9,
+     426,   427,   428,   429,   430,     9,   645,   133,   134,     9,
+     436,   650,   114,   115,   525,   526,   527,   528,   466,   530,
+     133,   134,     9,   534,   535,   451,   142,   143,   144,   145,
+      55,   147,    84,    85,    57,   151,   152,   560,    11,   163,
+     563,   564,   565,   172,   162,   162,    22,   162,   496,    38,
+     498,   162,   162,   501,   162,   162,   162,   483,     4,   162,
+     165,   162,   162,   511,   512,   642,   577,   578,   579,   580,
+      38,   165,   414,   415,   416,   417,   418,   162,   165,   167,
+     168,   165,   424,   171,   510,   173,   174,   165,   165,   666,
+     516,   165,   162,   165,   162,   437,   438,   162,    61,    22,
+      38,   165,   550,   551,   165,   553,   554,   555,   556,   168,
+     536,   165,   165,   561,   165,   165,   542,   628,   165,   630,
+     631,   569,   165,   165,   165,   165,   552,   575,   165,   165,
+     165,   165,   165,   172,   560,   163,    22,   563,   564,   565,
+      19,   541,    17,    22,    17,    24,   572,    62,    63,    64,
+      65,    66,    67,    68,   496,   162,   498,   165,     4,   501,
+     165,     4,   165,   165,   165,     4,   165,   165,   616,   511,
+     512,   165,   165,     7,     8,    54,    10,    11,    12,    13,
+      14,    15,    16,    17,   165,    19,    20,   162,    22,    23,
+      24,   165,   172,   165,   165,   643,   644,    22,   165,   165,
+      26,    27,     4,   165,   165,     4,    54,   172,   550,   551,
+     165,   553,   554,   555,   556,   663,    50,   165,   163,   561,
+     646,   165,   163,   163,    22,   172,   165,   569,   170,   163,
+     163,   168,   163,   575,   163,    54,   636,    17,   170,   163,
+       4,   689,   690,   122,   123,   163,   163,   153,   696,   162,
+     162,    22,   700,   154,   165,    17,    17,   162,   165,    17,
+      74,   164,   710,   142,   143,    17,   145,   146,   716,   148,
+     149,   150,   636,    93,   616,   101,   102,   103,   104,   105,
+     106,   107,   108,   109,   110,   111,   112,   113,   114,    95,
+      96,    97,    98,    99,   100,   101,   102,   103,   104,   714,
+     599,   643,   644,   112,   240,   106,     3,     4,     5,     6,
+       7,     8,     9,    17,    90,    57,   251,   134,   572,   456,
+      -1,   663,    19,    20,   134,    22,    23,    24,    25,    26,
+      27,    -1,    -1,   167,   168,    -1,    -1,   171,    -1,   173,
+     174,    -1,    -1,    40,    41,    -1,    -1,   689,   690,    -1,
+      -1,    -1,    -1,    -1,   696,    -1,    -1,    54,   700,    -1,
+      -1,    -1,    59,    -1,    -1,    -1,    -1,    -1,   710,    -1,
+      -1,    -1,    -1,    -1,   716,    -1,    -1,    -1,    -1,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,    -1,     7,
+       8,    -1,    10,    11,    12,    13,    14,    15,    16,    17,
+      -1,    19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,
+      -1,    -1,    -1,   120,   121,   122,   123,   124,   125,   126,
+     127,   128,   129,   130,   131,   132,    -1,   134,    -1,   136,
+     137,   138,    50,   140,   141,   142,   143,    -1,   145,   146,
+      -1,   148,   149,   150,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,     3,     4,     5,     6,     7,     8,     9,
+      -1,   168,     0,    -1,   171,    -1,   173,    -1,   175,    19,
+      20,    -1,    22,    23,    24,    25,    26,    27,    -1,    -1,
+      18,    19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,
+      40,    41,    30,    31,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,    59,
+      -1,    -1,    -1,    -1,    52,    -1,    -1,    -1,    56,    -1,
+      -1,    -1,    60,    -1,    -1,    -1,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,    -1,    -1,    -1,    -1,   167,
+     168,    -1,    -1,   171,    -1,   173,   174,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   120,   121,   122,
-     123,   124,   125,   126,   127,   128,   129,   130,   131,   132,
-      -1,   134,    -1,   136,   137,   138,    -1,   140,   141,     3,
-       4,     5,     6,    -1,    -1,     9,    -1,    -1,    -1,    -1,
+     120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
+     130,   131,   132,    -1,   134,    -1,   136,   137,   138,    -1,
+     140,   141,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    25,    26,    27,    -1,   168,    -1,    -1,   171,    -1,
-     173,    -1,   175,    -1,    -1,    -1,    40,    41,    -1,    -1,
+      -1,    -1,   162,    -1,    -1,    -1,    -1,    -1,   168,    -1,
+      -1,   171,    -1,   173,    -1,   175,     3,     4,     5,     6,
+       7,     8,     9,    -1,    -1,     0,    -1,    -1,    -1,    -1,
+      -1,    -1,    19,    20,    -1,    22,    23,    24,    25,    26,
+      27,    -1,    -1,    18,    19,    20,    -1,    22,    23,    24,
+      -1,    -1,    -1,    40,    41,    30,    31,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    59,    -1,    -1,    -1,    -1,
+      -1,    -1,    59,    -1,    -1,    -1,    -1,    52,    -1,    -1,
+      -1,    56,    -1,    -1,    -1,    60,    -1,    -1,    -1,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
-      94,    -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,   120,   121,   122,   123,
-     124,   125,   126,   127,   128,   129,   130,   131,   132,    -1,
-     134,    -1,   136,   137,   138,    -1,   140,   141,    -1,     7,
-       8,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    19,    20,    -1,    22,    23,    24,    25,    -1,    -1,
-      -1,    -1,    -1,    -1,   168,    -1,    -1,   171,    -1,   173,
-      -1,   175,    40,    41,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    55,    -1,    -1,
+      -1,    -1,    -1,   120,   121,   122,   123,   124,   125,   126,
+     127,   128,   129,   130,   131,   132,    -1,   134,    -1,   136,
+     137,   138,    -1,   140,   141,     3,     4,     5,     6,    -1,
+      -1,     9,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    25,    26,    27,
+      -1,   168,    -1,    -1,   171,    -1,   173,    -1,   175,    -1,
+      -1,    -1,    40,    41,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    59,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    76,    77,
       78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
       88,    89,    90,    91,    92,    93,    94,    -1,    -1,    -1,
@@ -2686,90 +2659,112 @@
      128,   129,   130,   131,   132,    -1,   134,    -1,   136,   137,
      138,    -1,   140,   141,    -1,     7,     8,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    19,    20,    -1,
-      22,    23,    24,    25,   162,    -1,    -1,    -1,   166,    -1,
+      22,    23,    24,    25,    -1,    -1,    -1,    -1,    -1,    -1,
      168,    -1,    -1,   171,    -1,   173,    -1,   175,    40,    41,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,     7,     8,    55,    10,    11,    12,    13,    14,    15,
-      16,    17,    -1,    19,    20,    -1,    22,    23,    24,    -1,
+      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    76,    77,    78,    79,    80,    81,
       82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
-      92,    93,    94,    -1,    50,    -1,    -1,    -1,    -1,     7,
-       8,    -1,    10,    11,    12,    13,    14,    15,    16,    17,
-      -1,    19,    20,    -1,    22,    23,    24,    -1,   120,   121,
+      92,    93,    94,    -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,   120,   121,
      122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
-     132,    39,   134,    -1,   136,   137,   138,    -1,   140,   141,
+     132,    -1,   134,    -1,   136,   137,   138,    -1,   140,   141,
+      -1,     7,     8,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    19,    20,    -1,    22,    23,    24,    25,
+     162,    -1,    -1,    -1,   166,    -1,   168,    -1,    -1,   171,
+      -1,   173,    -1,   175,    40,    41,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     7,     8,    55,
+      10,    11,    12,    13,    14,    15,    16,    17,    -1,    19,
+      20,    -1,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,
+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,    93,    94,    -1,
+      50,    -1,    -1,     7,     8,    -1,    10,    11,    12,    13,
+      14,    15,    16,    17,    -1,    19,    20,    -1,    22,    23,
+      24,    -1,    -1,    -1,   120,   121,   122,   123,   124,   125,
+     126,   127,   128,   129,   130,   131,   132,    -1,   134,    -1,
+     136,   137,   138,    -1,   140,   141,    50,    -1,     7,     8,
+      -1,    10,    11,    12,    13,    14,    15,    16,    17,    -1,
+      19,    20,    -1,    22,    23,    24,   162,    -1,    -1,    -1,
+      -1,    -1,   168,    -1,    -1,   171,    -1,   173,    -1,   175,
+      39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    50,     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,   167,   168,    -1,
+      -1,   171,    -1,   173,   174,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,     7,     8,    50,    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,   167,   168,    39,    -1,   171,    -1,   173,
+     174,    -1,    -1,    -1,     7,     8,    50,    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,   167,   168,
+      -1,   126,   171,    -1,   173,    -1,    -1,    50,     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,    -1,
+      39,    -1,   167,   168,    -1,    -1,   171,    -1,   173,     7,
+       8,    50,    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,   167,   168,    -1,    -1,   171,    -1,   173,
        7,     8,    50,    10,    11,    12,    13,    14,    15,    16,
       17,    -1,    19,    20,    -1,    22,    23,    24,    -1,    -1,
-     162,    -1,    -1,    -1,    -1,    -1,   168,    -1,    -1,   171,
-     126,   173,    39,   175,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,     7,     8,    50,    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,   167,   168,    -1,    -1,   171,    -1,   173,    -1,    -1,
-      -1,    -1,    -1,    -1,    50,     7,     8,    -1,    10,    11,
+      -1,    -1,    39,    -1,   167,   168,    -1,   170,   171,    -1,
+     173,    -1,    -1,    50,     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,    -1,    -1,    -1,   167,   168,
+      -1,    -1,   171,    -1,   173,     7,     8,    50,    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,    39,    -1,   167,
-     168,    -1,    -1,   171,    -1,   173,     7,     8,    50,    10,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   167,
+     168,    -1,   170,   171,    -1,   173,     7,     8,    50,    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,
-     167,   168,    -1,    -1,   171,    -1,   173,     7,     8,    50,
-      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,    39,
-      -1,   167,   168,    -1,   170,   171,    -1,   173,    -1,    -1,
-      50,     7,     8,    -1,    10,    11,    12,    13,    14,    15,
+     167,   168,    -1,    -1,   171,    -1,   173,    -1,    -1,    50,
+       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,    -1,    -1,    -1,   167,   168,    -1,    -1,   171,    -1,
+     173,     7,     8,    50,    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,   167,   168,    -1,    -1,   171,
       -1,   173,     7,     8,    50,    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,   167,   168,    -1,   170,
-     171,    -1,   173,     7,     8,    50,    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,   167,   168,    -1,
-      -1,   171,    -1,   173,    -1,    -1,    50,     7,     8,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   167,   168,    -1,    -1,
+     171,    -1,   173,    -1,    -1,    50,     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,    -1,    -1,    -1,
+     167,   168,    -1,    -1,   171,    -1,   173,     7,     8,    50,
       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,   167,   168,    -1,    -1,   171,    -1,   173,     7,     8,
-      50,    10,    11,    12,    13,    14,    15,    16,    17,    -1,
+      50,    10,    11,    12,    13,    14,    15,    16,    17,    36,
       19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   167,   168,    -1,    -1,   171,    -1,   173,     7,
-       8,    50,    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,   167,   168,    -1,    -1,   171,    -1,   173,
-      -1,    -1,    50,     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,    -1,    -1,    -1,   167,   168,    -1,
-      -1,   171,    -1,   173,     7,     8,    50,    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,   167,   168,
-      -1,    -1,   171,    -1,   173,     7,     8,    50,    10,    11,
-      12,    13,    14,    15,    16,    17,    36,    19,    20,    -1,
-      22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    57,    58,   167,
-     168,    -1,    -1,   171,    -1,   173,    -1,    -1,    50,    -1,
-      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,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   167,   168,    -1,    -1,   171,    -1,   173,
-      -1,    -1,    -1,    -1,    -1,   115,   116,   117,    -1,    -1,
-     120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
-     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
-     140,   141,    -1,    -1,   167,   168,    -1,    -1,   171,    -1,
-     173,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      57,    58,   167,   168,    -1,    -1,   171,    -1,   173,    -1,
+      -1,    50,    -1,    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,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   167,   168,    -1,    -1,
+     171,    -1,   173,    -1,    -1,    -1,    -1,    -1,   115,   116,
+     117,    -1,    -1,   120,   121,   122,   123,   124,   125,   126,
+     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
+     137,   138,   139,   140,   141,    -1,    -1,   167,   168,    -1,
+      -1,   171,    -1,   173,    -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,   167,   168,    -1,    -1,   171,
-      -1,   173
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   167,   168,
+      -1,    -1,   171,    -1,   173
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -2820,34 +2815,35 @@
      165,   249,   249,   249,   216,   214,   214,   214,   214,   165,
      208,   165,   208,   249,   168,   165,   165,   165,   165,   165,
      165,   249,   249,   249,   249,   249,    38,   216,   214,   250,
-       4,   142,   143,   144,   147,   151,   152,   201,   232,   233,
-      38,   162,   162,   162,   162,   220,   220,   220,   220,   220,
-     220,   220,   165,   170,   174,   214,   222,   172,   174,   220,
-     220,   220,   165,   211,    39,   214,   238,   239,    61,   246,
-     170,   222,   173,   222,   174,   222,    22,   250,   165,   165,
-     249,   249,   249,   249,   249,    11,    54,    11,   260,   249,
-     168,   250,   214,   250,   250,   250,   165,   165,   261,   165,
-     165,   165,   214,   249,   249,   165,   211,   211,   214,   220,
-     220,   220,   220,   260,   165,   165,   165,   165,   261,   165,
-     220,   172,   174,   165,   165,    38,    34,    54,   209,   212,
-     200,   165,   163,    22,   170,   174,   222,   172,   174,    17,
-      17,   162,   165,   165,   165,   165,   249,     4,   249,   165,
-     165,   249,   165,   165,   165,     4,     4,   165,   214,   249,
-     249,   162,   165,   208,   214,   163,   165,   165,   165,   165,
-     163,   220,   220,   220,   220,   163,   220,   172,   220,   220,
-     214,    22,     4,   211,   184,   185,    39,   214,   202,   165,
-     172,   174,   249,   249,    17,   214,   259,   249,   249,   249,
-     249,   208,   208,   250,   249,   165,   250,   250,   250,     4,
-     249,   259,   249,   220,   220,   220,   220,   165,   163,   165,
-     165,   261,   163,   163,   163,   200,   209,   210,    22,   172,
-     165,   168,   200,   200,   163,   165,   170,   249,   261,   163,
-     208,   163,   163,   163,   163,   220,   220,   220,   163,   185,
-      54,   207,    17,   170,   182,   256,   122,   123,   249,   249,
-     202,    17,   214,   170,   202,   163,   163,   163,     4,   153,
-     206,   249,   247,   170,   182,   200,   200,    38,   200,   200,
-      22,   154,   205,   165,   247,    17,   249,   249,   162,    17,
-     165,   249,   200,   200,   155,   158,   203,   204,   249,    17,
-      74,   164,   163,   165,   249,    17,   156,   157,   204,   249
+       4,   142,   143,   144,   145,   147,   151,   152,   201,   232,
+     233,    38,   162,   162,   162,   162,   220,   220,   220,   220,
+     220,   220,   220,   165,   170,   174,   214,   222,   172,   174,
+     220,   220,   220,   165,   211,    39,   214,   238,   239,    61,
+     246,   170,   222,   173,   222,   174,   222,    22,   250,   165,
+     165,   249,   249,   249,   249,   249,    11,    54,    11,   260,
+     249,   168,   250,   214,   250,   250,   250,   165,   165,   261,
+     165,   165,   165,   214,   249,   249,   165,   211,   211,   214,
+     220,   220,   220,   220,   260,   165,   165,   165,   165,   261,
+     165,   220,   172,   174,   165,   165,    38,    34,    54,   209,
+     212,   200,   165,   163,    22,   170,   174,   222,   172,   174,
+      17,    17,   162,   165,   165,   165,   165,   249,     4,   249,
+     165,   165,   249,   165,   165,   165,     4,     4,   165,   214,
+     249,   249,   162,   165,   208,   214,   163,   165,   165,   165,
+     165,   163,   220,   220,   220,   220,   163,   220,   172,   220,
+     220,   214,    22,     4,   211,   184,   185,    39,   214,   202,
+     165,   172,   174,   249,   249,    17,   214,   259,   249,   249,
+     249,   249,   208,   208,   250,   249,   165,   250,   250,   250,
+       4,   249,   259,   249,   220,   220,   220,   220,   165,   163,
+     165,   165,   261,   163,   163,   163,   200,   209,   210,    22,
+     172,   165,   168,   200,   200,   163,   165,   170,   249,   261,
+     163,   208,   163,   163,   163,   163,   220,   220,   220,   163,
+     185,    54,   207,    17,   170,   182,   256,   122,   123,   249,
+     249,   202,    17,   214,   170,   202,   163,   163,   163,     4,
+     153,   206,   249,   247,   170,   182,   200,   200,    38,   200,
+     200,    22,   154,   205,   165,   247,    17,   249,   249,   162,
+      17,   165,   249,   200,   200,   155,   158,   203,   204,   249,
+      17,    74,   164,   163,   165,   249,    17,   156,   157,   204,
+     249
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -3662,152 +3658,152 @@
   switch (yyn)
     {
         case 29:
-#line 1148 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1148 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_EQ; ;}
     break;
 
   case 30:
-#line 1148 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1148 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_NE; ;}
     break;
 
   case 31:
-#line 1149 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1149 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SLT; ;}
     break;
 
   case 32:
-#line 1149 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1149 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SGT; ;}
     break;
 
   case 33:
-#line 1150 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1150 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SLE; ;}
     break;
 
   case 34:
-#line 1150 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1150 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SGE; ;}
     break;
 
   case 35:
-#line 1151 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1151 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_ULT; ;}
     break;
 
   case 36:
-#line 1151 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1151 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_UGT; ;}
     break;
 
   case 37:
-#line 1152 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1152 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_ULE; ;}
     break;
 
   case 38:
-#line 1152 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1152 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_UGE; ;}
     break;
 
   case 39:
-#line 1156 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1156 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OEQ; ;}
     break;
 
   case 40:
-#line 1156 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1156 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ONE; ;}
     break;
 
   case 41:
-#line 1157 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1157 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OLT; ;}
     break;
 
   case 42:
-#line 1157 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1157 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OGT; ;}
     break;
 
   case 43:
-#line 1158 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1158 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OLE; ;}
     break;
 
   case 44:
-#line 1158 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1158 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OGE; ;}
     break;
 
   case 45:
-#line 1159 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1159 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ORD; ;}
     break;
 
   case 46:
-#line 1159 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1159 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UNO; ;}
     break;
 
   case 47:
-#line 1160 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1160 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UEQ; ;}
     break;
 
   case 48:
-#line 1160 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1160 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UNE; ;}
     break;
 
   case 49:
-#line 1161 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1161 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ULT; ;}
     break;
 
   case 50:
-#line 1161 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1161 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UGT; ;}
     break;
 
   case 51:
-#line 1162 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1162 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ULE; ;}
     break;
 
   case 52:
-#line 1162 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1162 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UGE; ;}
     break;
 
   case 53:
-#line 1163 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1163 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_TRUE; ;}
     break;
 
   case 54:
-#line 1164 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1164 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_FALSE; ;}
     break;
 
   case 65:
-#line 1173 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1173 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 66:
-#line 1175 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1175 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal)=(yyvsp[(3) - (4)].UInt64Val); ;}
     break;
 
   case 67:
-#line 1176 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1176 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal)=0; ;}
     break;
 
   case 68:
-#line 1180 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1180 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal);
     CHECK_FOR_ERROR
@@ -3815,7 +3811,7 @@
     break;
 
   case 69:
-#line 1184 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1184 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
@@ -3823,7 +3819,7 @@
     break;
 
   case 70:
-#line 1189 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1189 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[(1) - (2)].UIntVal);
   CHECK_FOR_ERROR
@@ -3831,7 +3827,7 @@
     break;
 
   case 74:
-#line 1198 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1198 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
@@ -3839,7 +3835,7 @@
     break;
 
   case 75:
-#line 1203 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1203 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal);
     CHECK_FOR_ERROR
@@ -3847,162 +3843,162 @@
     break;
 
   case 76:
-#line 1209 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1209 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 77:
-#line 1210 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1210 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 78:
-#line 1211 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1211 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 79:
-#line 1212 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1212 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
     break;
 
   case 80:
-#line 1213 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1213 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 81:
-#line 1214 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1214 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::CommonLinkage; ;}
     break;
 
   case 82:
-#line 1218 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1218 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 83:
-#line 1219 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1219 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 84:
-#line 1220 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1220 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 85:
-#line 1224 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1224 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::DefaultVisibility;   ;}
     break;
 
   case 86:
-#line 1225 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1225 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::DefaultVisibility;   ;}
     break;
 
   case 87:
-#line 1226 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1226 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::HiddenVisibility;    ;}
     break;
 
   case 88:
-#line 1227 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1227 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::ProtectedVisibility; ;}
     break;
 
   case 89:
-#line 1231 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1231 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 90:
-#line 1232 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1232 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 91:
-#line 1233 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1233 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 92:
-#line 1237 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1237 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 93:
-#line 1238 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1238 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 94:
-#line 1239 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1239 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 95:
-#line 1240 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1240 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 96:
-#line 1241 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1241 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 97:
-#line 1245 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1245 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 98:
-#line 1246 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1246 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 99:
-#line 1247 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1247 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 100:
-#line 1250 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1250 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 101:
-#line 1251 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1251 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 102:
-#line 1252 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1252 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Fast; ;}
     break;
 
   case 103:
-#line 1253 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1253 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Cold; ;}
     break;
 
   case 104:
-#line 1254 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1254 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_StdCall; ;}
     break;
 
   case 105:
-#line 1255 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1255 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_FastCall; ;}
     break;
 
   case 106:
-#line 1256 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1256 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_SSECall; ;}
     break;
 
   case 107:
-#line 1257 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1257 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                    if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val))
                      GEN_ERROR("Calling conv too large");
@@ -4012,117 +4008,122 @@
     break;
 
   case 108:
-#line 1264 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1264 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ZExt;      ;}
     break;
 
   case 109:
-#line 1265 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1265 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ZExt;      ;}
     break;
 
   case 110:
-#line 1266 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1266 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::SExt;      ;}
     break;
 
   case 111:
-#line 1267 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1267 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::SExt;      ;}
     break;
 
   case 112:
-#line 1268 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1268 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::InReg;     ;}
     break;
 
   case 113:
-#line 1269 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1269 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::StructRet; ;}
     break;
 
   case 114:
-#line 1270 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1270 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::NoAlias;   ;}
     break;
 
   case 115:
-#line 1271 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1271 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ByVal;     ;}
     break;
 
   case 116:
-#line 1272 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1272 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::Nest;      ;}
     break;
 
   case 117:
-#line 1273 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1273 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = 
                           ParamAttr::constructAlignmentFromInt((yyvsp[(2) - (2)].UInt64Val));    ;}
     break;
 
   case 118:
-#line 1277 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1277 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::None; ;}
     break;
 
   case 119:
-#line 1278 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1278 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs);
               ;}
     break;
 
   case 120:
-#line 1283 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1283 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::NoReturn; ;}
     break;
 
   case 121:
-#line 1284 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1284 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::NoUnwind; ;}
     break;
 
   case 122:
-#line 1285 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::ZExt;     ;}
+#line 1285 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::InReg;     ;}
     break;
 
   case 123:
-#line 1286 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::SExt;     ;}
+#line 1286 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::ZExt;     ;}
     break;
 
   case 124:
-#line 1287 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::ReadNone; ;}
+#line 1287 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::SExt;     ;}
     break;
 
   case 125:
-#line 1288 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::ReadOnly; ;}
+#line 1288 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::ReadNone; ;}
     break;
 
   case 126:
-#line 1291 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::None; ;}
+#line 1289 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::ReadOnly; ;}
     break;
 
   case 127:
-#line 1292 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1292 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::None; ;}
+    break;
+
+  case 128:
+#line 1293 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs);
               ;}
     break;
 
-  case 128:
-#line 1297 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 129:
+#line 1298 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FunctionNotes) = (yyvsp[(1) - (1)].FunctionNotes); ;}
     break;
 
-  case 129:
-#line 1298 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 130:
+#line 1299 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { 
                 FunctionNotes tmp = (yyvsp[(1) - (3)].FunctionNotes) | (yyvsp[(3) - (3)].FunctionNotes);
                 if ((yyvsp[(3) - (3)].FunctionNotes) == FN_NOTE_NoInline && ((yyvsp[(1) - (3)].FunctionNotes) & FN_NOTE_AlwaysInline))
@@ -4134,52 +4135,52 @@
               ;}
     break;
 
-  case 130:
-#line 1309 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 131:
+#line 1310 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FunctionNotes) = FN_NOTE_NoInline; ;}
     break;
 
-  case 131:
-#line 1310 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 132:
+#line 1311 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FunctionNotes) = FN_NOTE_AlwaysInline; ;}
     break;
 
-  case 132:
-#line 1311 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 133:
+#line 1312 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FunctionNotes) = FN_NOTE_OptimizeForSize; ;}
     break;
 
-  case 133:
-#line 1314 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 134:
+#line 1315 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FunctionNotes) = FN_NOTE_None; ;}
     break;
 
-  case 134:
-#line 1315 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 135:
+#line 1316 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.FunctionNotes) =  (yyvsp[(3) - (4)].FunctionNotes);
               ;}
     break;
 
-  case 135:
-#line 1320 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 136:
+#line 1321 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
-  case 136:
-#line 1321 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 137:
+#line 1322 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.StrVal) = (yyvsp[(2) - (2)].StrVal);
               ;}
     break;
 
-  case 137:
-#line 1328 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 138:
+#line 1329 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
-  case 138:
-#line 1329 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 139:
+#line 1330 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[(2) - (2)].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -4188,13 +4189,13 @@
 ;}
     break;
 
-  case 139:
-#line 1335 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 140:
+#line 1336 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
-  case 140:
-#line 1336 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 141:
+#line 1337 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[(3) - (3)].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -4203,8 +4204,8 @@
 ;}
     break;
 
-  case 141:
-#line 1345 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 142:
+#line 1346 "/Users/sabre/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] == '\\')
@@ -4214,28 +4215,28 @@
 ;}
     break;
 
-  case 142:
-#line 1353 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 143:
+#line 1354 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
-  case 143:
-#line 1354 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 144:
+#line 1355 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = (yyvsp[(1) - (1)].StrVal); ;}
     break;
 
-  case 144:
-#line 1359 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 145:
+#line 1360 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
-  case 145:
-#line 1360 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 146:
+#line 1361 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
-  case 146:
-#line 1361 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 147:
+#line 1362 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV->setSection(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -4243,8 +4244,8 @@
   ;}
     break;
 
-  case 147:
-#line 1366 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 148:
+#line 1367 "/Users/sabre/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");
@@ -4253,24 +4254,24 @@
   ;}
     break;
 
-  case 155:
-#line 1382 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 156:
+#line 1383 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 156:
-#line 1386 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 157:
+#line 1387 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder((yyvsp[(1) - (1)].PrimType));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 157:
-#line 1390 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 158:
+#line 1391 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {                             // Pointer type?
     if (*(yyvsp[(1) - (3)].TypeVal) == Type::LabelTy)
       GEN_ERROR("Cannot form a pointer to a basic block");
@@ -4280,8 +4281,8 @@
   ;}
     break;
 
-  case 158:
-#line 1397 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 159:
+#line 1398 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {            // Named types are also simple types...
     const Type* tmp = getTypeVal((yyvsp[(1) - (1)].ValIDVal));
     CHECK_FOR_ERROR
@@ -4289,8 +4290,8 @@
   ;}
     break;
 
-  case 159:
-#line 1402 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 160:
+#line 1403 "/Users/sabre/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
@@ -4301,8 +4302,8 @@
   ;}
     break;
 
-  case 160:
-#line 1410 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 161:
+#line 1411 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
@@ -4334,8 +4335,8 @@
   ;}
     break;
 
-  case 161:
-#line 1439 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 162:
+#line 1440 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
@@ -4362,8 +4363,8 @@
   ;}
     break;
 
-  case 162:
-#line 1464 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 163:
+#line 1465 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {          // Sized array type?
     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(ArrayType::get(*(yyvsp[(4) - (5)].TypeVal), (yyvsp[(2) - (5)].UInt64Val))));
     delete (yyvsp[(4) - (5)].TypeVal);
@@ -4371,8 +4372,8 @@
   ;}
     break;
 
-  case 163:
-#line 1469 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 164:
+#line 1470 "/Users/sabre/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))
@@ -4385,8 +4386,8 @@
   ;}
     break;
 
-  case 164:
-#line 1479 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 165:
+#line 1480 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {                        // Structure type?
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[(2) - (3)].TypeList)->begin(),
@@ -4399,16 +4400,16 @@
   ;}
     break;
 
-  case 165:
-#line 1489 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 166:
+#line 1490 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {                                  // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>()));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 166:
-#line 1493 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 167:
+#line 1494 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[(3) - (5)].TypeList)->begin(),
@@ -4421,16 +4422,16 @@
   ;}
     break;
 
-  case 167:
-#line 1503 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 168:
+#line 1504 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {                         // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>(), true));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 168:
-#line 1510 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 169:
+#line 1511 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
@@ -4439,8 +4440,8 @@
   ;}
     break;
 
-  case 169:
-#line 1519 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 170:
+#line 1520 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (1)].TypeVal))->getDescription());
@@ -4450,15 +4451,15 @@
   ;}
     break;
 
-  case 170:
-#line 1526 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 171:
+#line 1527 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(Type::VoidTy);
   ;}
     break;
 
-  case 171:
-#line 1531 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 172:
+#line 1532 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     (yyval.TypeWithAttrsList)->push_back((yyvsp[(1) - (1)].TypeWithAttrs));
@@ -4466,16 +4467,16 @@
   ;}
     break;
 
-  case 172:
-#line 1536 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 173:
+#line 1537 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList))->push_back((yyvsp[(3) - (3)].TypeWithAttrs));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 174:
-#line 1544 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 175:
+#line 1545 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList);
     TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
@@ -4485,8 +4486,8 @@
   ;}
     break;
 
-  case 175:
-#line 1551 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 176:
+#line 1552 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList;
     TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
@@ -4496,16 +4497,16 @@
   ;}
     break;
 
-  case 176:
-#line 1558 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 177:
+#line 1559 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 177:
-#line 1566 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 178:
+#line 1567 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeList) = new std::list<PATypeHolder>();
     (yyval.TypeList)->push_back(*(yyvsp[(1) - (1)].TypeVal)); 
@@ -4514,8 +4515,8 @@
   ;}
     break;
 
-  case 178:
-#line 1572 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 179:
+#line 1573 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeList)=(yyvsp[(1) - (3)].TypeList))->push_back(*(yyvsp[(3) - (3)].TypeVal)); 
     delete (yyvsp[(3) - (3)].TypeVal);
@@ -4523,8 +4524,8 @@
   ;}
     break;
 
-  case 179:
-#line 1584 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 180:
+#line 1585 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
@@ -4555,8 +4556,8 @@
   ;}
     break;
 
-  case 180:
-#line 1612 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 181:
+#line 1613 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -4575,8 +4576,8 @@
   ;}
     break;
 
-  case 181:
-#line 1628 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 182:
+#line 1629 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -4606,8 +4607,8 @@
   ;}
     break;
 
-  case 182:
-#line 1655 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 183:
+#line 1656 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
@@ -4638,8 +4639,8 @@
   ;}
     break;
 
-  case 183:
-#line 1683 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 184:
+#line 1684 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (4)].TypeVal)->get());
     if (STy == 0)
@@ -4668,8 +4669,8 @@
   ;}
     break;
 
-  case 184:
-#line 1709 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 185:
+#line 1710 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -4692,8 +4693,8 @@
   ;}
     break;
 
-  case 185:
-#line 1729 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 186:
+#line 1730 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (6)].TypeVal)->get());
     if (STy == 0)
@@ -4722,8 +4723,8 @@
   ;}
     break;
 
-  case 186:
-#line 1755 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 187:
+#line 1756 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (5)].TypeVal))->getDescription());
@@ -4746,8 +4747,8 @@
   ;}
     break;
 
-  case 187:
-#line 1775 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 188:
+#line 1776 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4762,8 +4763,8 @@
   ;}
     break;
 
-  case 188:
-#line 1787 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 189:
+#line 1788 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4773,8 +4774,8 @@
   ;}
     break;
 
-  case 189:
-#line 1794 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 190:
+#line 1795 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4843,8 +4844,8 @@
   ;}
     break;
 
-  case 190:
-#line 1860 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 191:
+#line 1861 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4857,8 +4858,8 @@
   ;}
     break;
 
-  case 191:
-#line 1870 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 192:
+#line 1871 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4871,8 +4872,8 @@
   ;}
     break;
 
-  case 192:
-#line 1880 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 193:
+#line 1881 "/Users/sabre/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");
@@ -4881,8 +4882,8 @@
   ;}
     break;
 
-  case 193:
-#line 1886 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 194:
+#line 1887 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     uint32_t BitWidth = cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth();
     if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > BitWidth) {
@@ -4895,8 +4896,8 @@
   ;}
     break;
 
-  case 194:
-#line 1896 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 195:
+#line 1897 "/Users/sabre/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");
@@ -4905,8 +4906,8 @@
   ;}
     break;
 
-  case 195:
-#line 1902 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 196:
+#line 1903 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     uint32_t BitWidth = cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth();
     if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > BitWidth) {
@@ -4919,8 +4920,8 @@
   ;}
     break;
 
-  case 196:
-#line 1912 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 197:
+#line 1913 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {                      // Boolean constants
     if (cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth() != 1)
       GEN_ERROR("Constant true must have type i1");
@@ -4929,8 +4930,8 @@
   ;}
     break;
 
-  case 197:
-#line 1918 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 198:
+#line 1919 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {                     // Boolean constants
     if (cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth() != 1)
       GEN_ERROR("Constant false must have type i1");
@@ -4939,8 +4940,8 @@
   ;}
     break;
 
-  case 198:
-#line 1924 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 199:
+#line 1925 "/Users/sabre/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");
@@ -4954,8 +4955,8 @@
   ;}
     break;
 
-  case 199:
-#line 1937 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 200:
+#line 1938 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (6)].TypeVal))->getDescription());
@@ -4970,8 +4971,8 @@
   ;}
     break;
 
-  case 200:
-#line 1949 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 201:
+#line 1950 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[(3) - (5)].ConstVal)->getType()))
       GEN_ERROR("GetElementPtr requires a pointer operand");
@@ -4995,8 +4996,8 @@
   ;}
     break;
 
-  case 201:
-#line 1970 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 202:
+#line 1971 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (8)].ConstVal)->getType() != Type::Int1Ty)
       GEN_ERROR("Select condition must be of boolean type");
@@ -5007,8 +5008,8 @@
   ;}
     break;
 
-  case 202:
-#line 1978 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 203:
+#line 1979 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType())
       GEN_ERROR("Binary operator types must match");
@@ -5017,8 +5018,8 @@
   ;}
     break;
 
-  case 203:
-#line 1984 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 204:
+#line 1985 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType())
       GEN_ERROR("Logical operator types must match");
@@ -5032,8 +5033,8 @@
   ;}
     break;
 
-  case 204:
-#line 1995 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 205:
+#line 1996 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("icmp operand types must match");
@@ -5041,8 +5042,8 @@
   ;}
     break;
 
-  case 205:
-#line 2000 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 206:
+#line 2001 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("fcmp operand types must match");
@@ -5050,8 +5051,8 @@
   ;}
     break;
 
-  case 206:
-#line 2005 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 207:
+#line 2006 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("vicmp operand types must match");
@@ -5059,8 +5060,8 @@
   ;}
     break;
 
-  case 207:
-#line 2010 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 208:
+#line 2011 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("vfcmp operand types must match");
@@ -5068,8 +5069,8 @@
   ;}
     break;
 
-  case 208:
-#line 2015 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 209:
+#line 2016 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -5078,8 +5079,8 @@
   ;}
     break;
 
-  case 209:
-#line 2021 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 210:
+#line 2022 "/Users/sabre/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");
@@ -5088,8 +5089,8 @@
   ;}
     break;
 
-  case 210:
-#line 2027 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 211:
+#line 2028 "/Users/sabre/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");
@@ -5098,8 +5099,8 @@
   ;}
     break;
 
-  case 211:
-#line 2033 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 212:
+#line 2034 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<StructType>((yyvsp[(3) - (5)].ConstVal)->getType()) && !isa<ArrayType>((yyvsp[(3) - (5)].ConstVal)->getType()))
       GEN_ERROR("ExtractValue requires an aggregate operand");
@@ -5110,8 +5111,8 @@
   ;}
     break;
 
-  case 212:
-#line 2041 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 213:
+#line 2042 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<StructType>((yyvsp[(3) - (7)].ConstVal)->getType()) && !isa<ArrayType>((yyvsp[(3) - (7)].ConstVal)->getType()))
       GEN_ERROR("InsertValue requires an aggregate operand");
@@ -5122,16 +5123,16 @@
   ;}
     break;
 
-  case 213:
-#line 2052 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 214:
+#line 2053 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ConstVector) = (yyvsp[(1) - (3)].ConstVector))->push_back((yyvsp[(3) - (3)].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 214:
-#line 2056 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 215:
+#line 2057 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstVector) = new std::vector<Constant*>();
     (yyval.ConstVector)->push_back((yyvsp[(1) - (1)].ConstVal));
@@ -5139,28 +5140,28 @@
   ;}
     break;
 
-  case 215:
-#line 2064 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 216:
+#line 2065 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
-  case 216:
-#line 2064 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 217:
+#line 2065 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
-  case 217:
-#line 2067 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 218:
+#line 2068 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
-  case 218:
-#line 2067 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 219:
+#line 2068 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
-  case 219:
-#line 2070 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 220:
+#line 2071 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const Type* VTy = (yyvsp[(1) - (2)].TypeVal)->get();
     Value *V = getVal(VTy, (yyvsp[(2) - (2)].ValIDVal));
@@ -5175,8 +5176,8 @@
    ;}
     break;
 
-  case 220:
-#line 2082 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 221:
+#line 2083 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     Constant *Val = (yyvsp[(3) - (6)].ConstVal);
     const Type *DestTy = (yyvsp[(5) - (6)].TypeVal)->get();
@@ -5191,8 +5192,8 @@
    ;}
     break;
 
-  case 221:
-#line 2103 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 222:
+#line 2104 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -5200,8 +5201,8 @@
   ;}
     break;
 
-  case 222:
-#line 2108 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 223:
+#line 2109 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -5209,40 +5210,40 @@
   ;}
     break;
 
-  case 225:
-#line 2121 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 226:
+#line 2122 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = false; ;}
     break;
 
-  case 226:
-#line 2121 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 227:
+#line 2122 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 227:
-#line 2125 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 228:
+#line 2126 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = true; ;}
     break;
 
-  case 228:
-#line 2125 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 229:
+#line 2126 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 229:
-#line 2128 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 230:
+#line 2129 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 230:
-#line 2131 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 231:
+#line 2132 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (3)].TypeVal))->getDescription());
@@ -5269,8 +5270,8 @@
   ;}
     break;
 
-  case 231:
-#line 2155 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 232:
+#line 2156 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ResolveTypeTo((yyvsp[(1) - (3)].StrVal), (yyvsp[(3) - (3)].PrimType));
 
@@ -5284,8 +5285,8 @@
   ;}
     break;
 
-  case 232:
-#line 2167 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 233:
+#line 2168 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { 
     /* "Externally Visible" Linkage */
     if ((yyvsp[(5) - (6)].ConstVal) == 0) 
@@ -5296,15 +5297,15 @@
   ;}
     break;
 
-  case 233:
-#line 2174 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 234:
+#line 2175 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
-  case 234:
-#line 2178 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 235:
+#line 2179 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(6) - (7)].ConstVal) == 0) 
       GEN_ERROR("Global value initializer is not a constant");
@@ -5313,15 +5314,15 @@
   ;}
     break;
 
-  case 235:
-#line 2183 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 236:
+#line 2184 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
-  case 236:
-#line 2187 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 237:
+#line 2188 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(6) - (7)].TypeVal))->getDescription());
@@ -5331,16 +5332,16 @@
   ;}
     break;
 
-  case 237:
-#line 2193 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 238:
+#line 2194 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 238:
-#line 2197 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 239:
+#line 2198 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     std::string Name;
     if ((yyvsp[(1) - (5)].StrVal)) {
@@ -5383,22 +5384,22 @@
   ;}
     break;
 
-  case 239:
-#line 2237 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 240:
+#line 2238 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { 
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 240:
-#line 2240 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 241:
+#line 2241 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 241:
-#line 2246 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 242:
+#line 2247 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
   if (AsmSoFar.empty())
@@ -5410,24 +5411,24 @@
 ;}
     break;
 
-  case 242:
-#line 2256 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 243:
+#line 2257 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setTargetTriple(*(yyvsp[(3) - (3)].StrVal));
     delete (yyvsp[(3) - (3)].StrVal);
   ;}
     break;
 
-  case 243:
-#line 2260 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 244:
+#line 2261 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setDataLayout(*(yyvsp[(3) - (3)].StrVal));
     delete (yyvsp[(3) - (3)].StrVal);
   ;}
     break;
 
-  case 245:
-#line 2267 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 246:
+#line 2268 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary(*(yyvsp[(3) - (3)].StrVal));
           delete (yyvsp[(3) - (3)].StrVal);
@@ -5435,8 +5436,8 @@
         ;}
     break;
 
-  case 246:
-#line 2272 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 247:
+#line 2273 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary(*(yyvsp[(1) - (1)].StrVal));
           delete (yyvsp[(1) - (1)].StrVal);
@@ -5444,15 +5445,15 @@
         ;}
     break;
 
-  case 247:
-#line 2277 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 248:
+#line 2278 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
           CHECK_FOR_ERROR
         ;}
     break;
 
-  case 248:
-#line 2286 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 249:
+#line 2287 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
@@ -5465,8 +5466,8 @@
   ;}
     break;
 
-  case 249:
-#line 2296 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 250:
+#line 2297 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -5479,16 +5480,16 @@
   ;}
     break;
 
-  case 250:
-#line 2307 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 251:
+#line 2308 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[(1) - (1)].ArgList);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 251:
-#line 2311 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 252:
+#line 2312 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[(1) - (3)].ArgList);
     struct ArgListEntry E;
@@ -5500,8 +5501,8 @@
   ;}
     break;
 
-  case 252:
-#line 2320 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 253:
+#line 2321 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = new ArgListType;
     struct ArgListEntry E;
@@ -5513,16 +5514,16 @@
   ;}
     break;
 
-  case 253:
-#line 2329 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 254:
+#line 2330 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = 0;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 254:
-#line 2335 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 255:
+#line 2336 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   std::string FunctionName(*(yyvsp[(3) - (11)].StrVal));
   delete (yyvsp[(3) - (11)].StrVal);  // Free strdup'd memory!
@@ -5655,8 +5656,8 @@
 ;}
     break;
 
-  case 257:
-#line 2468 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 258:
+#line 2469 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = CurFun.CurrentFunction;
 
@@ -5667,16 +5668,16 @@
 ;}
     break;
 
-  case 260:
-#line 2479 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 261:
+#line 2480 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
   CHECK_FOR_ERROR
 ;}
     break;
 
-  case 261:
-#line 2484 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 262:
+#line 2485 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.CurrentFunction->setLinkage((yyvsp[(1) - (3)].Linkage));
     CurFun.CurrentFunction->setVisibility((yyvsp[(2) - (3)].Visibility));
@@ -5686,40 +5687,40 @@
   ;}
     break;
 
-  case 262:
-#line 2496 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 263:
+#line 2497 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 263:
-#line 2500 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 264:
+#line 2501 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 264:
-#line 2505 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 265:
+#line 2506 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {    // A reference to a direct constant
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].SInt64Val));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 265:
-#line 2509 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 266:
+#line 2510 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].UInt64Val));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 266:
-#line 2513 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 267:
+#line 2514 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     (yyval.ValIDVal) = ValID::create(*(yyvsp[(1) - (1)].APIntVal), true);
     delete (yyvsp[(1) - (1)].APIntVal);
@@ -5727,8 +5728,8 @@
   ;}
     break;
 
-  case 267:
-#line 2518 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 268:
+#line 2519 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     (yyval.ValIDVal) = ValID::create(*(yyvsp[(1) - (1)].APIntVal), false);
     delete (yyvsp[(1) - (1)].APIntVal);
@@ -5736,56 +5737,56 @@
   ;}
     break;
 
-  case 268:
-#line 2523 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 269:
+#line 2524 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {                     // Perhaps it's an FP constant?
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].FPVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 269:
-#line 2527 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 270:
+#line 2528 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getTrue());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 270:
-#line 2531 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 271:
+#line 2532 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getFalse());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 271:
-#line 2535 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 272:
+#line 2536 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createNull();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 272:
-#line 2539 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 273:
+#line 2540 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createUndef();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 273:
-#line 2543 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 274:
+#line 2544 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {     // A vector zero constant.
     (yyval.ValIDVal) = ValID::createZeroInit();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 274:
-#line 2547 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 275:
+#line 2548 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized packed vector
     const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0]->getType();
     unsigned NumElements = (yyvsp[(2) - (3)].ConstVector)->size(); 
@@ -5810,8 +5811,8 @@
   ;}
     break;
 
-  case 275:
-#line 2569 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 276:
+#line 2570 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0]->getType();
     uint64_t NumElements = (yyvsp[(2) - (3)].ConstVector)->size(); 
@@ -5836,8 +5837,8 @@
   ;}
     break;
 
-  case 276:
-#line 2591 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 277:
+#line 2592 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Use undef instead of an array because it's inconvenient to determine
     // the element type at this point, there being no elements to examine.
@@ -5846,8 +5847,8 @@
   ;}
     break;
 
-  case 277:
-#line 2597 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 278:
+#line 2598 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     uint64_t NumElements = (yyvsp[(2) - (2)].StrVal)->length();
     const Type *ETy = Type::Int8Ty;
@@ -5863,8 +5864,8 @@
   ;}
     break;
 
-  case 278:
-#line 2610 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 279:
+#line 2611 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements((yyvsp[(2) - (3)].ConstVector)->size());
     for (unsigned i = 0, e = (yyvsp[(2) - (3)].ConstVector)->size(); i != e; ++i)
@@ -5879,8 +5880,8 @@
   ;}
     break;
 
-  case 279:
-#line 2622 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 280:
+#line 2623 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = StructType::get(std::vector<const Type*>());
     (yyval.ValIDVal) = ValID::create(ConstantStruct::get(STy, std::vector<Constant*>()));
@@ -5888,8 +5889,8 @@
   ;}
     break;
 
-  case 280:
-#line 2627 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 281:
+#line 2628 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements((yyvsp[(3) - (5)].ConstVector)->size());
     for (unsigned i = 0, e = (yyvsp[(3) - (5)].ConstVector)->size(); i != e; ++i)
@@ -5904,8 +5905,8 @@
   ;}
     break;
 
-  case 281:
-#line 2639 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 282:
+#line 2640 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = StructType::get(std::vector<const Type*>(),
                                             /*isPacked=*/true);
@@ -5914,16 +5915,16 @@
   ;}
     break;
 
-  case 282:
-#line 2645 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 283:
+#line 2646 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 283:
-#line 2649 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 284:
+#line 2650 "/Users/sabre/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);
@@ -5932,24 +5933,24 @@
   ;}
     break;
 
-  case 284:
-#line 2659 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 285:
+#line 2660 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {  // Is it an integer reference...?
     (yyval.ValIDVal) = ValID::createLocalID((yyvsp[(1) - (1)].UIntVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 285:
-#line 2663 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 286:
+#line 2664 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createGlobalID((yyvsp[(1) - (1)].UIntVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 286:
-#line 2667 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 287:
+#line 2668 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -5957,8 +5958,8 @@
   ;}
     break;
 
-  case 287:
-#line 2672 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 288:
+#line 2673 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createGlobalName(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -5966,8 +5967,8 @@
   ;}
     break;
 
-  case 290:
-#line 2685 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 291:
+#line 2686 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -5977,8 +5978,8 @@
   ;}
     break;
 
-  case 291:
-#line 2694 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 292:
+#line 2695 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = new std::vector<Value *>();
     (yyval.ValueList)->push_back((yyvsp[(1) - (1)].ValueVal)); 
@@ -5986,32 +5987,32 @@
   ;}
     break;
 
-  case 292:
-#line 2699 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 293:
+#line 2700 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ValueList)=(yyvsp[(1) - (3)].ValueList))->push_back((yyvsp[(3) - (3)].ValueVal)); 
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 293:
-#line 2704 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 294:
+#line 2705 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 294:
-#line 2708 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 295:
+#line 2709 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Do not allow functions with 0 basic blocks   
     (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 295:
-#line 2717 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 296:
+#line 2718 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     setValueName((yyvsp[(3) - (3)].TermInstVal), (yyvsp[(2) - (3)].StrVal));
     CHECK_FOR_ERROR
@@ -6022,8 +6023,8 @@
   ;}
     break;
 
-  case 296:
-#line 2726 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 297:
+#line 2727 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   CHECK_FOR_ERROR
   int ValNum = InsertValue((yyvsp[(3) - (3)].TermInstVal));
@@ -6037,8 +6038,8 @@
 ;}
     break;
 
-  case 297:
-#line 2739 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 298:
+#line 2740 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (CastInst *CI1 = dyn_cast<CastInst>((yyvsp[(2) - (2)].InstVal)))
       if (CastInst *CI2 = dyn_cast<CastInst>(CI1->getOperand(0)))
@@ -6050,16 +6051,16 @@
   ;}
     break;
 
-  case 298:
-#line 2748 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 299:
+#line 2749 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {          // Empty space between instruction lists
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 299:
-#line 2752 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 300:
+#line 2753 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {             // Labelled (named) basic block
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal)));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -6068,8 +6069,8 @@
   ;}
     break;
 
-  case 300:
-#line 2760 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 301:
+#line 2761 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Return with a result...
     ValueList &VL = *(yyvsp[(2) - (2)].ValueList);
     assert(!VL.empty() && "Invalid ret operands!");
@@ -6092,16 +6093,16 @@
   ;}
     break;
 
-  case 301:
-#line 2780 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 302:
+#line 2781 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {                                    // Return with no result...
     (yyval.TermInstVal) = ReturnInst::Create();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 302:
-#line 2784 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 303:
+#line 2785 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {                           // Unconditional Branch...
     BasicBlock* tmpBB = getBBVal((yyvsp[(3) - (3)].ValIDVal));
     CHECK_FOR_ERROR
@@ -6109,8 +6110,8 @@
   ;}
     break;
 
-  case 303:
-#line 2789 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 304:
+#line 2790 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {  
     if (cast<IntegerType>((yyvsp[(2) - (9)].PrimType))->getBitWidth() != 1)
       GEN_ERROR("Branch condition must have type i1");
@@ -6124,8 +6125,8 @@
   ;}
     break;
 
-  case 304:
-#line 2800 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 305:
+#line 2801 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[(2) - (9)].PrimType), (yyvsp[(3) - (9)].ValIDVal));
     CHECK_FOR_ERROR
@@ -6147,8 +6148,8 @@
   ;}
     break;
 
-  case 305:
-#line 2819 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 306:
+#line 2820 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[(2) - (8)].PrimType), (yyvsp[(3) - (8)].ValIDVal));
     CHECK_FOR_ERROR
@@ -6160,8 +6161,8 @@
   ;}
     break;
 
-  case 306:
-#line 2829 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 307:
+#line 2830 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -6249,24 +6250,24 @@
   ;}
     break;
 
-  case 307:
-#line 2914 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 308:
+#line 2915 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnwindInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 308:
-#line 2918 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 309:
+#line 2919 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnreachableInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 309:
-#line 2925 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 310:
+#line 2926 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = (yyvsp[(1) - (6)].JumpTable);
     Constant *V = cast<Constant>(getExistingVal((yyvsp[(2) - (6)].PrimType), (yyvsp[(3) - (6)].ValIDVal)));
@@ -6280,8 +6281,8 @@
   ;}
     break;
 
-  case 310:
-#line 2936 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 311:
+#line 2937 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
     Constant *V = cast<Constant>(getExistingVal((yyvsp[(1) - (5)].PrimType), (yyvsp[(2) - (5)].ValIDVal)));
@@ -6296,8 +6297,8 @@
   ;}
     break;
 
-  case 311:
-#line 2949 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 312:
+#line 2950 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Is this definition named?? if so, assign the name...
     setValueName((yyvsp[(2) - (2)].InstVal), (yyvsp[(1) - (2)].StrVal));
@@ -6308,8 +6309,8 @@
   ;}
     break;
 
-  case 312:
-#line 2958 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 313:
+#line 2959 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
     int ValNum = InsertValue((yyvsp[(2) - (2)].InstVal));
@@ -6323,8 +6324,8 @@
   ;}
     break;
 
-  case 313:
-#line 2971 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 314:
+#line 2972 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {    // Used for PHI nodes
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (6)].TypeVal))->getDescription());
@@ -6338,8 +6339,8 @@
   ;}
     break;
 
-  case 314:
-#line 2982 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 315:
+#line 2983 "/Users/sabre/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));
@@ -6350,8 +6351,8 @@
   ;}
     break;
 
-  case 315:
-#line 2992 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 316:
+#line 2993 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
     if (!UpRefs.empty())
@@ -6365,8 +6366,8 @@
   ;}
     break;
 
-  case 316:
-#line 3003 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 317:
+#line 3004 "/Users/sabre/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
@@ -6377,8 +6378,8 @@
   ;}
     break;
 
-  case 317:
-#line 3011 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 318:
+#line 3012 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
     if (!UpRefs.empty())
@@ -6391,8 +6392,8 @@
   ;}
     break;
 
-  case 318:
-#line 3021 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 319:
+#line 3022 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
     (yyval.ParamList) = (yyvsp[(1) - (6)].ParamList);
@@ -6402,18 +6403,18 @@
   ;}
     break;
 
-  case 319:
-#line 3028 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 320:
+#line 3029 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamList) = new ParamList(); ;}
     break;
 
-  case 320:
-#line 3031 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 321:
+#line 3032 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueList) = new std::vector<Value*>(); ;}
     break;
 
-  case 321:
-#line 3032 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 322:
+#line 3033 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = (yyvsp[(1) - (3)].ValueList);
     (yyval.ValueList)->push_back((yyvsp[(3) - (3)].ValueVal));
@@ -6421,8 +6422,8 @@
   ;}
     break;
 
-  case 322:
-#line 3040 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 323:
+#line 3041 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstantList) = new std::vector<unsigned>();
     if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val))
@@ -6431,8 +6432,8 @@
   ;}
     break;
 
-  case 323:
-#line 3046 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 324:
+#line 3047 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstantList) = (yyvsp[(1) - (3)].ConstantList);
     if ((unsigned)(yyvsp[(3) - (3)].UInt64Val) != (yyvsp[(3) - (3)].UInt64Val))
@@ -6442,24 +6443,24 @@
   ;}
     break;
 
-  case 324:
-#line 3055 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 325:
+#line 3056 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 325:
-#line 3059 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 326:
+#line 3060 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 326:
-#line 3064 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 327:
+#line 3065 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
@@ -6478,8 +6479,8 @@
   ;}
     break;
 
-  case 327:
-#line 3080 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 328:
+#line 3081 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
@@ -6499,8 +6500,8 @@
   ;}
     break;
 
-  case 328:
-#line 3097 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 329:
+#line 3098 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6515,8 +6516,8 @@
   ;}
     break;
 
-  case 329:
-#line 3109 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 330:
+#line 3110 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6531,8 +6532,8 @@
   ;}
     break;
 
-  case 330:
-#line 3121 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 331:
+#line 3122 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6549,8 +6550,8 @@
   ;}
     break;
 
-  case 331:
-#line 3135 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 332:
+#line 3136 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6567,8 +6568,8 @@
   ;}
     break;
 
-  case 332:
-#line 3149 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 333:
+#line 3150 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription());
@@ -6583,8 +6584,8 @@
   ;}
     break;
 
-  case 333:
-#line 3161 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 334:
+#line 3162 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (isa<VectorType>((yyvsp[(2) - (6)].ValueVal)->getType())) {
       // vector select
@@ -6608,8 +6609,8 @@
   ;}
     break;
 
-  case 334:
-#line 3182 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 335:
+#line 3183 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription());
@@ -6619,8 +6620,8 @@
   ;}
     break;
 
-  case 335:
-#line 3189 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 336:
+#line 3190 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[(2) - (4)].ValueVal), (yyvsp[(4) - (4)].ValueVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -6629,8 +6630,8 @@
   ;}
     break;
 
-  case 336:
-#line 3195 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 337:
+#line 3196 "/Users/sabre/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");
@@ -6639,8 +6640,8 @@
   ;}
     break;
 
-  case 337:
-#line 3201 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 338:
+#line 3202 "/Users/sabre/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");
@@ -6649,8 +6650,8 @@
   ;}
     break;
 
-  case 338:
-#line 3207 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 339:
+#line 3208 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const Type *Ty = (yyvsp[(2) - (2)].PHIList)->front().first->getType();
     if (!Ty->isFirstClassType())
@@ -6668,8 +6669,8 @@
   ;}
     break;
 
-  case 339:
-#line 3223 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 340:
+#line 3224 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -6761,32 +6762,32 @@
   ;}
     break;
 
-  case 340:
-#line 3312 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 341:
+#line 3313 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = (yyvsp[(1) - (1)].InstVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 341:
-#line 3317 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 342:
+#line 3318 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 342:
-#line 3321 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 343:
+#line 3322 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 343:
-#line 3328 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 344:
+#line 3329 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription());
@@ -6796,8 +6797,8 @@
   ;}
     break;
 
-  case 344:
-#line 3335 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 345:
+#line 3336 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription());
@@ -6810,8 +6811,8 @@
   ;}
     break;
 
-  case 345:
-#line 3345 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 346:
+#line 3346 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription());
@@ -6821,8 +6822,8 @@
   ;}
     break;
 
-  case 346:
-#line 3352 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 347:
+#line 3353 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription());
@@ -6835,8 +6836,8 @@
   ;}
     break;
 
-  case 347:
-#line 3362 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 348:
+#line 3363 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[(2) - (2)].ValueVal)->getType()))
       GEN_ERROR("Trying to free nonpointer type " + 
@@ -6846,8 +6847,8 @@
   ;}
     break;
 
-  case 348:
-#line 3370 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 349:
+#line 3371 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
@@ -6864,8 +6865,8 @@
   ;}
     break;
 
-  case 349:
-#line 3384 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 350:
+#line 3385 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (7)].TypeVal))->getDescription());
@@ -6885,8 +6886,8 @@
   ;}
     break;
 
-  case 350:
-#line 3401 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 351:
+#line 3402 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
@@ -6903,8 +6904,8 @@
   ;}
     break;
 
-  case 351:
-#line 3415 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 352:
+#line 3416 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription());
@@ -6922,8 +6923,8 @@
   ;}
     break;
 
-  case 352:
-#line 3430 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 353:
+#line 3431 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription());
@@ -6941,8 +6942,8 @@
   ;}
     break;
 
-  case 353:
-#line 3445 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 354:
+#line 3446 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (7)].TypeVal))->getDescription());
@@ -6964,7 +6965,7 @@
 
 
 /* Line 1267 of yacc.c.  */
-#line 6968 "llvmAsmParser.tab.c"
+#line 6969 "llvmAsmParser.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -7178,7 +7179,7 @@
 }
 
 
-#line 3464 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3465 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
 
 
 // common code from the two 'RunVMAsmParser' functions

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

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs Tue Sep 23 16:18:31 2008
@@ -366,7 +366,7 @@
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 970 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 970 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;

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

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs Tue Sep 23 16:18:31 2008
@@ -1282,6 +1282,7 @@
 
 FuncAttr      : NORETURN { $$ = ParamAttr::NoReturn; }
               | NOUNWIND { $$ = ParamAttr::NoUnwind; }
+              | INREG    { $$ = ParamAttr::InReg;     }
               | ZEROEXT  { $$ = ParamAttr::ZExt;     }
               | SIGNEXT  { $$ = ParamAttr::SExt;     }
               | READNONE { $$ = ParamAttr::ReadNone; }




From gohman at apple.com  Tue Sep 23 16:40:44 2008
From: gohman at apple.com (Dan Gohman)
Date: Tue, 23 Sep 2008 21:40:44 -0000
Subject: [llvm-commits] [llvm] r56504 -
	/llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp
Message-ID: <200809232140.m8NLeiMx028349@zion.cs.uiuc.edu>

Author: djg
Date: Tue Sep 23 16:40:44 2008
New Revision: 56504

URL: http://llvm.org/viewvc/llvm-project?rev=56504&view=rev
Log:
Track local physical register liveness. This is not the most
efficient implementation possible, but it's pretty simple and
good enough for the time being.

Modified:
    llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp

Modified: llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp?rev=56504&r1=56503&r2=56504&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp (original)
+++ llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp Tue Sep 23 16:40:44 2008
@@ -42,16 +42,38 @@
 
 bool DeadMachineInstructionElim::runOnMachineFunction(MachineFunction &MF) {
   bool AnyChanges = false;
+  const TargetRegisterInfo &TRI = *MF.getTarget().getRegisterInfo();
   const MachineRegisterInfo &MRI = MF.getRegInfo();
   const TargetInstrInfo &TII = *MF.getTarget().getInstrInfo();
+  BitVector LivePhysRegs;
   bool SawStore = true;
 
+  // Compute a bitvector to represent all non-allocatable physregs.
+  BitVector NonAllocatableRegs = TRI.getAllocatableSet(MF);
+  NonAllocatableRegs.flip();
+
   // Loop over all instructions in all blocks, from bottom to top, so that it's
   // more likely that chains of dependent but ultimately dead instructions will
   // be cleaned up.
   for (MachineFunction::reverse_iterator I = MF.rbegin(), E = MF.rend();
        I != E; ++I) {
     MachineBasicBlock *MBB = &*I;
+
+    // Start out assuming that all non-allocatable registers are live
+    // out of this block.
+    LivePhysRegs = NonAllocatableRegs;
+
+    // Also add any explicit live-out physregs for this block.
+    if (!MBB->empty() && MBB->back().getDesc().isReturn())
+      for (MachineRegisterInfo::liveout_iterator LOI = MRI.liveout_begin(),
+           LOE = MRI.liveout_end(); LOI != LOE; ++LOI) {
+        unsigned Reg = *LOI;
+        if (TargetRegisterInfo::isPhysicalRegister(Reg))
+          LivePhysRegs.set(Reg);
+      }
+
+    // Now scan the instructions and delete dead ones, tracking physreg
+    // liveness as we go.
     for (MachineBasicBlock::reverse_iterator MII = MBB->rbegin(),
          MIE = MBB->rend(); MII != MIE; ) {
       MachineInstr *MI = &*MII;
@@ -64,9 +86,8 @@
           const MachineOperand &MO = MI->getOperand(i);
           if (MO.isRegister() && MO.isDef()) {
             unsigned Reg = MO.getReg();
-            if ((!MO.isImplicit() &&
-                 TargetRegisterInfo::isPhysicalRegister(Reg)) ||
-                !MRI.use_empty(Reg)) {
+            if (TargetRegisterInfo::isPhysicalRegister(Reg) ?
+                LivePhysRegs[Reg] : !MRI.use_empty(Reg)) {
               // This def has a use. Don't delete the instruction!
               AllDefsDead = false;
               break;
@@ -90,6 +111,35 @@
           continue;
         }
       }
+
+      // Record the physreg defs.
+      for (unsigned i = 0, e = MI->getNumOperands(); i != e; ++i) {
+        const MachineOperand &MO = MI->getOperand(i);
+        if (MO.isRegister() && MO.isDef()) {
+          unsigned Reg = MO.getReg();
+          if (Reg != 0 && TargetRegisterInfo::isPhysicalRegister(Reg)) {
+            LivePhysRegs.reset(Reg);
+            for (const unsigned *AliasSet = TRI.getAliasSet(Reg);
+                 *AliasSet; ++AliasSet)
+              LivePhysRegs.reset(*AliasSet);
+          }
+        }
+      }
+      // Record the physreg uses, after the defs, in case a physreg is
+      // both defined and used in the same instruction.
+      for (unsigned i = 0, e = MI->getNumOperands(); i != e; ++i) {
+        const MachineOperand &MO = MI->getOperand(i);
+        if (MO.isRegister() && MO.isUse()) {
+          unsigned Reg = MO.getReg();
+          if (Reg != 0 && TargetRegisterInfo::isPhysicalRegister(Reg)) {
+            LivePhysRegs.set(Reg);
+            for (const unsigned *AliasSet = TRI.getAliasSet(Reg);
+                 *AliasSet; ++AliasSet)
+              LivePhysRegs.set(*AliasSet);
+          }
+        }
+      }
+
       // We didn't delete the current instruction, so increment MII to
       // the next one.
       ++MII;




From kremenek at apple.com  Tue Sep 23 16:45:38 2008
From: kremenek at apple.com (Ted Kremenek)
Date: Tue, 23 Sep 2008 21:45:38 -0000
Subject: [llvm-commits] [llvm] r56505 - /llvm/tags/checker/checker-97/
Message-ID: <200809232145.m8NLjcdX028604@zion.cs.uiuc.edu>

Author: kremenek
Date: Tue Sep 23 16:45:38 2008
New Revision: 56505

URL: http://llvm.org/viewvc/llvm-project?rev=56505&view=rev
Log:
Tagging checker-97.

Added:
    llvm/tags/checker/checker-97/
      - copied from r56504, llvm/trunk/



From gohman at apple.com  Tue Sep 23 16:53:34 2008
From: gohman at apple.com (Dan Gohman)
Date: Tue, 23 Sep 2008 21:53:34 -0000
Subject: [llvm-commits] [llvm] r56508 - in /llvm/trunk:
 include/llvm/CodeGen/FastISel.h include/llvm/CodeGen/SelectionDAGISel.h
 include/llvm/Target/TargetLowering.h lib/CodeGen/SelectionDAG/FastISel.cpp
 lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
 lib/Target/X86/X86FastISel.cpp lib/Target/X86/X86ISelLowering.cpp
 lib/Target/X86/X86ISelLowering.h
Message-ID: <200809232153.m8NLrZwT029035@zion.cs.uiuc.edu>

Author: djg
Date: Tue Sep 23 16:53:34 2008
New Revision: 56508

URL: http://llvm.org/viewvc/llvm-project?rev=56508&view=rev
Log:
Arrange for FastISel code to have access to the MachineModuleInfo
object. This will be needed to support debug info.

Modified:
    llvm/trunk/include/llvm/CodeGen/FastISel.h
    llvm/trunk/include/llvm/CodeGen/SelectionDAGISel.h
    llvm/trunk/include/llvm/Target/TargetLowering.h
    llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
    llvm/trunk/lib/Target/X86/X86FastISel.cpp
    llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
    llvm/trunk/lib/Target/X86/X86ISelLowering.h

Modified: llvm/trunk/include/llvm/CodeGen/FastISel.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/FastISel.h?rev=56508&r1=56507&r2=56508&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/FastISel.h (original)
+++ llvm/trunk/include/llvm/CodeGen/FastISel.h Tue Sep 23 16:53:34 2008
@@ -26,6 +26,7 @@
 class MachineConstantPool;
 class MachineFunction;
 class MachineFrameInfo;
+class MachineModuleInfo;
 class MachineRegisterInfo;
 class TargetData;
 class TargetInstrInfo;
@@ -44,6 +45,7 @@
   DenseMap<const BasicBlock *, MachineBasicBlock *> &MBBMap;
   DenseMap<const AllocaInst *, int> &StaticAllocaMap;
   MachineFunction &MF;
+  MachineModuleInfo *MMI;
   MachineRegisterInfo &MRI;
   MachineFrameInfo &MFI;
   MachineConstantPool &MCP;
@@ -94,6 +96,7 @@
 
 protected:
   FastISel(MachineFunction &mf,
+           MachineModuleInfo *mmi,
            DenseMap<const Value *, unsigned> &vm,
            DenseMap<const BasicBlock *, MachineBasicBlock *> &bm,
            DenseMap<const AllocaInst *, int> &am);

Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAGISel.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAGISel.h?rev=56508&r1=56507&r2=56508&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/SelectionDAGISel.h (original)
+++ llvm/trunk/include/llvm/CodeGen/SelectionDAGISel.h Tue Sep 23 16:53:34 2008
@@ -28,6 +28,7 @@
   class MachineBasicBlock;
   class MachineFunction;
   class MachineInstr;
+  class MachineModuleInfo;
   class TargetLowering;
   class FunctionLoweringInfo;
   class HazardRecognizer;
@@ -106,7 +107,8 @@
                     int64_t DesiredMaskS) const;
   
 private:
-  void SelectAllBasicBlocks(Function &Fn, MachineFunction &MF);
+  void SelectAllBasicBlocks(Function &Fn, MachineFunction &MF,
+                            MachineModuleInfo *MMI);
   void FinishBasicBlock();
 
   void SelectBasicBlock(BasicBlock *LLVMBB,

Modified: llvm/trunk/include/llvm/Target/TargetLowering.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetLowering.h?rev=56508&r1=56507&r2=56508&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/TargetLowering.h (original)
+++ llvm/trunk/include/llvm/Target/TargetLowering.h Tue Sep 23 16:53:34 2008
@@ -40,6 +40,7 @@
   class MachineFunction;
   class MachineFrameInfo;
   class MachineInstr;
+  class MachineModuleInfo;
   class SDNode;
   class SDValue;
   class SelectionDAG;
@@ -1120,6 +1121,7 @@
   /// or null if the target does not support "fast" ISel.
   virtual FastISel *
   createFastISel(MachineFunction &,
+                 MachineModuleInfo *,
                  DenseMap<const Value *, unsigned> &,
                  DenseMap<const BasicBlock *, MachineBasicBlock *> &,
                  DenseMap<const AllocaInst *, int> &) {

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp Tue Sep 23 16:53:34 2008
@@ -450,7 +450,7 @@
     UpdateValueMap(I, Reg);
     return true;
   }
-  
+
   default:
     // Unhandled instruction. Halt "fast" selection and bail.
     return false;
@@ -458,6 +458,7 @@
 }
 
 FastISel::FastISel(MachineFunction &mf,
+                   MachineModuleInfo *mmi,
                    DenseMap<const Value *, unsigned> &vm,
                    DenseMap<const BasicBlock *, MachineBasicBlock *> &bm,
                    DenseMap<const AllocaInst *, int> &am)
@@ -466,6 +467,7 @@
     MBBMap(bm),
     StaticAllocaMap(am),
     MF(mf),
+    MMI(mmi),
     MRI(MF.getRegInfo()),
     MFI(*MF.getFrameInfo()),
     MCP(*MF.getConstantPool()),

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Tue Sep 23 16:53:34 2008
@@ -309,7 +309,8 @@
   DOUT << "\n\n\n=== " << Fn.getName() << "\n";
 
   FuncInfo->set(Fn, MF, EnableFastISel);
-  CurDAG->init(MF, getAnalysisToUpdate<MachineModuleInfo>());
+  MachineModuleInfo *MMI = getAnalysisToUpdate<MachineModuleInfo>();
+  CurDAG->init(MF, MMI);
   SDL->init(GFI, *AA);
 
   for (Function::iterator I = Fn.begin(), E = Fn.end(); I != E; ++I)
@@ -317,7 +318,7 @@
       // Mark landing pad.
       FuncInfo->MBBMap[Invoke->getSuccessor(1)]->setIsLandingPad();
 
-  SelectAllBasicBlocks(Fn, MF);
+  SelectAllBasicBlocks(Fn, MF, MMI);
 
   // If the first basic block in the function has live ins that need to be
   // copied into vregs, emit the copies into the top of the block before
@@ -710,7 +711,8 @@
   DEBUG(BB->dump());
 }  
 
-void SelectionDAGISel::SelectAllBasicBlocks(Function &Fn, MachineFunction &MF) {
+void SelectionDAGISel::SelectAllBasicBlocks(Function &Fn, MachineFunction &MF,
+                                            MachineModuleInfo *MMI) {
   for (Function::iterator I = Fn.begin(), E = Fn.end(); I != E; ++I) {
     BasicBlock *LLVMBB = &*I;
     BB = FuncInfo->MBBMap[LLVMBB];
@@ -726,7 +728,8 @@
     // Before doing SelectionDAG ISel, see if FastISel has been requested.
     // FastISel doesn't support EH landing pads, which require special handling.
     if (EnableFastISel && !BB->isLandingPad()) {
-      if (FastISel *F = TLI.createFastISel(*FuncInfo->MF, FuncInfo->ValueMap,
+      if (FastISel *F = TLI.createFastISel(*FuncInfo->MF, MMI,
+                                           FuncInfo->ValueMap,
                                            FuncInfo->MBBMap,
                                            FuncInfo->StaticAllocaMap)) {
         // Emit code for any incoming arguments. This must happen before

Modified: llvm/trunk/lib/Target/X86/X86FastISel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86FastISel.cpp?rev=56508&r1=56507&r2=56508&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86FastISel.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86FastISel.cpp Tue Sep 23 16:53:34 2008
@@ -49,10 +49,11 @@
 
 public:
   explicit X86FastISel(MachineFunction &mf,
+                       MachineModuleInfo *mmi,
                        DenseMap<const Value *, unsigned> &vm,
                        DenseMap<const BasicBlock *, MachineBasicBlock *> &bm,
                        DenseMap<const AllocaInst *, int> &am)
-    : FastISel(mf, vm, bm, am) {
+    : FastISel(mf, mmi, vm, bm, am) {
     Subtarget = &TM.getSubtarget<X86Subtarget>();
     StackPtr = Subtarget->is64Bit() ? X86::RSP : X86::ESP;
     X86ScalarSSEf64 = Subtarget->hasSSE2();
@@ -1160,9 +1161,10 @@
 
 namespace llvm {
   llvm::FastISel *X86::createFastISel(MachineFunction &mf,
+                        MachineModuleInfo *mmi,
                         DenseMap<const Value *, unsigned> &vm,
                         DenseMap<const BasicBlock *, MachineBasicBlock *> &bm,
                         DenseMap<const AllocaInst *, int> &am) {
-    return new X86FastISel(mf, vm, bm, am);
+    return new X86FastISel(mf, mmi, vm, bm, am);
   }
 }

Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=56508&r1=56507&r2=56508&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Tue Sep 23 16:53:34 2008
@@ -1866,12 +1866,13 @@
 
 FastISel *
 X86TargetLowering::createFastISel(MachineFunction &mf,
+                                  MachineModuleInfo *mmo,
                                   DenseMap<const Value *, unsigned> &vm,
                                   DenseMap<const BasicBlock *,
                                            MachineBasicBlock *> &bm,
                                   DenseMap<const AllocaInst *, int> &am) {
                                          
-  return X86::createFastISel(mf, vm, bm, am);
+  return X86::createFastISel(mf, mmo, vm, bm, am);
 }
 
 

Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.h?rev=56508&r1=56507&r2=56508&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelLowering.h (original)
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.h Tue Sep 23 16:53:34 2008
@@ -472,6 +472,7 @@
     /// or null if the target does not support "fast" ISel.
     virtual FastISel *
     createFastISel(MachineFunction &mf,
+                   MachineModuleInfo *mmi,
                    DenseMap<const Value *, unsigned> &,
                    DenseMap<const BasicBlock *, MachineBasicBlock *> &,
                    DenseMap<const AllocaInst *, int> &);
@@ -604,6 +605,7 @@
 
   namespace X86 {
     FastISel *createFastISel(MachineFunction &mf,
+                           MachineModuleInfo *mmi,
                            DenseMap<const Value *, unsigned> &,
                            DenseMap<const BasicBlock *, MachineBasicBlock *> &,
                            DenseMap<const AllocaInst *, int> &);




From gohman at apple.com  Tue Sep 23 17:04:18 2008
From: gohman at apple.com (Dan Gohman)
Date: Tue, 23 Sep 2008 22:04:18 -0000
Subject: [llvm-commits] [llvm] r56509 -
	/llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp
Message-ID: <200809232204.m8NM4I2W029420@zion.cs.uiuc.edu>

Author: djg
Date: Tue Sep 23 17:04:18 2008
New Revision: 56509

URL: http://llvm.org/viewvc/llvm-project?rev=56509&view=rev
Log:
Now that DeadMachineInstructionElim is basically working
correctly, it's not necessary to explicitly remove registers
from their use-def lists.

Modified:
    llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp

Modified: llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp?rev=56509&r1=56508&r2=56509&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp (original)
+++ llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp Tue Sep 23 17:04:18 2008
@@ -97,12 +97,6 @@
 
         // If there are no defs with uses, the instruction is dead.
         if (AllDefsDead) {
-          // Clear out the operands to take the registers out of their
-          // use chains.
-          while (unsigned Num = MI->getNumOperands())
-            MI->RemoveOperand(Num-1);
-
-          // Delete the actual instruction.
           AnyChanges = true;
           MI->eraseFromParent();
           MIE = MBB->rend();




From clattner at apple.com  Tue Sep 23 17:16:54 2008
From: clattner at apple.com (Chris Lattner)
Date: Tue, 23 Sep 2008 15:16:54 -0700
Subject: [llvm-commits] [llvm-gcc-4.2] r55718 -
	/llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp
In-Reply-To: <ADAF4BAD-C7D7-4FF8-8756-CBFA1975DBEE@apple.com>
References: <200809032001.m83K1RkI012649@zion.cs.uiuc.edu>
	<4DF68CD0-1A0C-4B54-AE37-0F8D18FDF11D@apple.com>
	<7AE2A0A8-5EFC-4559-A100-14B2BB4C89A5@apple.com>
	<1BAD5C02-8779-40FD-88C6-6C75B33ABA6B@apple.com>
	<ADAF4BAD-C7D7-4FF8-8756-CBFA1975DBEE@apple.com>
Message-ID: <DD3DF5BB-8949-42C8-8D2C-1198485C46F0@apple.com>


On Sep 23, 2008, at 10:22 AM, Devang Patel wrote:

>>>
>>> Only one advantage is a small convenience to llvm developers. When  
>>> we are using -analyze or -print or intentionally running selected  
>>> pass for debugging/testing then you do not want PassManager to  
>>> annoy you. This is not a big deal, and I do not see any advantage  
>>> for end users.
>>
>> How would it be annoying?  I don't understand.  It is just an  
>> optimization to speed up the pass.
>
> OK.  I spent some time investigating this, now the big question is  
> "Where in the pass sequence ?"
>

I don't understand what you're asking?  You're asking where the always  
inline pass should go?  If so, "at the start of the pass manager".  We  
should do always inlining before anything else.  In fact, it is  
probably better to do always inlinling completely separately from  
normal inlining.

-Chris


From dalej at apple.com  Tue Sep 23 17:17:28 2008
From: dalej at apple.com (Dale Johannesen)
Date: Tue, 23 Sep 2008 15:17:28 -0700
Subject: [llvm-commits] [llvm] r56384 - in /llvm/trunk/lib/CodeGen:
	RegAllocLinearScan.cpp SimpleRegisterCoalescing.cpp
In-Reply-To: <99141E76-1A5C-4852-B1B5-7053DA9B02D5@apple.com>
References: <200809200203.m8K234YA013252@zion.cs.uiuc.edu>
	<4F71A860-E342-4A07-8211-0A59A1AA154D@apple.com>
	<F80F5034-326C-4AF5-A7A6-84F8C1C3AF23@apple.com>
	<8D81D6DA-8289-49E2-B352-53C6C313FDA8@apple.com>
	<33791BFC-A09D-43EB-B4D0-6582A9243EED@apple.com>
	<ADDCBC77-DB9F-46BB-A73D-FADC943C29D7@apple.com>
	<6AABEF56-39B2-4D47-8928-7FC4AC7AB61B@apple.com>
	<73CDDC9A-1C75-4A15-9931-12DDC51EABCB@apple.com>
	<C661BBE3-98E2-461C-BD90-5CA12268A65C@apple.com>
	<AAA125E9-8897-4B47-A405-CDFA1C83E8DA@apple.com>
	<99141E76-1A5C-4852-B1B5-7053DA9B02D5@apple.com>
Message-ID: <787EC48F-5ED1-4529-A821-021FC97B069F@apple.com>


On Sep 22, 2008, at 10:46 AMPDT, Evan Cheng wrote:

>
> On Sep 22, 2008, at 10:38 AM, Chris Lattner wrote:
>
>> On Sep 22, 2008, at 10:28 AM, Evan Cheng wrote:
>>>> Can you give me an example?  It sounds like these sorts of
>>>> assumptions
>>>> are exactly what we want: you can only coalesce a def/use of a copy
>>>> if
>>>> the live ranges exactly line up.  Overlapping by one slot is a
>>>> *good*
>>>> thing because we want to prevent coalescing.
>>>
>>> e.g.
>>>     // Figure out the value # from the RHS.
>>>     LHSValsDefinedFromRHS[VNI]=RHS.getLiveRangeContaining(VNI-
>>>> def-1)->valno;
>>>
>>> Ok, so most of the assertions are for copies:
>>> But it is possible modeling the def this way will *just work*. I
>>> doubt
>>> it, but it's worth experimenting.
>>
>> I would strongly prefer this.  Even if there are cases that don't
>> "just work", I think this is the correct way to model it, and the
>> right long-term answer.
>
> Ok fine. Sorry for being overly careful when it comes to the
> coalescer.

This did basically Just Work (I haven't run the gcc testsuite yet, but  
it doesn't break anything in
the llvm testsuite and fixes all the examples in our bug reports.)   
Unfortunately, this approach
only works in the linear scan RA, while we use a different RA with - 
O0.... I guess I need to fix
that before turning it on.

> Owen, can your liveintervals renumbering work be impacted?
> i.e. Does it assume def must be one cycle before use?
>
>>
>>
>>>> Can earlyclobber operands be used to model the armv4 "mul" register
>>>> weirdness where the input and output regs can't be the same?
>>>
>>> We could, but the correct way to model it is to push the use down  
>>> one
>>> cycle, not def up one cycle. The problem with early clobber is the
>>> def
>>> cannot overlap any of the uses (both Rm and Rs). In the ARM mul  
>>> case,
>>> the def cannot overlap Rm only.
>>
>> Sure, I agree with that.  This is also true of most inline asms with
>> multiple instructions (like the example I gave).  Using earlyclobber
>> should be a conservative but correct solution (and much better than
>> using the 'multiply fixer' pass that used to exist).
>>
>> This would also make it easier to test that earlyclobber is working
>> right (multiplies are more frequent than & in asms), which is why I
>> brought it up. :)
>
> That will require some minor tblgen and TargetInstrDesc changes. If
> someone want to do that, sure.
>
> Evan
>
>>
>>
>> -Chris
>>
>> _______________________________________________
>> 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 dpatel at apple.com  Tue Sep 23 17:35:17 2008
From: dpatel at apple.com (Devang Patel)
Date: Tue, 23 Sep 2008 22:35:17 -0000
Subject: [llvm-commits] [llvm] r56511 - in /llvm/trunk: include/llvm/
 lib/AsmParser/ lib/Bitcode/Reader/ lib/Bitcode/Writer/
 lib/Target/X86/AsmPrinter/ lib/Transforms/IPO/ lib/Transforms/Scalar/
 lib/Transforms/Utils/ lib/VMCore/
Message-ID: <200809232235.m8NMZJGn030760@zion.cs.uiuc.edu>

Author: dpatel
Date: Tue Sep 23 17:35:17 2008
New Revision: 56511

URL: http://llvm.org/viewvc/llvm-project?rev=56511&view=rev
Log:
Use parameter attribute store (soon to be renamed) for
Function Notes also. Function notes are stored at index ~0.


Modified:
    llvm/trunk/include/llvm/Function.h
    llvm/trunk/include/llvm/ParameterAttributes.h
    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/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
    llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
    llvm/trunk/lib/Transforms/IPO/InlineAlways.cpp
    llvm/trunk/lib/Transforms/IPO/InlineSimple.cpp
    llvm/trunk/lib/Transforms/IPO/Inliner.cpp
    llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp
    llvm/trunk/lib/Transforms/Utils/InlineCost.cpp
    llvm/trunk/lib/VMCore/AsmWriter.cpp
    llvm/trunk/lib/VMCore/Function.cpp
    llvm/trunk/lib/VMCore/ParameterAttributes.cpp
    llvm/trunk/lib/VMCore/Verifier.cpp

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

==============================================================================
--- llvm/trunk/include/llvm/Function.h (original)
+++ llvm/trunk/include/llvm/Function.h Tue Sep 23 17:35:17 2008
@@ -51,12 +51,6 @@
   static int getListOffset();
 };
 
-typedef unsigned FunctionNotes;
-const FunctionNotes FN_NOTE_None            = 0;   
-const FunctionNotes FN_NOTE_NoInline        = 1<<0;
-const FunctionNotes FN_NOTE_AlwaysInline    = 1<<1;
-const FunctionNotes FN_NOTE_OptimizeForSize = 1<<2;
-
 class Function : public GlobalValue, public Annotable,
                  public ilist_node<Function> {
 public:
@@ -76,7 +70,6 @@
   mutable ArgumentListType ArgumentList;  ///< The formal arguments
   ValueSymbolTable *SymTab;               ///< Symbol table of args/instructions
   PAListPtr ParamAttrs;                   ///< Parameter attributes
-  FunctionNotes Notes;                    ///< Function properties
 
   // The Calling Convention is stored in Value::SubclassData.
   /*unsigned CallingConvention;*/
@@ -155,18 +148,19 @@
   ///
   void setParamAttrs(const PAListPtr &attrs) { ParamAttrs = attrs; }
 
-  /// getNotes - Return function notes
-  ///
-  const FunctionNotes &getNotes() const { return Notes; }
 
   /// hasNote - Return true if this function has given note.
-  bool hasNote(FunctionNotes N) const {
-    return (!isDeclaration() && (Notes & N));
+  bool hasNote(ParameterAttributes N) const {
+  	// Notes are stored at ~0 index in parameter attribute list
+    return (!isDeclaration() && paramHasAttr(~0, N));
   }
 
   /// setNotes - Set notes for this function
   ///
-  void setNotes(const FunctionNotes P) { Notes = Notes | P;}
+  void setNotes(const ParameterAttributes N) { 
+  	// Notes are stored at ~0 index in parameter attribute list
+  	addParamAttr(~0, N);
+  }
 
   /// hasGC/getGC/setGC/clearGC - The name of the garbage collection algorithm
   ///                             to use during code generation.

Modified: llvm/trunk/include/llvm/ParameterAttributes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ParameterAttributes.h?rev=56511&r1=56510&r2=56511&view=diff

==============================================================================
--- llvm/trunk/include/llvm/ParameterAttributes.h (original)
+++ llvm/trunk/include/llvm/ParameterAttributes.h Tue Sep 23 17:35:17 2008
@@ -46,6 +46,13 @@
 const Attributes ReadOnly  = 1<<10; ///< Function only reads from memory
 const Attributes Alignment = 0xffff<<16; ///< Alignment of parameter (16 bits)
                                     // 0 = unknown, else in clear (not log)
+                                    
+/// Function notes are implemented as attributes stored at index ~0 in 
+/// parameter attribute list.
+const Attributes FN_NOTE_None            = 0;    
+const Attributes FN_NOTE_NoInline        = 1<<0; // inline=never 
+const Attributes FN_NOTE_AlwaysInline    = 1<<1; // inline=always
+const Attributes FN_NOTE_OptimizeForSize = 1<<2; // opt_size
 
 /// @brief Attributes that only apply to function parameters.
 const Attributes ParameterOnly = ByVal | Nest | StructRet;

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

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs Tue Sep 23 17:35:17 2008
@@ -366,7 +366,7 @@
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 970 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 970 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
@@ -395,7 +395,7 @@
   llvm::GlobalValue::LinkageTypes         Linkage;
   llvm::GlobalValue::VisibilityTypes      Visibility;
   llvm::ParameterAttributes         ParamAttrs;
-  llvm::FunctionNotes               FunctionNotes;
+  llvm::ParameterAttributes         FunctionNotes;
   llvm::APInt                       *APIntVal;
   int64_t                           SInt64Val;
   uint64_t                          UInt64Val;

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

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.y (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.y Tue Sep 23 17:35:17 2008
@@ -995,7 +995,7 @@
   llvm::GlobalValue::LinkageTypes         Linkage;
   llvm::GlobalValue::VisibilityTypes      Visibility;
   llvm::ParameterAttributes         ParamAttrs;
-  llvm::FunctionNotes               FunctionNotes;
+  llvm::ParameterAttributes         FunctionNotes;
   llvm::APInt                       *APIntVal;
   int64_t                           SInt64Val;
   uint64_t                          UInt64Val;
@@ -1091,8 +1091,8 @@
 %type <UIntVal> OptCallingConv LocalNumber
 %type <ParamAttrs> OptParamAttrs ParamAttr 
 %type <ParamAttrs> OptFuncAttrs  FuncAttr
-%type <FunctionNotes> OptFuncNotes FuncNote 
-%type <FunctionNotes> FuncNoteList
+%type <ParamAttrs> OptFuncNotes FuncNote 
+%type <ParamAttrs> FuncNoteList
 
 // Basic Block Terminating Operators
 %token <TermOpVal> RET BR SWITCH INVOKE UNWIND UNREACHABLE
@@ -1297,22 +1297,24 @@
 
 FuncNoteList  : FuncNote { $$ = $1; }
               | FuncNoteList ',' FuncNote { 
-                FunctionNotes tmp = $1 | $3;
-                if ($3 == FN_NOTE_NoInline && ($1 & FN_NOTE_AlwaysInline))
+                unsigned tmp = $1 | $3;
+                if ($3 == ParamAttr::FN_NOTE_NoInline 
+                    && ($1 & ParamAttr::FN_NOTE_AlwaysInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
-                if ($3 == FN_NOTE_AlwaysInline && ($1 & FN_NOTE_NoInline))
+                    if ($3 == ParamAttr::FN_NOTE_AlwaysInline 
+                        && ($1 & ParamAttr::FN_NOTE_NoInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
                 $$ = tmp;
                 CHECK_FOR_ERROR 
               }
               ;
 
-FuncNote      : INLINE '=' NEVER { $$ = FN_NOTE_NoInline; }
-              | INLINE '=' ALWAYS { $$ = FN_NOTE_AlwaysInline; }
-              | OPTIMIZEFORSIZE { $$ = FN_NOTE_OptimizeForSize; }
+FuncNote      : INLINE '=' NEVER { $$ = ParamAttr::FN_NOTE_NoInline; }
+              | INLINE '=' ALWAYS { $$ = ParamAttr::FN_NOTE_AlwaysInline; }
+              | OPTIMIZEFORSIZE { $$ = ParamAttr::FN_NOTE_OptimizeForSize; }
               ;
 
-OptFuncNotes  : /* empty */ { $$ = FN_NOTE_None; }
+OptFuncNotes  : /* empty */ { $$ = ParamAttr::FN_NOTE_None; }
               | FNNOTE '(' FuncNoteList  ')' {
                 $$ =  $3;
               }

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

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs Tue Sep 23 17:35:17 2008
@@ -995,7 +995,7 @@
   llvm::GlobalValue::LinkageTypes         Linkage;
   llvm::GlobalValue::VisibilityTypes      Visibility;
   llvm::ParameterAttributes         ParamAttrs;
-  llvm::FunctionNotes               FunctionNotes;
+  llvm::ParameterAttributes         FunctionNotes;
   llvm::APInt                       *APIntVal;
   int64_t                           SInt64Val;
   uint64_t                          UInt64Val;
@@ -1091,8 +1091,8 @@
 %type <UIntVal> OptCallingConv LocalNumber
 %type <ParamAttrs> OptParamAttrs ParamAttr 
 %type <ParamAttrs> OptFuncAttrs  FuncAttr
-%type <FunctionNotes> OptFuncNotes FuncNote 
-%type <FunctionNotes> FuncNoteList
+%type <ParamAttrs> OptFuncNotes FuncNote 
+%type <ParamAttrs> FuncNoteList
 
 // Basic Block Terminating Operators
 %token <TermOpVal> RET BR SWITCH INVOKE UNWIND UNREACHABLE
@@ -1297,22 +1297,24 @@
 
 FuncNoteList  : FuncNote { $$ = $1; }
               | FuncNoteList ',' FuncNote { 
-                FunctionNotes tmp = $1 | $3;
-                if ($3 == FN_NOTE_NoInline && ($1 & FN_NOTE_AlwaysInline))
+                unsigned tmp = $1 | $3;
+                if ($3 == ParamAttr::FN_NOTE_NoInline 
+                    && ($1 & ParamAttr::FN_NOTE_AlwaysInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
-                if ($3 == FN_NOTE_AlwaysInline && ($1 & FN_NOTE_NoInline))
+                    if ($3 == ParamAttr::FN_NOTE_AlwaysInline 
+                        && ($1 & ParamAttr::FN_NOTE_NoInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
                 $$ = tmp;
                 CHECK_FOR_ERROR 
               }
               ;
 
-FuncNote      : INLINE '=' NEVER { $$ = FN_NOTE_NoInline; }
-              | INLINE '=' ALWAYS { $$ = FN_NOTE_AlwaysInline; }
-              | OPTIMIZEFORSIZE { $$ = FN_NOTE_OptimizeForSize; }
+FuncNote      : INLINE '=' NEVER { $$ = ParamAttr::FN_NOTE_NoInline; }
+              | INLINE '=' ALWAYS { $$ = ParamAttr::FN_NOTE_AlwaysInline; }
+              | OPTIMIZEFORSIZE { $$ = ParamAttr::FN_NOTE_OptimizeForSize; }
               ;
 
-OptFuncNotes  : /* empty */ { $$ = FN_NOTE_None; }
+OptFuncNotes  : /* empty */ { $$ = ParamAttr::FN_NOTE_None; }
               | FNNOTE '(' FuncNoteList  ')' {
                 $$ =  $3;
               }

Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp?rev=56511&r1=56510&r2=56511&view=diff

==============================================================================
--- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp (original)
+++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp Tue Sep 23 17:35:17 2008
@@ -1197,10 +1197,6 @@
           return Error("Invalid GC ID");
         Func->setGC(GCTable[Record[8]-1].c_str());
       }
-      if (!isProto && Record.size() > 9 && Record[9]) {
-        Func->setNotes(Record[9]);
-      }
-      
       ValueList.push_back(Func);
       
       // If this is a function with a body, remember the prototype we are

Modified: llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=56511&r1=56510&r2=56511&view=diff

==============================================================================
--- llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp (original)
+++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Tue Sep 23 17:35:17 2008
@@ -412,7 +412,6 @@
     Vals.push_back(F->hasSection() ? SectionMap[F->getSection()] : 0);
     Vals.push_back(getEncodedVisibility(F));
     Vals.push_back(F->hasGC() ? GCMap[F->getGC()] : 0);
-    Vals.push_back(F->getNotes());
     
     unsigned AbbrevToUse = 0;
     Stream.EmitRecord(bitc::MODULE_CODE_FUNCTION, Vals, AbbrevToUse);

Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp?rev=56511&r1=56510&r2=56511&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp Tue Sep 23 17:35:17 2008
@@ -160,7 +160,7 @@
   SwitchToTextSection(SectionName.c_str());
 
   unsigned FnAlign = OptimizeForSize ? 1 : 4;
-  if (F->hasNote(FN_NOTE_OptimizeForSize))
+  if (F->hasNote(ParamAttr::FN_NOTE_OptimizeForSize))
     FnAlign = 1;
   switch (F->getLinkage()) {
   default: assert(0 && "Unknown linkage type!");

Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp?rev=56511&r1=56510&r2=56511&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp Tue Sep 23 17:35:17 2008
@@ -147,7 +147,7 @@
   SwitchToTextSection(getSectionForFunction(*F).c_str(), F);
 
   unsigned FnAlign = OptimizeForSize ? 1 : 4;
-  if (F->hasNote(FN_NOTE_OptimizeForSize))
+  if (F->hasNote(ParamAttr::FN_NOTE_OptimizeForSize))
     FnAlign = 1;
   switch (F->getLinkage()) {
   default: assert(0 && "Unsupported linkage type!");

Modified: llvm/trunk/lib/Transforms/IPO/InlineAlways.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/InlineAlways.cpp?rev=56511&r1=56510&r2=56511&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/InlineAlways.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/InlineAlways.cpp Tue Sep 23 17:35:17 2008
@@ -63,7 +63,7 @@
   
   for (Module::iterator I = M.begin(), E = M.end();
        I != E; ++I)
-    if (!I->isDeclaration() && !I->hasNote(FN_NOTE_AlwaysInline))
+    if (!I->isDeclaration() && !I->hasNote(ParamAttr::FN_NOTE_AlwaysInline))
       NeverInline.insert(I);
 
   return false;

Modified: llvm/trunk/lib/Transforms/IPO/InlineSimple.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/InlineSimple.cpp?rev=56511&r1=56510&r2=56511&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/InlineSimple.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/InlineSimple.cpp Tue Sep 23 17:35:17 2008
@@ -65,7 +65,7 @@
   
   for (Module::iterator I = M.begin(), E = M.end();
        I != E; ++I)
-    if (I->hasNote(FN_NOTE_NoInline))
+    if (I->hasNote(ParamAttr::FN_NOTE_NoInline))
       NeverInline.insert(I);
 
   // Get llvm.noinline

Modified: llvm/trunk/lib/Transforms/IPO/Inliner.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/Inliner.cpp?rev=56511&r1=56510&r2=56511&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/Inliner.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/Inliner.cpp Tue Sep 23 17:35:17 2008
@@ -141,7 +141,7 @@
         
         int CurrentThreshold = InlineThreshold;
         Function *Fn = CS.getCaller();
-        if (Fn && Fn->hasNote(FN_NOTE_OptimizeForSize)
+        if (Fn && Fn->hasNote(ParamAttr::FN_NOTE_OptimizeForSize)
             && InlineThreshold != 50) {
           CurrentThreshold = 50;
         }

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

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp Tue Sep 23 17:35:17 2008
@@ -430,7 +430,7 @@
   Function *F = loopHeader->getParent();
 
   // Do not unswitch if the function is optimized for size.
-  if (F->hasNote(FN_NOTE_OptimizeForSize))
+  if (F->hasNote(ParamAttr::FN_NOTE_OptimizeForSize))
     return false;
 
   // Check to see if it would be profitable to unswitch current loop.

Modified: llvm/trunk/lib/Transforms/Utils/InlineCost.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/InlineCost.cpp?rev=56511&r1=56510&r2=56511&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Utils/InlineCost.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/InlineCost.cpp Tue Sep 23 17:35:17 2008
@@ -222,7 +222,7 @@
   if (CalleeFI.NeverInline)
     return 2000000000;
 
-  if (Callee->hasNote(FN_NOTE_AlwaysInline))
+  if (Callee->hasNote(ParamAttr::FN_NOTE_AlwaysInline))
     return -2000000000;
     
   // Add to the inline quality for properties that make the call valuable to

Modified: llvm/trunk/lib/VMCore/AsmWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/AsmWriter.cpp?rev=56511&r1=56510&r2=56511&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/AsmWriter.cpp (original)
+++ llvm/trunk/lib/VMCore/AsmWriter.cpp Tue Sep 23 17:35:17 2008
@@ -1412,12 +1412,12 @@
   } else {
 
     bool insideNotes = false;
-    if (F->hasNote(FN_NOTE_AlwaysInline)) {
+    if (F->hasNote(ParamAttr::FN_NOTE_AlwaysInline)) {
       Out << "notes(";
       insideNotes = true;
       Out << "inline=always";
     }
-    if (F->hasNote(FN_NOTE_NoInline)) {
+    if (F->hasNote(ParamAttr::FN_NOTE_NoInline)) {
       if (insideNotes) 
         Out << ",";
       else {
@@ -1426,7 +1426,7 @@
       }
       Out << "inline=never";
     }
-    if (F->hasNote(FN_NOTE_OptimizeForSize)) {
+    if (F->hasNote(ParamAttr::FN_NOTE_OptimizeForSize)) {
       if (insideNotes) 
         Out << ",";
       else {

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

==============================================================================
--- llvm/trunk/lib/VMCore/Function.cpp (original)
+++ llvm/trunk/lib/VMCore/Function.cpp Tue Sep 23 17:35:17 2008
@@ -174,7 +174,6 @@
   if (unsigned IID = getIntrinsicID(true))
     setParamAttrs(Intrinsic::getParamAttrs(Intrinsic::ID(IID)));
 
-  Notes = 0;
 }
 
 Function::~Function() {

Modified: llvm/trunk/lib/VMCore/ParameterAttributes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/ParameterAttributes.cpp?rev=56511&r1=56510&r2=56511&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/ParameterAttributes.cpp (original)
+++ llvm/trunk/lib/VMCore/ParameterAttributes.cpp Tue Sep 23 17:35:17 2008
@@ -186,6 +186,7 @@
 
 /// getParamAttrs - The parameter attributes for the specified parameter are
 /// returned.  Parameters for the result are denoted with Idx = 0.
+/// Function notes are denoted with idx = ~0.
 ParameterAttributes PAListPtr::getParamAttrs(unsigned Idx) const {
   if (PAList == 0) return ParamAttr::None;
   

Modified: llvm/trunk/lib/VMCore/Verifier.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Verifier.cpp?rev=56511&r1=56510&r2=56511&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/Verifier.cpp (original)
+++ llvm/trunk/lib/VMCore/Verifier.cpp Tue Sep 23 17:35:17 2008
@@ -477,6 +477,19 @@
   }
 }
 
+static bool VerifyAttributeCount(const PAListPtr &Attrs, unsigned Params) {
+  if (Attrs.isEmpty())
+    return true;
+    
+  unsigned LastSlot = Attrs.getNumSlots() - 1;
+  unsigned LastIndex = Attrs.getSlot(LastSlot).Index;
+  if (LastIndex <= Params
+      || (LastIndex == (unsigned)~0
+          && (LastSlot == 0 || Attrs.getSlot(LastSlot - 1).Index <= Params)))  
+    return true;
+    
+  return false;
+}
 // visitFunction - Verify that a function is ok.
 //
 void Verifier::visitFunction(Function &F) {
@@ -497,8 +510,7 @@
 
   const PAListPtr &Attrs = F.getParamAttrs();
 
-  Assert1(Attrs.isEmpty() ||
-          Attrs.getSlot(Attrs.getNumSlots()-1).Index <= FT->getNumParams(),
+  Assert1(VerifyAttributeCount(Attrs, FT->getNumParams()),
           "Attributes after last parameter!", &F);
 
   // Check function attributes.
@@ -955,8 +967,7 @@
 
   const PAListPtr &Attrs = CS.getParamAttrs();
 
-  Assert1(Attrs.isEmpty() ||
-          Attrs.getSlot(Attrs.getNumSlots()-1).Index <= CS.arg_size(),
+  Assert1(VerifyAttributeCount(Attrs, CS.arg_size()),
           "Attributes after last parameter!", I);
 
   // Verify call attributes.




From dpatel at apple.com  Tue Sep 23 17:53:25 2008
From: dpatel at apple.com (Devang Patel)
Date: Tue, 23 Sep 2008 22:53:25 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r56512 - in /llvm-gcc-4.2/trunk/gcc:
 llvm-backend.cpp llvm-convert.cpp
Message-ID: <200809232253.m8NMrQ3w031553@zion.cs.uiuc.edu>

Author: dpatel
Date: Tue Sep 23 17:53:21 2008
New Revision: 56512

URL: http://llvm.org/viewvc/llvm-project?rev=56512&view=rev
Log:
Notes are implemented as an attribute at index ~0

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp
    llvm-gcc-4.2/trunk/gcc/llvm-convert.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=56512&r1=56511&r2=56512&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Tue Sep 23 17:53:21 2008
@@ -386,7 +386,7 @@
   // marked as always_inline.
   for (Module::iterator I = TheModule->begin(), E = TheModule->end();
        I != E; ++I)
-    if (I->hasNote(FN_NOTE_AlwaysInline)) {
+    if (I->hasNote(ParamAttr::FN_NOTE_AlwaysInline)) {
       NeedAlwaysInliner = true;
       break;
     }

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=56512&r1=56511&r2=56512&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Tue Sep 23 17:53:21 2008
@@ -652,7 +652,7 @@
   
   // Handle noinline Functions
   if (lookup_attribute ("noinline", DECL_ATTRIBUTES (FnDecl)))
-    Fn->setNotes(FN_NOTE_NoInline);
+    Fn->setNotes(ParamAttr::FN_NOTE_NoInline);
   /* FIXME: Remove llvm.noinline related code. 
   {
     const Type *SBP= PointerType::getUnqual(Type::Int8Ty);
@@ -663,10 +663,10 @@
 
   // Handle always_inline attribute
   if (lookup_attribute ("always_inline", DECL_ATTRIBUTES (FnDecl)))
-    Fn->setNotes(FN_NOTE_AlwaysInline);
+    Fn->setNotes(ParamAttr::FN_NOTE_AlwaysInline);
 
   if (optimize_size)
-    Fn->setNotes(FN_NOTE_OptimizeForSize);
+    Fn->setNotes(ParamAttr::FN_NOTE_OptimizeForSize);
 
   // Handle annotate attributes
   if (DECL_ATTRIBUTES(FnDecl))




From dpatel at apple.com  Tue Sep 23 18:03:40 2008
From: dpatel at apple.com (Devang Patel)
Date: Tue, 23 Sep 2008 23:03:40 -0000
Subject: [llvm-commits] [llvm] r56513 - in /llvm/trunk: include/llvm/
 include/llvm/Support/ lib/Analysis/ lib/AsmParser/ lib/Bitcode/Reader/
 lib/Bitcode/Writer/ lib/CodeGen/SelectionDAG/
 lib/ExecutionEngine/Interpreter/ lib/Target/CppBackend/ lib/Target/MSIL/
 lib/Target/PowerPC/ lib/Transforms/IPO/ lib/Transforms/Scalar/
 lib/Transforms/Utils/ lib/VMCore/
Message-ID: <200809232303.m8NN3gWx031869@zion.cs.uiuc.edu>

Author: dpatel
Date: Tue Sep 23 18:03:40 2008
New Revision: 56513

URL: http://llvm.org/viewvc/llvm-project?rev=56513&view=rev
Log:
s/ParameterAttributes/Attributes/g


Added:
    llvm/trunk/include/llvm/Attributes.h
      - copied, changed from r56511, llvm/trunk/include/llvm/ParameterAttributes.h
    llvm/trunk/lib/VMCore/Attributes.cpp
      - copied, changed from r56511, llvm/trunk/lib/VMCore/ParameterAttributes.cpp
Removed:
    llvm/trunk/include/llvm/ParameterAttributes.h
    llvm/trunk/lib/VMCore/ParameterAttributes.cpp
Modified:
    llvm/trunk/include/llvm/Argument.h
    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/ParserInternals.h
    llvm/trunk/lib/Bitcode/Reader/BitcodeReader.h
    llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.h
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
    llvm/trunk/lib/ExecutionEngine/Interpreter/Execution.cpp
    llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp
    llvm/trunk/lib/Target/MSIL/MSILWriter.cpp
    llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp
    llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp
    llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp
    llvm/trunk/lib/Transforms/IPO/PruneEH.cpp
    llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp
    llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp
    llvm/trunk/lib/Transforms/Scalar/MemCpyOptimizer.cpp
    llvm/trunk/lib/Transforms/Scalar/SimplifyCFGPass.cpp
    llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp
    llvm/trunk/lib/VMCore/AsmWriter.cpp
    llvm/trunk/lib/VMCore/Function.cpp
    llvm/trunk/lib/VMCore/Instructions.cpp
    llvm/trunk/lib/VMCore/Verifier.cpp

Modified: llvm/trunk/include/llvm/Argument.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Argument.h?rev=56513&r1=56512&r2=56513&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Argument.h (original)
+++ llvm/trunk/include/llvm/Argument.h Tue Sep 23 18:03:40 2008
@@ -15,7 +15,7 @@
 #define LLVM_ARGUMENT_H
 
 #include "llvm/Value.h"
-#include "llvm/ParameterAttributes.h"
+#include "llvm/Attributes.h"
 #include "llvm/ADT/ilist_node.h"
 
 namespace llvm {
@@ -61,10 +61,10 @@
   bool hasStructRetAttr() const;
 
   /// addAttr - Add a ParamAttr to an argument
-  void addAttr(ParameterAttributes);
+  void addAttr(Attributes);
   
   /// removeAttr - Remove a ParamAttr from an argument
-  void removeAttr(ParameterAttributes);
+  void removeAttr(Attributes);
 
   /// classof - Methods for support type inquiry through isa, cast, and
   /// dyn_cast:

Copied: llvm/trunk/include/llvm/Attributes.h (from r56511, llvm/trunk/include/llvm/ParameterAttributes.h)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Attributes.h?p2=llvm/trunk/include/llvm/Attributes.h&p1=llvm/trunk/include/llvm/ParameterAttributes.h&r1=56511&r2=56513&rev=56513&view=diff

==============================================================================
--- llvm/trunk/include/llvm/ParameterAttributes.h (original)
+++ llvm/trunk/include/llvm/Attributes.h Tue Sep 23 18:03:40 2008
@@ -1,4 +1,4 @@
-//===-- llvm/ParameterAttributes.h - Container for ParamAttrs ---*- C++ -*-===//
+//===-- llvm/Attributes.h - Container for ParamAttrs ---*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -20,8 +20,8 @@
 namespace llvm {
 class Type;
 
-/// ParameterAttributes - A bitset of attributes for a parameter.
-typedef unsigned ParameterAttributes;
+/// Attributes - A bitset of attributes for a parameter.
+typedef unsigned Attributes;
   
 namespace ParamAttr {
 
@@ -30,7 +30,6 @@
 /// lists the attributes that can be associated with parameters or function 
 /// results.
 /// @brief Function parameter attributes.
-typedef ParameterAttributes Attributes;
 
 const Attributes None      = 0;     ///< No attributes have been set
 const Attributes ZExt      = 1<<0;  ///< Zero extended before/after call
@@ -74,26 +73,26 @@
 Attributes typeIncompatible(const Type *Ty);
 
 /// This turns an int alignment (a power of 2, normally) into the
-/// form used internally in ParameterAttributes.
-inline ParamAttr::Attributes constructAlignmentFromInt(unsigned i) {
+/// form used internally in Attributes.
+inline Attributes constructAlignmentFromInt(unsigned i) {
   return (i << 16);
 }
 
-/// The set of ParameterAttributes set in Attributes is converted to a
+/// The set of Attributes set in Attributes is converted to a
 /// string of equivalent mnemonics. This is, presumably, for writing out
 /// the mnemonics for the assembly writer. 
 /// @brief Convert parameter attribute bits to text
-std::string getAsString(ParameterAttributes Attrs);
+std::string getAsString(Attributes Attrs);
 } // end namespace ParamAttr
 
 
 /// This is just a pair of values to associate a set of parameter attributes
 /// with a parameter index. 
 struct ParamAttrsWithIndex {
-  ParameterAttributes Attrs; ///< The attributes that are set, or'd together.
+  Attributes Attrs; ///< The attributes that are set, or'd together.
   unsigned Index; ///< Index of the parameter for which the attributes apply.
   
-  static ParamAttrsWithIndex get(unsigned Idx, ParameterAttributes Attrs) {
+  static ParamAttrsWithIndex get(unsigned Idx, Attributes Attrs) {
     ParamAttrsWithIndex P;
     P.Index = Idx;
     P.Attrs = Attrs;
@@ -137,12 +136,12 @@
   /// addAttr - Add the specified attribute at the specified index to this
   /// attribute list.  Since parameter attribute lists are immutable, this
   /// returns the new list.
-  PAListPtr addAttr(unsigned Idx, ParameterAttributes Attrs) const;
+  PAListPtr addAttr(unsigned Idx, Attributes Attrs) const;
   
   /// removeAttr - Remove the specified attribute at the specified index from
   /// this attribute list.  Since parameter attribute lists are immutable, this
   /// returns the new list.
-  PAListPtr removeAttr(unsigned Idx, ParameterAttributes Attrs) const;
+  PAListPtr removeAttr(unsigned Idx, Attributes Attrs) const;
   
   //===--------------------------------------------------------------------===//
   // Parameter Attribute List Accessors
@@ -150,11 +149,11 @@
   
   /// getParamAttrs - The parameter attributes for the specified parameter are
   /// returned.  Parameters for the result are denoted with Idx = 0.
-  ParameterAttributes getParamAttrs(unsigned Idx) const;
+  Attributes getParamAttrs(unsigned Idx) const;
   
   /// paramHasAttr - Return true if the specified parameter index has the
   /// specified attribute set.
-  bool paramHasAttr(unsigned Idx, ParameterAttributes Attr) const {
+  bool paramHasAttr(unsigned Idx, Attributes Attr) const {
     return getParamAttrs(Idx) & Attr;
   }
   
@@ -166,7 +165,7 @@
   
   /// hasAttrSomewhere - Return true if the specified attribute is set for at
   /// least one parameter or for the return value.
-  bool hasAttrSomewhere(ParameterAttributes Attr) const;
+  bool hasAttrSomewhere(Attributes Attr) const;
 
   /// operator==/!= - Provide equality predicates.
   bool operator==(const PAListPtr &RHS) const { return PAList == RHS.PAList; }

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

==============================================================================
--- llvm/trunk/include/llvm/Function.h (original)
+++ llvm/trunk/include/llvm/Function.h Tue Sep 23 18:03:40 2008
@@ -22,7 +22,7 @@
 #include "llvm/BasicBlock.h"
 #include "llvm/Argument.h"
 #include "llvm/Support/Annotation.h"
-#include "llvm/ParameterAttributes.h"
+#include "llvm/Attributes.h"
 
 namespace llvm {
 
@@ -150,14 +150,14 @@
 
 
   /// hasNote - Return true if this function has given note.
-  bool hasNote(ParameterAttributes N) const {
+  bool hasNote(Attributes N) const {
   	// Notes are stored at ~0 index in parameter attribute list
     return (!isDeclaration() && paramHasAttr(~0, N));
   }
 
   /// setNotes - Set notes for this function
   ///
-  void setNotes(const ParameterAttributes N) { 
+  void setNotes(const Attributes N) { 
   	// Notes are stored at ~0 index in parameter attribute list
   	addParamAttr(~0, N);
   }
@@ -170,15 +170,15 @@
   void clearGC();
 
   /// @brief Determine whether the function has the given attribute.
-  bool paramHasAttr(unsigned i, ParameterAttributes attr) const {
+  bool paramHasAttr(unsigned i, Attributes attr) const {
     return ParamAttrs.paramHasAttr(i, attr);
   }
 
   /// addParamAttr - adds the attribute to the list of attributes.
-  void addParamAttr(unsigned i, ParameterAttributes attr);
+  void addParamAttr(unsigned i, Attributes attr);
   
   /// removeParamAttr - removes the attribute from the list of attributes.
-  void removeParamAttr(unsigned i, ParameterAttributes attr);
+  void removeParamAttr(unsigned i, Attributes attr);
 
   /// @brief Extract the alignment for a call or parameter (0=unknown).
   unsigned getParamAlignment(unsigned i) const {

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

==============================================================================
--- llvm/trunk/include/llvm/Instructions.h (original)
+++ llvm/trunk/include/llvm/Instructions.h Tue Sep 23 18:03:40 2008
@@ -20,7 +20,7 @@
 
 #include "llvm/InstrTypes.h"
 #include "llvm/DerivedTypes.h"
-#include "llvm/ParameterAttributes.h"
+#include "llvm/Attributes.h"
 #include "llvm/BasicBlock.h"
 #include "llvm/ADT/SmallVector.h"
 
@@ -1081,10 +1081,10 @@
   void setParamAttrs(const PAListPtr &Attrs) { ParamAttrs = Attrs; }
   
   /// addParamAttr - adds the attribute to the list of attributes.
-  void addParamAttr(unsigned i, ParameterAttributes attr);
+  void addParamAttr(unsigned i, Attributes attr);
 
   /// removeParamAttr - removes the attribute from the list of attributes.
-  void removeParamAttr(unsigned i, ParameterAttributes attr);
+  void removeParamAttr(unsigned i, Attributes attr);
 
   /// @brief Determine whether the call or the callee has the given attribute.
   bool paramHasAttr(unsigned i, unsigned attr) const;
@@ -2440,13 +2440,13 @@
   void setParamAttrs(const PAListPtr &Attrs) { ParamAttrs = Attrs; }
 
   /// @brief Determine whether the call or the callee has the given attribute.
-  bool paramHasAttr(unsigned i, ParameterAttributes attr) const;
+  bool paramHasAttr(unsigned i, Attributes attr) const;
   
   /// addParamAttr - adds the attribute to the list of attributes.
-  void addParamAttr(unsigned i, ParameterAttributes attr);
+  void addParamAttr(unsigned i, Attributes attr);
 
   /// removeParamAttr - removes the attribute from the list of attributes.
-  void removeParamAttr(unsigned i, ParameterAttributes attr);
+  void removeParamAttr(unsigned i, Attributes attr);
 
   /// @brief Extract the alignment for a call or parameter (0=unknown).
   unsigned getParamAlignment(unsigned i) const {

Removed: llvm/trunk/include/llvm/ParameterAttributes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ParameterAttributes.h?rev=56512&view=auto

==============================================================================
--- llvm/trunk/include/llvm/ParameterAttributes.h (original)
+++ llvm/trunk/include/llvm/ParameterAttributes.h (removed)
@@ -1,212 +0,0 @@
-//===-- llvm/ParameterAttributes.h - Container for ParamAttrs ---*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file contains the simple types necessary to represent the parameter
-// attributes associated with functions and their calls.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_PARAMETER_ATTRIBUTES_H
-#define LLVM_PARAMETER_ATTRIBUTES_H
-
-#include <string>
-
-namespace llvm {
-class Type;
-
-/// ParameterAttributes - A bitset of attributes for a parameter.
-typedef unsigned ParameterAttributes;
-  
-namespace ParamAttr {
-
-/// Function parameters and results can have attributes to indicate how they 
-/// should be treated by optimizations and code generation. This enumeration 
-/// lists the attributes that can be associated with parameters or function 
-/// results.
-/// @brief Function parameter attributes.
-typedef ParameterAttributes Attributes;
-
-const Attributes None      = 0;     ///< No attributes have been set
-const Attributes ZExt      = 1<<0;  ///< Zero extended before/after call
-const Attributes SExt      = 1<<1;  ///< Sign extended before/after call
-const Attributes NoReturn  = 1<<2;  ///< Mark the function as not returning
-const Attributes InReg     = 1<<3;  ///< Force argument to be passed in register
-const Attributes StructRet = 1<<4;  ///< Hidden pointer to structure to return
-const Attributes NoUnwind  = 1<<5;  ///< Function doesn't unwind stack
-const Attributes NoAlias   = 1<<6;  ///< Considered to not alias after call
-const Attributes ByVal     = 1<<7;  ///< Pass structure by value
-const Attributes Nest      = 1<<8;  ///< Nested function static chain
-const Attributes ReadNone  = 1<<9;  ///< Function does not access memory
-const Attributes ReadOnly  = 1<<10; ///< Function only reads from memory
-const Attributes Alignment = 0xffff<<16; ///< Alignment of parameter (16 bits)
-                                    // 0 = unknown, else in clear (not log)
-                                    
-/// Function notes are implemented as attributes stored at index ~0 in 
-/// parameter attribute list.
-const Attributes FN_NOTE_None            = 0;    
-const Attributes FN_NOTE_NoInline        = 1<<0; // inline=never 
-const Attributes FN_NOTE_AlwaysInline    = 1<<1; // inline=always
-const Attributes FN_NOTE_OptimizeForSize = 1<<2; // opt_size
-
-/// @brief Attributes that only apply to function parameters.
-const Attributes ParameterOnly = ByVal | Nest | StructRet;
-
-/// @brief Attributes that only apply to function return values.
-const Attributes ReturnOnly = NoReturn | NoUnwind | ReadNone | ReadOnly;
-
-/// @brief Parameter attributes that do not apply to vararg call arguments.
-const Attributes VarArgsIncompatible = StructRet;
-
-/// @brief Attributes that are mutually incompatible.
-const Attributes MutuallyIncompatible[3] = {
-  ByVal | InReg | Nest  | StructRet,
-  ZExt  | SExt,
-  ReadNone | ReadOnly
-};
-
-/// @brief Which attributes cannot be applied to a type.
-Attributes typeIncompatible(const Type *Ty);
-
-/// This turns an int alignment (a power of 2, normally) into the
-/// form used internally in ParameterAttributes.
-inline ParamAttr::Attributes constructAlignmentFromInt(unsigned i) {
-  return (i << 16);
-}
-
-/// The set of ParameterAttributes set in Attributes is converted to a
-/// string of equivalent mnemonics. This is, presumably, for writing out
-/// the mnemonics for the assembly writer. 
-/// @brief Convert parameter attribute bits to text
-std::string getAsString(ParameterAttributes Attrs);
-} // end namespace ParamAttr
-
-
-/// This is just a pair of values to associate a set of parameter attributes
-/// with a parameter index. 
-struct ParamAttrsWithIndex {
-  ParameterAttributes Attrs; ///< The attributes that are set, or'd together.
-  unsigned Index; ///< Index of the parameter for which the attributes apply.
-  
-  static ParamAttrsWithIndex get(unsigned Idx, ParameterAttributes Attrs) {
-    ParamAttrsWithIndex P;
-    P.Index = Idx;
-    P.Attrs = Attrs;
-    return P;
-  }
-};
-  
-//===----------------------------------------------------------------------===//
-// PAListPtr Smart Pointer
-//===----------------------------------------------------------------------===//
-
-class ParamAttributeListImpl;
-  
-/// PAListPtr - This class manages the ref count for the opaque 
-/// ParamAttributeListImpl object and provides accessors for it.
-class PAListPtr {
-  /// PAList - The parameter attributes that we are managing.  This can be null
-  /// to represent the empty parameter attributes list.
-  ParamAttributeListImpl *PAList;
-public:
-  PAListPtr() : PAList(0) {}
-  PAListPtr(const PAListPtr &P);
-  const PAListPtr &operator=(const PAListPtr &RHS);
-  ~PAListPtr();
-  
-  //===--------------------------------------------------------------------===//
-  // Parameter Attribute List Construction and Mutation
-  //===--------------------------------------------------------------------===//
-  
-  /// get - Return a ParamAttrs list with the specified parameter in it.
-  static PAListPtr get(const ParamAttrsWithIndex *Attr, unsigned NumAttrs);
-  
-  /// get - Return a ParamAttr list with the parameters specified by the
-  /// consecutive random access iterator range.
-  template <typename Iter>
-  static PAListPtr get(const Iter &I, const Iter &E) {
-    if (I == E) return PAListPtr();  // Empty list.
-    return get(&*I, static_cast<unsigned>(E-I));
-  }
-
-  /// addAttr - Add the specified attribute at the specified index to this
-  /// attribute list.  Since parameter attribute lists are immutable, this
-  /// returns the new list.
-  PAListPtr addAttr(unsigned Idx, ParameterAttributes Attrs) const;
-  
-  /// removeAttr - Remove the specified attribute at the specified index from
-  /// this attribute list.  Since parameter attribute lists are immutable, this
-  /// returns the new list.
-  PAListPtr removeAttr(unsigned Idx, ParameterAttributes Attrs) const;
-  
-  //===--------------------------------------------------------------------===//
-  // Parameter Attribute List Accessors
-  //===--------------------------------------------------------------------===//
-  
-  /// getParamAttrs - The parameter attributes for the specified parameter are
-  /// returned.  Parameters for the result are denoted with Idx = 0.
-  ParameterAttributes getParamAttrs(unsigned Idx) const;
-  
-  /// paramHasAttr - Return true if the specified parameter index has the
-  /// specified attribute set.
-  bool paramHasAttr(unsigned Idx, ParameterAttributes Attr) const {
-    return getParamAttrs(Idx) & Attr;
-  }
-  
-  /// getParamAlignment - Return the alignment for the specified function
-  /// parameter.
-  unsigned getParamAlignment(unsigned Idx) const {
-    return (getParamAttrs(Idx) & ParamAttr::Alignment) >> 16;
-  }
-  
-  /// hasAttrSomewhere - Return true if the specified attribute is set for at
-  /// least one parameter or for the return value.
-  bool hasAttrSomewhere(ParameterAttributes Attr) const;
-
-  /// operator==/!= - Provide equality predicates.
-  bool operator==(const PAListPtr &RHS) const { return PAList == RHS.PAList; }
-  bool operator!=(const PAListPtr &RHS) const { return PAList != RHS.PAList; }
-  
-  void dump() const;
-
-  //===--------------------------------------------------------------------===//
-  // Parameter Attribute List Introspection
-  //===--------------------------------------------------------------------===//
-  
-  /// getRawPointer - Return a raw pointer that uniquely identifies this
-  /// parameter attribute list. 
-  void *getRawPointer() const {
-    return PAList;
-  }
-  
-  // Parameter attributes are stored as a dense set of slots, where there is one
-  // slot for each argument that has an attribute.  This allows walking over the
-  // dense set instead of walking the sparse list of attributes.
-  
-  /// isEmpty - Return true if no parameters have an attribute.
-  ///
-  bool isEmpty() const {
-    return PAList == 0;
-  }
-  
-  /// getNumSlots - Return the number of slots used in this attribute list. 
-  /// This is the number of arguments that have an attribute set on them
-  /// (including the function itself).
-  unsigned getNumSlots() const;
-  
-  /// getSlot - Return the ParamAttrsWithIndex at the specified slot.  This
-  /// holds a parameter number plus a set of attributes.
-  const ParamAttrsWithIndex &getSlot(unsigned Slot) const;
-  
-private:
-  explicit PAListPtr(ParamAttributeListImpl *L);
-};
-
-} // End llvm namespace
-
-#endif

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

==============================================================================
--- llvm/trunk/include/llvm/Support/CallSite.h (original)
+++ llvm/trunk/include/llvm/Support/CallSite.h Tue Sep 23 18:03:40 2008
@@ -22,7 +22,7 @@
 
 #include "llvm/Instruction.h"
 #include "llvm/BasicBlock.h"
-#include "llvm/ParameterAttributes.h"
+#include "llvm/Attributes.h"
 
 namespace llvm {
 
@@ -68,7 +68,7 @@
   void setParamAttrs(const PAListPtr &PAL);
 
   /// paramHasAttr - whether the call or the callee has the given attribute.
-  bool paramHasAttr(uint16_t i, ParameterAttributes attr) const;
+  bool paramHasAttr(uint16_t i, Attributes attr) const;
 
   /// @brief Extract the alignment for a call or parameter (0=unknown).
   uint16_t getParamAlignment(uint16_t i) const;

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

==============================================================================
--- llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp (original)
+++ llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp Tue Sep 23 18:03:40 2008
@@ -18,7 +18,6 @@
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Function.h"
-#include "llvm/ParameterAttributes.h"
 #include "llvm/GlobalVariable.h"
 #include "llvm/Instructions.h"
 #include "llvm/IntrinsicInst.h"

Modified: llvm/trunk/lib/AsmParser/ParserInternals.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/ParserInternals.h?rev=56513&r1=56512&r2=56513&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/ParserInternals.h (original)
+++ llvm/trunk/lib/AsmParser/ParserInternals.h Tue Sep 23 18:03:40 2008
@@ -17,7 +17,7 @@
 
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
-#include "llvm/ParameterAttributes.h"
+#include "llvm/Attributes.h"
 #include "llvm/Function.h"
 #include "llvm/Instructions.h"
 #include "llvm/Assembly/Parser.h"
@@ -232,13 +232,13 @@
 
 struct TypeWithAttrs {
   llvm::PATypeHolder *Ty;
-  ParameterAttributes Attrs;
+  Attributes Attrs;
 };
 
 typedef std::vector<TypeWithAttrs> TypeWithAttrsList;
 
 struct ArgListEntry {
-  ParameterAttributes Attrs;
+  Attributes Attrs;
   llvm::PATypeHolder *Ty;
   std::string *Name;
 };
@@ -247,7 +247,7 @@
 
 struct ParamListEntry {
   Value *Val;
-  ParameterAttributes Attrs;
+  Attributes Attrs;
 };
 
 typedef std::vector<ParamListEntry> ParamList;

Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.h?rev=56513&r1=56512&r2=56513&view=diff

==============================================================================
--- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.h (original)
+++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.h Tue Sep 23 18:03:40 2008
@@ -15,7 +15,7 @@
 #define BITCODE_READER_H
 
 #include "llvm/ModuleProvider.h"
-#include "llvm/ParameterAttributes.h"
+#include "llvm/Attributes.h"
 #include "llvm/Type.h"
 #include "llvm/OperandTraits.h"
 #include "llvm/Bitcode/BitstreamReader.h"

Modified: llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.h?rev=56513&r1=56512&r2=56513&view=diff

==============================================================================
--- llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.h (original)
+++ llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.h Tue Sep 23 18:03:40 2008
@@ -15,7 +15,7 @@
 #define VALUE_ENUMERATOR_H
 
 #include "llvm/ADT/DenseMap.h"
-#include "llvm/ParameterAttributes.h"
+#include "llvm/Attributes.h"
 #include <vector>
 
 namespace llvm {

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Tue Sep 23 18:03:40 2008
@@ -25,7 +25,6 @@
 #include "llvm/Instructions.h"
 #include "llvm/Intrinsics.h"
 #include "llvm/IntrinsicInst.h"
-#include "llvm/ParameterAttributes.h"
 #include "llvm/CodeGen/FastISel.h"
 #include "llvm/CodeGen/GCStrategy.h"
 #include "llvm/CodeGen/GCMetadata.h"

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Tue Sep 23 18:03:40 2008
@@ -25,7 +25,6 @@
 #include "llvm/Instructions.h"
 #include "llvm/Intrinsics.h"
 #include "llvm/IntrinsicInst.h"
-#include "llvm/ParameterAttributes.h"
 #include "llvm/CodeGen/FastISel.h"
 #include "llvm/CodeGen/GCStrategy.h"
 #include "llvm/CodeGen/GCMetadata.h"

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

==============================================================================
--- llvm/trunk/lib/ExecutionEngine/Interpreter/Execution.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/Interpreter/Execution.cpp Tue Sep 23 18:03:40 2008
@@ -16,7 +16,6 @@
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Instructions.h"
-#include "llvm/ParameterAttributes.h"
 #include "llvm/CodeGen/IntrinsicLowering.h"
 #include "llvm/Support/GetElementPtrTypeIterator.h"
 #include "llvm/ADT/APInt.h"

Modified: llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp?rev=56513&r1=56512&r2=56513&view=diff

==============================================================================
--- llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp (original)
+++ llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp Tue Sep 23 18:03:40 2008
@@ -438,7 +438,7 @@
       Out << "ParamAttrsWithIndex PAWI;"; nl(Out);
       for (unsigned i = 0; i < PAL.getNumSlots(); ++i) {
         uint16_t index = PAL.getSlot(i).Index;
-        ParameterAttributes attrs = PAL.getSlot(i).Attrs;
+        Attributes attrs = PAL.getSlot(i).Attrs;
         Out << "PAWI.Index = " << index << "; PAWI.Attrs = 0 ";
         if (attrs & ParamAttr::SExt)
           Out << " | ParamAttr::SExt";

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

==============================================================================
--- llvm/trunk/lib/Target/MSIL/MSILWriter.cpp (original)
+++ llvm/trunk/lib/Target/MSIL/MSILWriter.cpp Tue Sep 23 18:03:40 2008
@@ -16,7 +16,6 @@
 #include "llvm/DerivedTypes.h"
 #include "llvm/Intrinsics.h"
 #include "llvm/IntrinsicInst.h"
-#include "llvm/ParameterAttributes.h"
 #include "llvm/TypeSymbolTable.h"
 #include "llvm/Analysis/ConstantsScanner.h"
 #include "llvm/Support/CallSite.h"

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

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp Tue Sep 23 18:03:40 2008
@@ -29,7 +29,6 @@
 #include "llvm/Constants.h"
 #include "llvm/Function.h"
 #include "llvm/Intrinsics.h"
-#include "llvm/ParameterAttributes.h"
 #include "llvm/Support/MathExtras.h"
 #include "llvm/Target/TargetOptions.h"
 #include "llvm/Support/CommandLine.h"

Modified: llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp?rev=56513&r1=56512&r2=56513&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp Tue Sep 23 18:03:40 2008
@@ -508,7 +508,7 @@
   const PAListPtr &PAL = F->getParamAttrs();
 
   // Add any return attributes.
-  if (ParameterAttributes attrs = PAL.getParamAttrs(0))
+  if (Attributes attrs = PAL.getParamAttrs(0))
     ParamAttrsVec.push_back(ParamAttrsWithIndex::get(0, attrs));
 
   // First, determine the new argument list
@@ -525,7 +525,7 @@
     } else if (!ArgsToPromote.count(I)) {
       // Unchanged argument
       Params.push_back(I->getType());
-      if (ParameterAttributes attrs = PAL.getParamAttrs(ArgIndex))
+      if (Attributes attrs = PAL.getParamAttrs(ArgIndex))
         ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Params.size(), attrs));
     } else if (I->use_empty()) {
       // Dead argument (which are always marked as promotable)
@@ -621,7 +621,7 @@
     const PAListPtr &CallPAL = CS.getParamAttrs();
 
     // Add any return attributes.
-    if (ParameterAttributes attrs = CallPAL.getParamAttrs(0))
+    if (Attributes attrs = CallPAL.getParamAttrs(0))
       ParamAttrsVec.push_back(ParamAttrsWithIndex::get(0, attrs));
 
     // Loop over the operands, inserting GEP and loads in the caller as
@@ -633,7 +633,7 @@
       if (!ArgsToPromote.count(I) && !ByValArgsToTransform.count(I)) {
         Args.push_back(*AI);          // Unmodified argument
 
-        if (ParameterAttributes Attrs = CallPAL.getParamAttrs(ArgIndex))
+        if (Attributes Attrs = CallPAL.getParamAttrs(ArgIndex))
           ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Args.size(), Attrs));
 
       } else if (ByValArgsToTransform.count(I)) {
@@ -688,7 +688,7 @@
     // Push any varargs arguments on the list
     for (; AI != CS.arg_end(); ++AI, ++ArgIndex) {
       Args.push_back(*AI);
-      if (ParameterAttributes Attrs = CallPAL.getParamAttrs(ArgIndex))
+      if (Attributes Attrs = CallPAL.getParamAttrs(ArgIndex))
         ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Args.size(), Attrs));
     }
 

Modified: llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp?rev=56513&r1=56512&r2=56513&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp Tue Sep 23 18:03:40 2008
@@ -593,7 +593,7 @@
   const PAListPtr &PAL = F->getParamAttrs();
 
   // The existing function return attributes.
-  ParameterAttributes RAttrs = PAL.getParamAttrs(0);
+  Attributes RAttrs = PAL.getParamAttrs(0);
 
 
   // Find out the new return value.
@@ -678,7 +678,7 @@
 
       // Get the original parameter attributes (skipping the first one, that is
       // for the return value.
-      if (ParameterAttributes Attrs = PAL.getParamAttrs(i + 1))
+      if (Attributes Attrs = PAL.getParamAttrs(i + 1))
         ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Params.size(), Attrs));
     } else {
       ++NumArgumentsEliminated;
@@ -730,7 +730,7 @@
     const PAListPtr &CallPAL = CS.getParamAttrs();
 
     // The call return attributes.
-    ParameterAttributes RAttrs = CallPAL.getParamAttrs(0);
+    Attributes RAttrs = CallPAL.getParamAttrs(0);
     // Adjust in case the function was changed to return void.
     RAttrs &= ~ParamAttr::typeIncompatible(NF->getReturnType());
     if (RAttrs)
@@ -746,7 +746,7 @@
       if (ArgAlive[i]) {
         Args.push_back(*I);
         // Get original parameter attributes, but skip return attributes.
-        if (ParameterAttributes Attrs = CallPAL.getParamAttrs(i + 1))
+        if (Attributes Attrs = CallPAL.getParamAttrs(i + 1))
           ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Args.size(), Attrs));
       }
 
@@ -756,7 +756,7 @@
     // Push any varargs arguments on the list. Don't forget their attributes.
     for (CallSite::arg_iterator E = CS.arg_end(); I != E; ++I, ++i) {
       Args.push_back(*I);
-      if (ParameterAttributes Attrs = CallPAL.getParamAttrs(i + 1))
+      if (Attributes Attrs = CallPAL.getParamAttrs(i + 1))
         ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Args.size(), Attrs));
     }
 

Modified: llvm/trunk/lib/Transforms/IPO/PruneEH.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/PruneEH.cpp?rev=56513&r1=56512&r2=56513&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/PruneEH.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/PruneEH.cpp Tue Sep 23 18:03:40 2008
@@ -125,7 +125,7 @@
   // If the SCC doesn't unwind or doesn't throw, note this fact.
   if (!SCCMightUnwind || !SCCMightReturn)
     for (unsigned i = 0, e = SCC.size(); i != e; ++i) {
-      ParameterAttributes NewAttributes = ParamAttr::None;
+      Attributes NewAttributes = ParamAttr::None;
 
       if (!SCCMightUnwind)
         NewAttributes |= ParamAttr::NoUnwind;

Modified: llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp?rev=56513&r1=56512&r2=56513&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp Tue Sep 23 18:03:40 2008
@@ -210,7 +210,7 @@
   const PAListPtr &PAL = F->getParamAttrs();
 
   // Add any return attributes.
-  if (ParameterAttributes attrs = PAL.getParamAttrs(0))
+  if (Attributes attrs = PAL.getParamAttrs(0))
     ParamAttrsVec.push_back(ParamAttrsWithIndex::get(0, attrs));
 
   // Skip first argument.
@@ -221,7 +221,7 @@
   unsigned ParamIndex = 2; 
   while (I != E) {
     Params.push_back(I->getType());
-    if (ParameterAttributes Attrs = PAL.getParamAttrs(ParamIndex))
+    if (Attributes Attrs = PAL.getParamAttrs(ParamIndex))
       ParamAttrsVec.push_back(ParamAttrsWithIndex::get(ParamIndex - 1, Attrs));
     ++I;
     ++ParamIndex;
@@ -264,7 +264,7 @@
 
     const PAListPtr &PAL = F->getParamAttrs();
     // Add any return attributes.
-    if (ParameterAttributes attrs = PAL.getParamAttrs(0))
+    if (Attributes attrs = PAL.getParamAttrs(0))
       ArgAttrsVec.push_back(ParamAttrsWithIndex::get(0, attrs));
 
     // Copy arguments, however skip first one.
@@ -276,7 +276,7 @@
     unsigned ParamIndex = 2; 
     while (AI != AE) {
       Args.push_back(*AI); 
-      if (ParameterAttributes Attrs = PAL.getParamAttrs(ParamIndex))
+      if (Attributes Attrs = PAL.getParamAttrs(ParamIndex))
         ArgAttrsVec.push_back(ParamAttrsWithIndex::get(ParamIndex - 1, Attrs));
       ++ParamIndex;
       ++AI;

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

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp Tue Sep 23 18:03:40 2008
@@ -9127,7 +9127,7 @@
       return false;   // Cannot transform this return value.
 
     if (!CallerPAL.isEmpty() && !Caller->use_empty()) {
-      ParameterAttributes RAttrs = CallerPAL.getParamAttrs(0);
+      Attributes RAttrs = CallerPAL.getParamAttrs(0);
       if (RAttrs & ParamAttr::typeIncompatible(NewRetTy))
         return false;   // Attribute not compatible with transformed value.
     }
@@ -9180,7 +9180,7 @@
     for (unsigned i = CallerPAL.getNumSlots(); i; --i) {
       if (CallerPAL.getSlot(i - 1).Index <= FT->getNumParams())
         break;
-      ParameterAttributes PAttrs = CallerPAL.getSlot(i - 1).Attrs;
+      Attributes PAttrs = CallerPAL.getSlot(i - 1).Attrs;
       if (PAttrs & ParamAttr::VarArgsIncompatible)
         return false;
     }
@@ -9193,7 +9193,7 @@
   attrVec.reserve(NumCommonArgs);
 
   // Get any return attributes.
-  ParameterAttributes RAttrs = CallerPAL.getParamAttrs(0);
+  Attributes RAttrs = CallerPAL.getParamAttrs(0);
 
   // If the return value is not being used, the type may not be compatible
   // with the existing attributes.  Wipe out any problematic attributes.
@@ -9216,7 +9216,7 @@
     }
 
     // Add any parameter attributes.
-    if (ParameterAttributes PAttrs = CallerPAL.getParamAttrs(i + 1))
+    if (Attributes PAttrs = CallerPAL.getParamAttrs(i + 1))
       attrVec.push_back(ParamAttrsWithIndex::get(i + 1, PAttrs));
   }
 
@@ -9246,7 +9246,7 @@
         }
 
         // Add any parameter attributes.
-        if (ParameterAttributes PAttrs = CallerPAL.getParamAttrs(i + 1))
+        if (Attributes PAttrs = CallerPAL.getParamAttrs(i + 1))
           attrVec.push_back(ParamAttrsWithIndex::get(i + 1, PAttrs));
       }
     }
@@ -9329,7 +9329,7 @@
   if (!NestAttrs.isEmpty()) {
     unsigned NestIdx = 1;
     const Type *NestTy = 0;
-    ParameterAttributes NestAttr = ParamAttr::None;
+    Attributes NestAttr = ParamAttr::None;
 
     // Look for a parameter marked with the 'nest' attribute.
     for (FunctionType::param_iterator I = NestFTy->param_begin(),
@@ -9353,7 +9353,7 @@
       // mean appending it.  Likewise for attributes.
 
       // Add any function result attributes.
-      if (ParameterAttributes Attr = Attrs.getParamAttrs(0))
+      if (Attributes Attr = Attrs.getParamAttrs(0))
         NewAttrs.push_back(ParamAttrsWithIndex::get(0, Attr));
 
       {
@@ -9374,7 +9374,7 @@
 
           // Add the original argument and attributes.
           NewArgs.push_back(*I);
-          if (ParameterAttributes Attr = Attrs.getParamAttrs(Idx))
+          if (Attributes Attr = Attrs.getParamAttrs(Idx))
             NewAttrs.push_back
               (ParamAttrsWithIndex::get(Idx + (Idx >= NestIdx), Attr));
 

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

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/MemCpyOptimizer.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/MemCpyOptimizer.cpp Tue Sep 23 18:03:40 2008
@@ -16,7 +16,6 @@
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/IntrinsicInst.h"
 #include "llvm/Instructions.h"
-#include "llvm/ParameterAttributes.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/Analysis/Dominators.h"

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

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/SimplifyCFGPass.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/SimplifyCFGPass.cpp Tue Sep 23 18:03:40 2008
@@ -27,7 +27,7 @@
 #include "llvm/Constants.h"
 #include "llvm/Instructions.h"
 #include "llvm/Module.h"
-#include "llvm/ParameterAttributes.h"
+#include "llvm/Attributes.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Pass.h"

Modified: llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp?rev=56513&r1=56512&r2=56513&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp Tue Sep 23 18:03:40 2008
@@ -18,7 +18,7 @@
 #include "llvm/Module.h"
 #include "llvm/Instructions.h"
 #include "llvm/Intrinsics.h"
-#include "llvm/ParameterAttributes.h"
+#include "llvm/Attributes.h"
 #include "llvm/Analysis/CallGraph.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/ADT/SmallVector.h"

Modified: llvm/trunk/lib/VMCore/AsmWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/AsmWriter.cpp?rev=56513&r1=56512&r2=56513&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/AsmWriter.cpp (original)
+++ llvm/trunk/lib/VMCore/AsmWriter.cpp Tue Sep 23 18:03:40 2008
@@ -1006,7 +1006,7 @@
   void write(const Type *Ty)          { printType(Ty);        }
 
   void writeOperand(const Value *Op, bool PrintType);
-  void writeParamOperand(const Value *Operand, ParameterAttributes Attrs);
+  void writeParamOperand(const Value *Operand, Attributes Attrs);
 
   const Module* getModule() { return TheModule; }
 
@@ -1016,7 +1016,7 @@
   void printGlobal(const GlobalVariable *GV);
   void printAlias(const GlobalAlias *GV);
   void printFunction(const Function *F);
-  void printArgument(const Argument *FA, ParameterAttributes Attrs);
+  void printArgument(const Argument *FA, Attributes Attrs);
   void printBasicBlock(const BasicBlock *BB);
   void printInstruction(const Instruction &I);
 
@@ -1126,7 +1126,7 @@
 }
 
 void AssemblyWriter::writeParamOperand(const Value *Operand, 
-                                       ParameterAttributes Attrs) {
+                                       Attributes Attrs) {
   if (Operand == 0) {
     Out << "<null operand!>";
   } else {
@@ -1386,7 +1386,7 @@
       // Output type...
       printType(FT->getParamType(i));
       
-      ParameterAttributes ArgAttrs = Attrs.getParamAttrs(i+1);
+      Attributes ArgAttrs = Attrs.getParamAttrs(i+1);
       if (ArgAttrs != ParamAttr::None)
         Out << ' ' << ParamAttr::getAsString(ArgAttrs);
     }
@@ -1398,7 +1398,7 @@
     Out << "...";  // Output varargs portion of signature!
   }
   Out << ')';
-  ParameterAttributes RetAttrs = Attrs.getParamAttrs(0);
+  Attributes RetAttrs = Attrs.getParamAttrs(0);
   if (RetAttrs != ParamAttr::None)
     Out << ' ' << ParamAttr::getAsString(Attrs.getParamAttrs(0));
   if (F->hasSection())
@@ -1454,7 +1454,7 @@
 /// the function.  Simply print it out
 ///
 void AssemblyWriter::printArgument(const Argument *Arg, 
-                                   ParameterAttributes Attrs) {
+                                   Attributes Attrs) {
   // Output type...
   printType(Arg->getType());
 

Copied: llvm/trunk/lib/VMCore/Attributes.cpp (from r56511, llvm/trunk/lib/VMCore/ParameterAttributes.cpp)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Attributes.cpp?p2=llvm/trunk/lib/VMCore/Attributes.cpp&p1=llvm/trunk/lib/VMCore/ParameterAttributes.cpp&r1=56511&r2=56513&rev=56513&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/ParameterAttributes.cpp (original)
+++ llvm/trunk/lib/VMCore/Attributes.cpp Tue Sep 23 18:03:40 2008
@@ -1,4 +1,4 @@
-//===-- ParameterAttributes.cpp - Implement ParamAttrsList ----------------===//
+//===-- Attributes.cpp - Implement ParamAttrsList ----------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/ParameterAttributes.h"
+#include "llvm/Attributes.h"
 #include "llvm/Type.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/FoldingSet.h"
@@ -23,7 +23,7 @@
 // ParamAttr Function Definitions
 //===----------------------------------------------------------------------===//
 
-std::string ParamAttr::getAsString(ParameterAttributes Attrs) {
+std::string ParamAttr::getAsString(Attributes Attrs) {
   std::string Result;
   if (Attrs & ParamAttr::ZExt)
     Result += "zeroext ";
@@ -57,8 +57,8 @@
   return Result;
 }
 
-ParameterAttributes ParamAttr::typeIncompatible(const Type *Ty) {
-  ParameterAttributes Incompatible = None;
+Attributes ParamAttr::typeIncompatible(const Type *Ty) {
+  Attributes Incompatible = None;
   
   if (!Ty->isInteger())
     // Attributes that only apply to integers.
@@ -187,7 +187,7 @@
 /// getParamAttrs - The parameter attributes for the specified parameter are
 /// returned.  Parameters for the result are denoted with Idx = 0.
 /// Function notes are denoted with idx = ~0.
-ParameterAttributes PAListPtr::getParamAttrs(unsigned Idx) const {
+Attributes PAListPtr::getParamAttrs(unsigned Idx) const {
   if (PAList == 0) return ParamAttr::None;
   
   const SmallVector<ParamAttrsWithIndex, 4> &Attrs = PAList->Attrs;
@@ -199,7 +199,7 @@
 
 /// hasAttrSomewhere - Return true if the specified attribute is set for at
 /// least one parameter or for the return value.
-bool PAListPtr::hasAttrSomewhere(ParameterAttributes Attr) const {
+bool PAListPtr::hasAttrSomewhere(Attributes Attr) const {
   if (PAList == 0) return false;
   
   const SmallVector<ParamAttrsWithIndex, 4> &Attrs = PAList->Attrs;
@@ -210,18 +210,18 @@
 }
 
 
-PAListPtr PAListPtr::addAttr(unsigned Idx, ParameterAttributes Attrs) const {
-  ParameterAttributes OldAttrs = getParamAttrs(Idx);
+PAListPtr PAListPtr::addAttr(unsigned Idx, Attributes Attrs) const {
+  Attributes OldAttrs = getParamAttrs(Idx);
 #ifndef NDEBUG
   // FIXME it is not obvious how this should work for alignment.
   // For now, say we can't change a known alignment.
-  ParameterAttributes OldAlign = OldAttrs & ParamAttr::Alignment;
-  ParameterAttributes NewAlign = Attrs & ParamAttr::Alignment;
+  Attributes OldAlign = OldAttrs & ParamAttr::Alignment;
+  Attributes NewAlign = Attrs & ParamAttr::Alignment;
   assert((!OldAlign || !NewAlign || OldAlign == NewAlign) &&
          "Attempt to change alignment!");
 #endif
   
-  ParameterAttributes NewAttrs = OldAttrs | Attrs;
+  Attributes NewAttrs = OldAttrs | Attrs;
   if (NewAttrs == OldAttrs)
     return *this;
   
@@ -251,7 +251,7 @@
   return get(&NewAttrList[0], NewAttrList.size());
 }
 
-PAListPtr PAListPtr::removeAttr(unsigned Idx, ParameterAttributes Attrs) const {
+PAListPtr PAListPtr::removeAttr(unsigned Idx, Attributes Attrs) const {
 #ifndef NDEBUG
   // FIXME it is not obvious how this should work for alignment.
   // For now, say we can't pass in alignment, which no current use does.
@@ -259,8 +259,8 @@
 #endif
   if (PAList == 0) return PAListPtr();
   
-  ParameterAttributes OldAttrs = getParamAttrs(Idx);
-  ParameterAttributes NewAttrs = OldAttrs & ~Attrs;
+  Attributes OldAttrs = getParamAttrs(Idx);
+  Attributes NewAttrs = OldAttrs & ~Attrs;
   if (NewAttrs == OldAttrs)
     return *this;
 

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

==============================================================================
--- llvm/trunk/lib/VMCore/Function.cpp (original)
+++ llvm/trunk/lib/VMCore/Function.cpp Tue Sep 23 18:03:40 2008
@@ -112,12 +112,12 @@
 }
 
 /// addAttr - Add a ParamAttr to an argument
-void Argument::addAttr(ParameterAttributes attr) {
+void Argument::addAttr(Attributes attr) {
   getParent()->addParamAttr(getArgNo() + 1, attr);
 }
 
 /// removeAttr - Remove a ParamAttr from an argument
-void Argument::removeAttr(ParameterAttributes attr) {
+void Argument::removeAttr(Attributes attr) {
   getParent()->removeParamAttr(getArgNo() + 1, attr);
 }
 
@@ -229,13 +229,13 @@
   BasicBlocks.clear();    // Delete all basic blocks...
 }
 
-void Function::addParamAttr(unsigned i, ParameterAttributes attr) {
+void Function::addParamAttr(unsigned i, Attributes attr) {
   PAListPtr PAL = getParamAttrs();
   PAL = PAL.addAttr(i, attr);
   setParamAttrs(PAL);
 }
 
-void Function::removeParamAttr(unsigned i, ParameterAttributes attr) {
+void Function::removeParamAttr(unsigned i, Attributes attr) {
   PAListPtr PAL = getParamAttrs();
   PAL = PAL.removeAttr(i, attr);
   setParamAttrs(PAL);
@@ -356,7 +356,7 @@
 }
 
 PAListPtr Intrinsic::getParamAttrs(ID id) {
-  ParameterAttributes Attr = ParamAttr::None;
+  Attributes Attr = ParamAttr::None;
 
 #define GET_INTRINSIC_ATTRIBUTES
 #include "llvm/Intrinsics.gen"

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

==============================================================================
--- llvm/trunk/lib/VMCore/Instructions.cpp (original)
+++ llvm/trunk/lib/VMCore/Instructions.cpp Tue Sep 23 18:03:40 2008
@@ -53,7 +53,7 @@
   else
     cast<InvokeInst>(I)->setParamAttrs(PAL);
 }
-bool CallSite::paramHasAttr(uint16_t i, ParameterAttributes attr) const {
+bool CallSite::paramHasAttr(uint16_t i, Attributes attr) const {
   if (CallInst *CI = dyn_cast<CallInst>(I))
     return CI->paramHasAttr(i, attr);
   else
@@ -402,19 +402,19 @@
     OL[i] = InOL[i];
 }
 
-void CallInst::addParamAttr(unsigned i, ParameterAttributes attr) {
+void CallInst::addParamAttr(unsigned i, Attributes attr) {
   PAListPtr PAL = getParamAttrs();
   PAL = PAL.addAttr(i, attr);
   setParamAttrs(PAL);
 }
 
-void CallInst::removeParamAttr(unsigned i, ParameterAttributes attr) {
+void CallInst::removeParamAttr(unsigned i, Attributes attr) {
   PAListPtr PAL = getParamAttrs();
   PAL = PAL.removeAttr(i, attr);
   setParamAttrs(PAL);
 }
 
-bool CallInst::paramHasAttr(unsigned i, ParameterAttributes attr) const {
+bool CallInst::paramHasAttr(unsigned i, Attributes attr) const {
   if (ParamAttrs.paramHasAttr(i, attr))
     return true;
   if (const Function *F = getCalledFunction())
@@ -473,7 +473,7 @@
   return setSuccessor(idx, B);
 }
 
-bool InvokeInst::paramHasAttr(unsigned i, ParameterAttributes attr) const {
+bool InvokeInst::paramHasAttr(unsigned i, Attributes attr) const {
   if (ParamAttrs.paramHasAttr(i, attr))
     return true;
   if (const Function *F = getCalledFunction())
@@ -481,13 +481,13 @@
   return false;
 }
 
-void InvokeInst::addParamAttr(unsigned i, ParameterAttributes attr) {
+void InvokeInst::addParamAttr(unsigned i, Attributes attr) {
   PAListPtr PAL = getParamAttrs();
   PAL = PAL.addAttr(i, attr);
   setParamAttrs(PAL);
 }
 
-void InvokeInst::removeParamAttr(unsigned i, ParameterAttributes attr) {
+void InvokeInst::removeParamAttr(unsigned i, Attributes attr) {
   PAListPtr PAL = getParamAttrs();
   PAL = PAL.removeAttr(i, attr);
   setParamAttrs(PAL);

Removed: llvm/trunk/lib/VMCore/ParameterAttributes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/ParameterAttributes.cpp?rev=56512&view=auto

==============================================================================
--- llvm/trunk/lib/VMCore/ParameterAttributes.cpp (original)
+++ llvm/trunk/lib/VMCore/ParameterAttributes.cpp (removed)
@@ -1,297 +0,0 @@
-//===-- ParameterAttributes.cpp - Implement ParamAttrsList ----------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements the ParamAttrsList class and ParamAttr utilities.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ParameterAttributes.h"
-#include "llvm/Type.h"
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/ADT/FoldingSet.h"
-#include "llvm/Support/Streams.h"
-#include "llvm/Support/ManagedStatic.h"
-using namespace llvm;
-
-//===----------------------------------------------------------------------===//
-// ParamAttr Function Definitions
-//===----------------------------------------------------------------------===//
-
-std::string ParamAttr::getAsString(ParameterAttributes Attrs) {
-  std::string Result;
-  if (Attrs & ParamAttr::ZExt)
-    Result += "zeroext ";
-  if (Attrs & ParamAttr::SExt)
-    Result += "signext ";
-  if (Attrs & ParamAttr::NoReturn)
-    Result += "noreturn ";
-  if (Attrs & ParamAttr::NoUnwind)
-    Result += "nounwind ";
-  if (Attrs & ParamAttr::InReg)
-    Result += "inreg ";
-  if (Attrs & ParamAttr::NoAlias)
-    Result += "noalias ";
-  if (Attrs & ParamAttr::StructRet)
-    Result += "sret ";  
-  if (Attrs & ParamAttr::ByVal)
-    Result += "byval ";
-  if (Attrs & ParamAttr::Nest)
-    Result += "nest ";
-  if (Attrs & ParamAttr::ReadNone)
-    Result += "readnone ";
-  if (Attrs & ParamAttr::ReadOnly)
-    Result += "readonly ";
-  if (Attrs & ParamAttr::Alignment) {
-    Result += "align ";
-    Result += utostr((Attrs & ParamAttr::Alignment) >> 16);
-    Result += " ";
-  }
-  // Trim the trailing space.
-  Result.erase(Result.end()-1);
-  return Result;
-}
-
-ParameterAttributes ParamAttr::typeIncompatible(const Type *Ty) {
-  ParameterAttributes Incompatible = None;
-  
-  if (!Ty->isInteger())
-    // Attributes that only apply to integers.
-    Incompatible |= SExt | ZExt;
-  
-  if (!isa<PointerType>(Ty))
-    // Attributes that only apply to pointers.
-    Incompatible |= ByVal | Nest | NoAlias | StructRet;
-  
-  return Incompatible;
-}
-
-//===----------------------------------------------------------------------===//
-// ParamAttributeListImpl Definition
-//===----------------------------------------------------------------------===//
-
-namespace llvm {
-class ParamAttributeListImpl : public FoldingSetNode {
-  unsigned RefCount;
-  
-  // ParamAttrsList is uniqued, these should not be publicly available.
-  void operator=(const ParamAttributeListImpl &); // Do not implement
-  ParamAttributeListImpl(const ParamAttributeListImpl &); // Do not implement
-  ~ParamAttributeListImpl();                        // Private implementation
-public:
-  SmallVector<ParamAttrsWithIndex, 4> Attrs;
-  
-  ParamAttributeListImpl(const ParamAttrsWithIndex *Attr, unsigned NumAttrs)
-    : Attrs(Attr, Attr+NumAttrs) {
-    RefCount = 0;
-  }
-  
-  void AddRef() { ++RefCount; }
-  void DropRef() { if (--RefCount == 0) delete this; }
-  
-  void Profile(FoldingSetNodeID &ID) const {
-    Profile(ID, &Attrs[0], Attrs.size());
-  }
-  static void Profile(FoldingSetNodeID &ID, const ParamAttrsWithIndex *Attr,
-                      unsigned NumAttrs) {
-    for (unsigned i = 0; i != NumAttrs; ++i)
-      ID.AddInteger(uint64_t(Attr[i].Attrs) << 32 | unsigned(Attr[i].Index));
-  }
-};
-}
-
-static ManagedStatic<FoldingSet<ParamAttributeListImpl> > ParamAttrsLists;
-
-ParamAttributeListImpl::~ParamAttributeListImpl() {
-  ParamAttrsLists->RemoveNode(this);
-}
-
-
-PAListPtr PAListPtr::get(const ParamAttrsWithIndex *Attrs, unsigned NumAttrs) {
-  // If there are no attributes then return a null ParamAttrsList pointer.
-  if (NumAttrs == 0)
-    return PAListPtr();
-  
-#ifndef NDEBUG
-  for (unsigned i = 0; i != NumAttrs; ++i) {
-    assert(Attrs[i].Attrs != ParamAttr::None && 
-           "Pointless parameter attribute!");
-    assert((!i || Attrs[i-1].Index < Attrs[i].Index) &&
-           "Misordered ParamAttrsList!");
-  }
-#endif
-  
-  // Otherwise, build a key to look up the existing attributes.
-  FoldingSetNodeID ID;
-  ParamAttributeListImpl::Profile(ID, Attrs, NumAttrs);
-  void *InsertPos;
-  ParamAttributeListImpl *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 ParamAttributeListImpl(Attrs, NumAttrs);
-    ParamAttrsLists->InsertNode(PAL, InsertPos);
-  }
-  
-  // Return the ParamAttrsList that we found or created.
-  return PAListPtr(PAL);
-}
-
-
-//===----------------------------------------------------------------------===//
-// PAListPtr Method Implementations
-//===----------------------------------------------------------------------===//
-
-PAListPtr::PAListPtr(ParamAttributeListImpl *LI) : PAList(LI) {
-  if (LI) LI->AddRef();
-}
-
-PAListPtr::PAListPtr(const PAListPtr &P) : PAList(P.PAList) {
-  if (PAList) PAList->AddRef();  
-}
-
-const PAListPtr &PAListPtr::operator=(const PAListPtr &RHS) {
-  if (PAList == RHS.PAList) return *this;
-  if (PAList) PAList->DropRef();
-  PAList = RHS.PAList;
-  if (PAList) PAList->AddRef();
-  return *this;
-}
-
-PAListPtr::~PAListPtr() {
-  if (PAList) PAList->DropRef();
-}
-
-/// getNumSlots - Return the number of slots used in this attribute list. 
-/// This is the number of arguments that have an attribute set on them
-/// (including the function itself).
-unsigned PAListPtr::getNumSlots() const {
-  return PAList ? PAList->Attrs.size() : 0;
-}
-
-/// getSlot - Return the ParamAttrsWithIndex at the specified slot.  This
-/// holds a parameter number plus a set of attributes.
-const ParamAttrsWithIndex &PAListPtr::getSlot(unsigned Slot) const {
-  assert(PAList && Slot < PAList->Attrs.size() && "Slot # out of range!");
-  return PAList->Attrs[Slot];
-}
-
-
-/// getParamAttrs - The parameter attributes for the specified parameter are
-/// returned.  Parameters for the result are denoted with Idx = 0.
-/// Function notes are denoted with idx = ~0.
-ParameterAttributes PAListPtr::getParamAttrs(unsigned Idx) const {
-  if (PAList == 0) return ParamAttr::None;
-  
-  const SmallVector<ParamAttrsWithIndex, 4> &Attrs = PAList->Attrs;
-  for (unsigned i = 0, e = Attrs.size(); i != e && Attrs[i].Index <= Idx; ++i)
-    if (Attrs[i].Index == Idx)
-      return Attrs[i].Attrs;
-  return ParamAttr::None;
-}
-
-/// hasAttrSomewhere - Return true if the specified attribute is set for at
-/// least one parameter or for the return value.
-bool PAListPtr::hasAttrSomewhere(ParameterAttributes Attr) const {
-  if (PAList == 0) return false;
-  
-  const SmallVector<ParamAttrsWithIndex, 4> &Attrs = PAList->Attrs;
-  for (unsigned i = 0, e = Attrs.size(); i != e; ++i)
-    if (Attrs[i].Attrs & Attr)
-      return true;
-  return false;
-}
-
-
-PAListPtr PAListPtr::addAttr(unsigned Idx, ParameterAttributes Attrs) const {
-  ParameterAttributes OldAttrs = getParamAttrs(Idx);
-#ifndef NDEBUG
-  // FIXME it is not obvious how this should work for alignment.
-  // For now, say we can't change a known alignment.
-  ParameterAttributes OldAlign = OldAttrs & ParamAttr::Alignment;
-  ParameterAttributes NewAlign = Attrs & ParamAttr::Alignment;
-  assert((!OldAlign || !NewAlign || OldAlign == NewAlign) &&
-         "Attempt to change alignment!");
-#endif
-  
-  ParameterAttributes NewAttrs = OldAttrs | Attrs;
-  if (NewAttrs == OldAttrs)
-    return *this;
-  
-  SmallVector<ParamAttrsWithIndex, 8> NewAttrList;
-  if (PAList == 0)
-    NewAttrList.push_back(ParamAttrsWithIndex::get(Idx, Attrs));
-  else {
-    const SmallVector<ParamAttrsWithIndex, 4> &OldAttrList = PAList->Attrs;
-    unsigned i = 0, e = OldAttrList.size();
-    // Copy attributes for arguments before this one.
-    for (; i != e && OldAttrList[i].Index < Idx; ++i)
-      NewAttrList.push_back(OldAttrList[i]);
-
-    // If there are attributes already at this index, merge them in.
-    if (i != e && OldAttrList[i].Index == Idx) {
-      Attrs |= OldAttrList[i].Attrs;
-      ++i;
-    }
-    
-    NewAttrList.push_back(ParamAttrsWithIndex::get(Idx, Attrs));
-    
-    // Copy attributes for arguments after this one.
-    NewAttrList.insert(NewAttrList.end(), 
-                       OldAttrList.begin()+i, OldAttrList.end());
-  }
-  
-  return get(&NewAttrList[0], NewAttrList.size());
-}
-
-PAListPtr PAListPtr::removeAttr(unsigned Idx, ParameterAttributes Attrs) const {
-#ifndef NDEBUG
-  // FIXME it is not obvious how this should work for alignment.
-  // For now, say we can't pass in alignment, which no current use does.
-  assert(!(Attrs & ParamAttr::Alignment) && "Attempt to exclude alignment!");
-#endif
-  if (PAList == 0) return PAListPtr();
-  
-  ParameterAttributes OldAttrs = getParamAttrs(Idx);
-  ParameterAttributes NewAttrs = OldAttrs & ~Attrs;
-  if (NewAttrs == OldAttrs)
-    return *this;
-
-  SmallVector<ParamAttrsWithIndex, 8> NewAttrList;
-  const SmallVector<ParamAttrsWithIndex, 4> &OldAttrList = PAList->Attrs;
-  unsigned i = 0, e = OldAttrList.size();
-  
-  // Copy attributes for arguments before this one.
-  for (; i != e && OldAttrList[i].Index < Idx; ++i)
-    NewAttrList.push_back(OldAttrList[i]);
-  
-  // If there are attributes already at this index, merge them in.
-  assert(OldAttrList[i].Index == Idx && "Attribute isn't set?");
-  Attrs = OldAttrList[i].Attrs & ~Attrs;
-  ++i;
-  if (Attrs)  // If any attributes left for this parameter, add them.
-    NewAttrList.push_back(ParamAttrsWithIndex::get(Idx, Attrs));
-  
-  // Copy attributes for arguments after this one.
-  NewAttrList.insert(NewAttrList.end(), 
-                     OldAttrList.begin()+i, OldAttrList.end());
-  
-  return get(&NewAttrList[0], NewAttrList.size());
-}
-
-void PAListPtr::dump() const {
-  cerr << "PAL[ ";
-  for (unsigned i = 0; i < getNumSlots(); ++i) {
-    const ParamAttrsWithIndex &PAWI = getSlot(i);
-    cerr << "{" << PAWI.Index << "," << PAWI.Attrs << "} ";
-  }
-  
-  cerr << "]\n";
-}

Modified: llvm/trunk/lib/VMCore/Verifier.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Verifier.cpp?rev=56513&r1=56512&r2=56513&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/Verifier.cpp (original)
+++ llvm/trunk/lib/VMCore/Verifier.cpp Tue Sep 23 18:03:40 2008
@@ -268,7 +268,7 @@
     void VerifyCallSite(CallSite CS);
     void VerifyIntrinsicPrototype(Intrinsic::ID ID, Function *F,
                                   unsigned Count, ...);
-    void VerifyAttrs(ParameterAttributes Attrs, const Type *Ty,
+    void VerifyAttrs(Attributes Attrs, const Type *Ty,
                      bool isReturnValue, const Value *V);
     void VerifyFunctionAttrs(const FunctionType *FT, const PAListPtr &Attrs,
                              const Value *V);
@@ -406,33 +406,33 @@
 
 // VerifyAttrs - Check the given parameter attributes for an argument or return
 // value of the specified type.  The value V is printed in error messages.
-void Verifier::VerifyAttrs(ParameterAttributes Attrs, const Type *Ty, 
+void Verifier::VerifyAttrs(Attributes Attrs, const Type *Ty, 
                            bool isReturnValue, const Value *V) {
   if (Attrs == ParamAttr::None)
     return;
 
   if (isReturnValue) {
-    ParameterAttributes RetI = Attrs & ParamAttr::ParameterOnly;
+    Attributes RetI = Attrs & ParamAttr::ParameterOnly;
     Assert1(!RetI, "Attribute " + ParamAttr::getAsString(RetI) +
             " does not apply to return values!", V);
   } else {
-    ParameterAttributes ParmI = Attrs & ParamAttr::ReturnOnly;
+    Attributes ParmI = Attrs & ParamAttr::ReturnOnly;
     Assert1(!ParmI, "Attribute " + ParamAttr::getAsString(ParmI) +
             " only applies to return values!", V);
   }
 
   for (unsigned i = 0;
        i < array_lengthof(ParamAttr::MutuallyIncompatible); ++i) {
-    ParameterAttributes MutI = Attrs & ParamAttr::MutuallyIncompatible[i];
+    Attributes MutI = Attrs & ParamAttr::MutuallyIncompatible[i];
     Assert1(!(MutI & (MutI - 1)), "Attributes " +
             ParamAttr::getAsString(MutI) + " are incompatible!", V);
   }
 
-  ParameterAttributes TypeI = Attrs & ParamAttr::typeIncompatible(Ty);
+  Attributes TypeI = Attrs & ParamAttr::typeIncompatible(Ty);
   Assert1(!TypeI, "Wrong type for attribute " +
           ParamAttr::getAsString(TypeI), V);
 
-  ParameterAttributes ByValI = Attrs & ParamAttr::ByVal;
+  Attributes ByValI = Attrs & ParamAttr::ByVal;
   if (const PointerType *PTy = dyn_cast<PointerType>(Ty)) {
     Assert1(!ByValI || PTy->getElementType()->isSized(),
             "Attribute " + ParamAttr::getAsString(ByValI) +
@@ -976,11 +976,11 @@
   if (FTy->isVarArg())
     // Check attributes on the varargs part.
     for (unsigned Idx = 1 + FTy->getNumParams(); Idx <= CS.arg_size(); ++Idx) {
-      ParameterAttributes Attr = Attrs.getParamAttrs(Idx);
+      Attributes Attr = Attrs.getParamAttrs(Idx);
 
       VerifyAttrs(Attr, CS.getArgument(Idx-1)->getType(), false, I);
 
-      ParameterAttributes VArgI = Attr & ParamAttr::VarArgsIncompatible;
+      Attributes VArgI = Attr & ParamAttr::VarArgsIncompatible;
       Assert1(!VArgI, "Attribute " + ParamAttr::getAsString(VArgI) +
               " cannot be used for vararg call arguments!", I);
     }




From clattner at apple.com  Tue Sep 23 18:07:17 2008
From: clattner at apple.com (Chris Lattner)
Date: Tue, 23 Sep 2008 16:07:17 -0700
Subject: [llvm-commits] [llvm-gcc-4.2] r56512 - in
	/llvm-gcc-4.2/trunk/gcc: llvm-backend.cpp llvm-convert.cpp
In-Reply-To: <200809232253.m8NMrQ3w031553@zion.cs.uiuc.edu>
References: <200809232253.m8NMrQ3w031553@zion.cs.uiuc.edu>
Message-ID: <B9C0D4AB-8F58-4ACC-B541-BAA0A3514A11@apple.com>

On Sep 23, 2008, at 3:53 PM, Devang Patel wrote:
> URL: http://llvm.org/viewvc/llvm-project?rev=56512&view=rev
> Log:
> Notes are implemented as an attribute at index ~0

Ok

>
>   for (Module::iterator I = TheModule->begin(), E = TheModule->end();
>        I != E; ++I)
> -    if (I->hasNote(FN_NOTE_AlwaysInline)) {
> +    if (I->hasNote(ParamAttr::FN_NOTE_AlwaysInline)) {

Is there a reason to keep the FN_NOTE prefix?

-Chris



From clattner at apple.com  Tue Sep 23 18:09:25 2008
From: clattner at apple.com (Chris Lattner)
Date: Tue, 23 Sep 2008 16:09:25 -0700
Subject: [llvm-commits] [llvm] r56511 - in /llvm/trunk: include/llvm/
	lib/AsmParser/ lib/Bitcode/Reader/ lib/Bitcode/Writer/
	lib/Target/X86/AsmPrinter/ lib/Transforms/IPO/
	lib/Transforms/Scalar/ lib/Transforms/Utils/ lib/VMCore/
In-Reply-To: <200809232235.m8NMZJGn030760@zion.cs.uiuc.edu>
References: <200809232235.m8NMZJGn030760@zion.cs.uiuc.edu>
Message-ID: <D7685178-B66C-4822-A33D-C27F4A93238A@apple.com>

On Sep 23, 2008, at 3:35 PM, Devang Patel wrote:
> URL: http://llvm.org/viewvc/llvm-project?rev=56511&view=rev
> Log:
> Use parameter attribute store (soon to be renamed) for
> Function Notes also. Function notes are stored at index ~0.

Yay for convergence :)

> +  bool hasNote(ParameterAttributes N) const {
> +  	// Notes are stored at ~0 index in parameter attribute list
> +    return (!isDeclaration() && paramHasAttr(~0, N));
>   }

Is there a specific reason to check isDeclaration() here?  That seems  
somewhat strange.  Clients should check this if they care.

>
>
>   /// setNotes - Set notes for this function
>   ///
> -  void setNotes(const FunctionNotes P) { Notes = Notes | P;}
> +  void setNotes(const ParameterAttributes N) {
> +  	// Notes are stored at ~0 index in parameter attribute list
> +  	addParamAttr(~0, N);
> +  }

Tabs.

> +++ llvm/trunk/lib/AsmParser/llvmAsmParser.y Tue Sep 23 17:35:17 2008
> @@ -995,7 +995,7 @@
>   llvm::GlobalValue::LinkageTypes         Linkage;
>   llvm::GlobalValue::VisibilityTypes      Visibility;
>   llvm::ParameterAttributes         ParamAttrs;
> -  llvm::FunctionNotes               FunctionNotes;
> +  llvm::ParameterAttributes         FunctionNotes;

Why not just use the existing 'ParamAttrs' field?

Is the syntax of notes in .ll files going to change to follow  
attributes?

-Chris


From clattner at apple.com  Tue Sep 23 18:10:01 2008
From: clattner at apple.com (Chris Lattner)
Date: Tue, 23 Sep 2008 16:10:01 -0700
Subject: [llvm-commits] [llvm] r56384 - in /llvm/trunk/lib/CodeGen:
	RegAllocLinearScan.cpp SimpleRegisterCoalescing.cpp
In-Reply-To: <787EC48F-5ED1-4529-A821-021FC97B069F@apple.com>
References: <200809200203.m8K234YA013252@zion.cs.uiuc.edu>
	<4F71A860-E342-4A07-8211-0A59A1AA154D@apple.com>
	<F80F5034-326C-4AF5-A7A6-84F8C1C3AF23@apple.com>
	<8D81D6DA-8289-49E2-B352-53C6C313FDA8@apple.com>
	<33791BFC-A09D-43EB-B4D0-6582A9243EED@apple.com>
	<ADDCBC77-DB9F-46BB-A73D-FADC943C29D7@apple.com>
	<6AABEF56-39B2-4D47-8928-7FC4AC7AB61B@apple.com>
	<73CDDC9A-1C75-4A15-9931-12DDC51EABCB@apple.com>
	<C661BBE3-98E2-461C-BD90-5CA12268A65C@apple.com>
	<AAA125E9-8897-4B47-A405-CDFA1C83E8DA@apple.com>
	<99141E76-1A5C-4852-B1B5-7053DA9B02D5@apple.com>
	<787EC48F-5ED1-4529-A821-021FC97B069F@apple.com>
Message-ID: <F76AFB99-D3F2-4E7D-A5BE-CA7522D896A2@apple.com>


On Sep 23, 2008, at 3:17 PM, Dale Johannesen wrote:

>>>
>>> I would strongly prefer this.  Even if there are cases that don't
>>> "just work", I think this is the correct way to model it, and the
>>> right long-term answer.
>>
>> Ok fine. Sorry for being overly careful when it comes to the
>> coalescer.
>
> This did basically Just Work (I haven't run the gcc testsuite yet, but
> it doesn't break anything in
> the llvm testsuite and fixes all the examples in our bug reports.)

Great!

> Unfortunately, this approach
> only works in the linear scan RA, while we use a different RA with -
> O0.... I guess I need to fix
> that before turning it on.

Yep, that's expected.  Thanks a lot Dale!

-Chris


From dpatel at apple.com  Tue Sep 23 18:11:25 2008
From: dpatel at apple.com (Devang Patel)
Date: Tue, 23 Sep 2008 23:11:25 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r56514 - in /llvm-gcc-4.2/trunk/gcc:
 llvm-abi.h llvm-convert.cpp llvm-types.cpp
Message-ID: <200809232311.m8NNBPrE032100@zion.cs.uiuc.edu>

Author: dpatel
Date: Tue Sep 23 18:11:24 2008
New Revision: 56514

URL: http://llvm.org/viewvc/llvm-project?rev=56514&view=rev
Log:

s/ParameterAttributes/Attributes/g


Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-abi.h
    llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
    llvm-gcc-4.2/trunk/gcc/llvm-types.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-abi.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-abi.h?rev=56514&r1=56513&r2=56514&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-abi.h (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-abi.h Tue Sep 23 18:11:24 2008
@@ -32,7 +32,7 @@
 #include "llvm-internal.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
-#include "llvm/ParameterAttributes.h"
+#include "llvm/Attributes.h"
 #include "llvm/Target/TargetData.h"
 
 namespace llvm {
@@ -413,7 +413,7 @@
   /// should be handled.  This handles things like decimating structures into
   /// their fields.
   void HandleArgument(tree type, std::vector<const Type*> &ScalarElts,
-                      ParameterAttributes *Attributes = NULL) {
+                      Attributes *Attributes = NULL) {
     unsigned Size = 0;
     bool DontCheckAlignment = false;
     const Type *Ty = ConvertType(type);

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=56514&r1=56513&r2=56514&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Tue Sep 23 18:11:24 2008
@@ -2696,11 +2696,11 @@
       Client.pushAddress(ArgVal.Ptr);
     }
 
-    ParameterAttributes Attributes = ParamAttr::None;
+    Attributes Attrs = ParamAttr::None;
     ABIConverter.HandleArgument(TREE_TYPE(TREE_VALUE(arg)), ScalarArgs,
-                                &Attributes);
-    if (Attributes != ParamAttr::None)
-      PAL = PAL.addAttr(CallOperands.size(), Attributes);
+                                &Attrs);
+    if (Attrs != ParamAttr::None)
+      PAL = PAL.addAttr(CallOperands.size(), Attrs);
 
     Client.clear();
   }

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=56514&r1=56513&r2=56514&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-types.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-types.cpp Tue Sep 23 18:11:24 2008
@@ -1025,7 +1025,7 @@
 }
 
 
-static ParameterAttributes HandleArgumentExtension(tree ArgTy) {
+static Attributes HandleArgumentExtension(tree ArgTy) {
   if (TREE_CODE(ArgTy) == BOOLEAN_TYPE) {
     if (TREE_INT_CST_LOW(TYPE_SIZE(ArgTy)) < INT_TYPE_SIZE)
       return ParamAttr::ZExt;
@@ -1061,7 +1061,7 @@
   SmallVector<ParamAttrsWithIndex, 8> Attrs;
 
   // Compute whether the result needs to be zext or sext'd.
-  ParameterAttributes RAttributes = HandleArgumentExtension(ReturnType);
+  Attributes RAttributes = HandleArgumentExtension(ReturnType);
 
   if (RAttributes != ParamAttr::None)
     Attrs.push_back(ParamAttrsWithIndex::get(0, RAttributes));
@@ -1085,7 +1085,7 @@
     tree ArgTy = TREE_TYPE(Args);
 
     // Determine if there are any attributes for this param.
-    ParameterAttributes Attributes = ParamAttr::None;
+    Attributes Attributes = ParamAttr::None;
 
     ABIConverter.HandleArgument(ArgTy, ScalarArgs, &Attributes);
 
@@ -1119,7 +1119,7 @@
 
   // Compute attributes for return type (and function attributes).
   SmallVector<ParamAttrsWithIndex, 8> Attrs;
-  ParameterAttributes RAttributes = ParamAttr::None;
+  Attributes RAttributes = ParamAttr::None;
 
   int flags = flags_from_decl_or_type(decl ? decl : type);
 
@@ -1211,7 +1211,7 @@
     }
     
     // Determine if there are any attributes for this param.
-    ParameterAttributes Attributes = ParamAttr::None;
+    Attributes Attributes = ParamAttr::None;
     
     ABIConverter.HandleArgument(ArgTy, ScalarArgs, &Attributes);
 
@@ -1253,7 +1253,7 @@
   // write through the byval pointer argument, which LLVM does not allow for
   // readonly/readnone functions.
   if (HasByVal && Attrs[0].Index == 0) {
-    ParameterAttributes &RAttrs = Attrs[0].Attrs;
+    Attributes &RAttrs = Attrs[0].Attrs;
     RAttrs &= ~(ParamAttr::ReadNone | ParamAttr::ReadOnly);
     if (RAttrs == ParamAttr::None)
       Attrs.erase(Attrs.begin());




From gohman at apple.com  Tue Sep 23 18:11:45 2008
From: gohman at apple.com (Dan Gohman)
Date: Tue, 23 Sep 2008 16:11:45 -0700
Subject: [llvm-commits] [llvm] r56326 - in /llvm/trunk:
	include/llvm/CodeGen/LiveInterval.h
	include/llvm/CodeGen/LiveIntervalAnalysis.h
	lib/CodeGen/LiveInterval.cpp lib/CodeGen/LiveIntervalAnalysis.cpp
	lib/CodeGen/RegAllocLinearScan.cpp
In-Reply-To: <200809190102.m8J12ZW2019167@zion.cs.uiuc.edu>
References: <200809190102.m8J12ZW2019167@zion.cs.uiuc.edu>
Message-ID: <7568A867-12B5-4B05-B7CB-A4C647B86313@apple.com>

Hi Dale,

This commit caused a regression in
test/CodeGen/PowerPC/2007-09-11-RegCoalescerAssert.ll
in the "martini x86_64" nightly tester.

It's an llc abort, and it's reproducible by running
llc with the following explicit triple:
-march=ppc64 -mtriple=powerpc-unknown-linux-gnu

Can you investigate?

Thanks,

Dan

On Sep 18, 2008, at 6:02 PM, Dale Johannesen wrote:

> Author: johannes
> Date: Thu Sep 18 20:02:35 2008
> New Revision: 56326
>
> URL: http://llvm.org/viewvc/llvm-project?rev=56326&view=rev
> Log:
> Remove AsmThatEarlyClobber etc. from LiveIntervalAnalysis
> and redo as linked list walk.  Logic moved into RA.
> Per review feedback.
>
>
> Modified:
>    llvm/trunk/include/llvm/CodeGen/LiveInterval.h
>    llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h
>    llvm/trunk/lib/CodeGen/LiveInterval.cpp
>    llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp
>    llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp
>
> Modified: llvm/trunk/include/llvm/CodeGen/LiveInterval.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/LiveInterval.h?rev=56326&r1=56325&r2=56326&view=diff
>
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- llvm/trunk/include/llvm/CodeGen/LiveInterval.h (original)
> +++ llvm/trunk/include/llvm/CodeGen/LiveInterval.h Thu Sep 18  
> 20:02:35 2008
> @@ -105,12 +105,17 @@
>                          // if the top bits is set, it represents a  
> stack slot.
>     unsigned preference; // preferred register to allocate for this  
> interval
>     float weight;        // weight of this interval
> +    bool isEarlyClobber;
> +    bool overlapsEarlyClobber;
>     Ranges ranges;       // the ranges in which this register is live
>     VNInfoList valnos;   // value#'s
>
>   public:
> -    LiveInterval(unsigned Reg, float Weight, bool IsSS = false)
> -      : reg(Reg), preference(0), weight(Weight) {
> +    LiveInterval(unsigned Reg, float Weight, bool IsSS = false,
> +                 bool IsEarlyClobber = false, bool  
> OverlapsEarlyClobber = false)
> +      : reg(Reg), preference(0), weight(Weight),
> +        isEarlyClobber(IsEarlyClobber),
> +        overlapsEarlyClobber(OverlapsEarlyClobber) {
>       if (IsSS)
>         reg = reg | (1U << (sizeof(unsigned)*8-1));
>     }
>
> Modified: llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h?rev=56326&r1=56325&r2=56326&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h (original)
> +++ llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h Thu Sep  
> 18 20:02:35 2008
> @@ -65,22 +65,6 @@
>     AliasAnalysis *aa_;
>     LiveVariables* lv_;
>
> -    /// AsmsWithEarlyClobber - maps a virtual register number to  
> all the
> -    /// inline asm's that have the register marked earlyclobber.
> -    ///
> -    std::multimap<unsigned, MachineInstr*> AsmsThatEarlyClobber;
> -
> -    /// AsmsWithEarlyClobberConflict - maps a virtual register number
> -    /// to all the inline asm's that have earlyclobber operands  
> elsewhere
> -    /// and use the register as a (non-earlyclobber) input.
> -    ///
> -    /// Note: earlyclobber operands may not be assigned the same  
> register as
> -    /// each other, or as earlyclobber-conflict operands.  However  
> two
> -    /// earlyclobber-conflict operands may be assigned the same  
> register if
> -    /// they happen to contain the same value.
> -    ///
> -    std::multimap<unsigned, MachineInstr*>  
> AsmsWithEarlyClobberConflict;
> -
>     /// Special pool allocator for VNInfo's (LiveInterval val#).
>     ///
>     BumpPtrAllocator VNInfoAllocator;
> @@ -353,11 +337,6 @@
>     unsigned getNumConflictsWithPhysReg(const LiveInterval &li,
>                                         unsigned PhysReg) const;
>
> -    /// noEarlyclobberConflict - see whether virtual reg VReg has a  
> conflict
> -    /// with hard reg HReg because HReg is used as an earlyclobber  
> register in
> -    /// asm that also has VReg live into or across it.
> -    bool noEarlyclobberConflict(unsigned VReg, VirtRegMap &vrm,  
> unsigned HReg);
> -
>     /// computeNumbering - Compute the index numbering.
>     void computeNumbering();
>
>
> Modified: llvm/trunk/lib/CodeGen/LiveInterval.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveInterval.cpp?rev=56326&r1=56325&r2=56326&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/CodeGen/LiveInterval.cpp (original)
> +++ llvm/trunk/lib/CodeGen/LiveInterval.cpp Thu Sep 18 20:02:35 2008
> @@ -686,6 +686,10 @@
>     OS << "%reg" << reg;
>
>   OS << ',' << weight;
> +  if (isEarlyClobber)
> +    OS << ",earlyclobber";
> +  if (overlapsEarlyClobber)
> +    OS << ",overlapsearly";
>
>   if (empty())
>     OS << " EMPTY";
>
> Modified: llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp?rev=56326&r1=56325&r2=56326&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp (original)
> +++ llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Thu Sep 18  
> 20:02:35 2008
> @@ -674,8 +674,6 @@
> /// live interval is an interval [i, j) where 1 <= i <= j < N for
> /// which a variable is live
> void LiveIntervals::computeIntervals() {
> -  AsmsThatEarlyClobber.clear();
> -  AsmsWithEarlyClobberConflict.clear();
>
>   DOUT << "********** COMPUTING LIVE INTERVALS **********\n"
>        << "********** Function: "
> @@ -716,13 +714,15 @@
>         if (MO.isRegister() && MO.getReg() && MO.isDef()) {
>           handleRegisterDef(MBB, MI, MIIndex, MO, i);
>           if (MO.isEarlyClobber()) {
> -            AsmsThatEarlyClobber.insert(std::make_pair(MO.getReg(),  
> MI));
> +            LiveInterval &interval =   
> getOrCreateInterval(MO.getReg());
> +            interval.isEarlyClobber = true;
>           }
>         }
>         if (MO.isRegister() && !MO.isDef() &&
>             MO.getReg() &&  
> TargetRegisterInfo::isVirtualRegister(MO.getReg()) &&
>             MO.overlapsEarlyClobber()) {
> -           
> AsmsWithEarlyClobberConflict.insert(std::make_pair(MO.getReg(), MI));
> +          LiveInterval &interval = getOrCreateInterval(MO.getReg());
> +          interval.overlapsEarlyClobber = true;
>         }
>       }
>
> @@ -752,73 +752,6 @@
>   return ResVal;
> }
>
> -/// noEarlyclobberConflict - see whether virtual reg VReg has a  
> conflict with
> -/// hard reg HReg because of earlyclobbers.
> -///
> -/// Earlyclobber operands may not be assigned the same register as
> -/// each other, or as earlyclobber-conflict operands (i.e. those that
> -/// are non-earlyclobbered inputs to an asm that also has  
> earlyclobbers).
> -///
> -/// Thus there are two cases to check for:
> -/// 1.  VReg is an earlyclobber-conflict register and HReg is an  
> earlyclobber
> -/// register in some asm that also has VReg as an input.
> -/// 2.  VReg is an earlyclobber register and HReg is an  
> earlyclobber-conflict
> -/// input elsewhere in some asm.
> -/// In both cases HReg can be assigned by the user, or assigned  
> early in
> -/// register allocation.
> -///
> -/// Dropping the distinction between earlyclobber and earlyclobber- 
> conflict,
> -/// keeping only one multimap, looks promising, but two  
> earlyclobber-conflict
> -/// operands may be assigned the same register if they happen to  
> contain the
> -/// same value, and that implementation would prevent this.
> -///
> -bool LiveIntervals::noEarlyclobberConflict(unsigned VReg,  
> VirtRegMap &vrm,
> -                                           unsigned HReg) {
> -  typedef std::multimap<unsigned, MachineInstr*>::iterator It;
> -
> -  // Short circuit the most common case.
> -  if (AsmsWithEarlyClobberConflict.size()!=0) {
> -    std::pair<It, It> x =  
> AsmsWithEarlyClobberConflict.equal_range(VReg);
> -    for (It I = x.first; I!=x.second; I++) {
> -      MachineInstr* MI = I->second;
> -      for (int i = MI->getNumOperands() - 1; i >= 0; --i) {
> -        MachineOperand &MO = MI->getOperand(i);
> -        if (MO.isRegister() && MO.isEarlyClobber()) {
> -          unsigned PhysReg = MO.getReg();
> -          if (PhysReg &&  
> TargetRegisterInfo::isVirtualRegister(PhysReg)) {
> -            if (!vrm.hasPhys(PhysReg))
> -              continue;
> -            PhysReg = vrm.getPhys(PhysReg);
> -          }
> -          if (PhysReg==HReg)
> -            return false;
> -        }
> -      }
> -    }
> -  }
> -  // Short circuit the most common case.
> -  if (AsmsThatEarlyClobber.size()!=0) {
> -    std::pair<It, It> x = AsmsThatEarlyClobber.equal_range(VReg);
> -    for (It I = x.first; I!=x.second; I++) {
> -      MachineInstr* MI = I->second;
> -      for (int i = MI->getNumOperands() - 1; i >= 0; --i) {
> -        MachineOperand &MO = MI->getOperand(i);
> -        if (MO.isRegister() && MO.overlapsEarlyClobber()) {
> -          unsigned PhysReg = MO.getReg();
> -          if (PhysReg &&  
> TargetRegisterInfo::isVirtualRegister(PhysReg)) {
> -            if (!vrm.hasPhys(PhysReg))
> -              continue;
> -            PhysReg = vrm.getPhys(PhysReg);
> -          }
> -          if (PhysReg==HReg)
> -            return false;
> -        }
> -      }
> -    }
> -  }
> -  return true;
> -}
> -
> LiveInterval* LiveIntervals::createInterval(unsigned reg) {
>   float Weight = TargetRegisterInfo::isPhysicalRegister(reg) ?
>                        HUGE_VALF : 0.0F;
>
> Modified: llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp?rev=56326&r1=56325&r2=56326&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp (original)
> +++ llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp Thu Sep 18  
> 20:02:35 2008
> @@ -173,6 +173,8 @@
>
>     void ComputeRelatedRegClasses();
>
> +    bool noEarlyClobberConflict(LiveInterval *cur, unsigned RegNo);
> +
>     template <typename ItTy>
>     void printIntervals(const char* const str, ItTy i, ItTy e) const {
>       if (str) DOUT << str << " intervals:\n";
> @@ -1001,6 +1003,73 @@
>     unhandled_.push(added[i]);
> }
>
> +/// noEarlyClobberConflict - see whether LiveInternal cur has a  
> conflict with
> +/// hard reg HReg because of earlyclobbers.
> +///
> +/// Earlyclobber operands may not be assigned the same register as
> +/// each other, or as earlyclobber-conflict operands (i.e. those that
> +/// are non-earlyclobbered inputs to an asm that also has  
> earlyclobbers).
> +///
> +/// Thus there are two cases to check for:
> +/// 1.  cur->reg is an earlyclobber-conflict register and HReg is an
> +/// earlyclobber register in some asm that also has cur->reg as an  
> input.
> +/// 2.  cur->reg is an earlyclobber register and HReg is an
> +/// earlyclobber-conflict input, or a different earlyclobber  
> register,
> +/// elsewhere in some asm.
> +/// In both cases HReg can be assigned by the user, or assigned  
> early in
> +/// register allocation.
> +///
> +/// Dropping the distinction between earlyclobber and earlyclobber- 
> conflict,
> +/// keeping only one bit, looks promising, but two earlyclobber- 
> conflict
> +/// operands may be assigned the same register if they happen to  
> contain the
> +/// same value, and that implementation would prevent this.
> +///
> +bool RALinScan::noEarlyClobberConflict(LiveInterval *cur, unsigned  
> HReg) {
> +  if (cur->overlapsEarlyClobber) {
> +    for (MachineRegisterInfo::use_iterator I = mri_->use_begin(cur- 
> >reg),
> +          E = mri_->use_end(); I!=E; ++I) {
> +      MachineInstr *MI = I.getOperand().getParent();
> +      if (MI->getOpcode()==TargetInstrInfo::INLINEASM) {
> +        for (int i = MI->getNumOperands()-1; i>=0; --i) {
> +          MachineOperand &MO = MI->getOperand(i);
> +          if (MO.isRegister() && MO.getReg() && MO.isEarlyClobber()  
> &&
> +              HReg==MO.getReg()) {
> +            DOUT << "  earlyclobber conflict: " <<
> +                  "%reg" << cur->reg << ", " << tri_->getName(HReg)  
> << "\n\t";
> +            return false;
> +          }
> +        }
> +      }
> +    }
> +  }
> +  if (cur->isEarlyClobber) {
> +    for (MachineRegisterInfo::def_iterator I = mri_->def_begin(cur- 
> >reg),
> +          E = mri_->def_end(); I!=E; ++I) {
> +      MachineInstr *MI = I.getOperand().getParent();
> +      if (MI->getOpcode()==TargetInstrInfo::INLINEASM) {
> +        // make sure cur->reg is really clobbered in this  
> instruction.
> +        bool earlyClobberFound = false, overlapFound = false;
> +        for (int i = MI->getNumOperands()-1; i>=0; --i) {
> +          MachineOperand &MO = MI->getOperand(i);
> +          if (MO.isRegister() && MO.getReg()) {
> +            if ((MO.overlapsEarlyClobber() || MO.isEarlyClobber()) &&
> +                HReg==MO.getReg())
> +              overlapFound = true;
> +            if (MO.isEarlyClobber() && cur->reg==MO.getReg())
> +              earlyClobberFound = true;
> +          }
> +        }
> +        if (earlyClobberFound && overlapFound) {
> +          DOUT << "  earlyclobber conflict: " <<
> +                  "%reg" << cur->reg << ", " << tri_->getName(HReg)  
> << "\n\t";
> +          return false;
> +        }
> +      }
> +    }
> +  }
> +  return true;
> +}
> +
> /// getFreePhysReg - return a free physical register for this  
> virtual register
> /// interval if we have one, otherwise return 0.
> unsigned RALinScan::getFreePhysReg(LiveInterval *cur) {
> @@ -1049,7 +1118,7 @@
>   assert(I != E && "No allocatable register in this register class!");
>   for (; I != E; ++I)
>     if (prt_->isRegAvail(*I) &&
> -        li_->noEarlyclobberConflict(cur->reg, *vrm_, *I)) {
> +        noEarlyClobberConflict(cur, *I)) {
>       FreeReg = *I;
>       if (FreeReg < inactiveCounts.size())
>         FreeRegInactiveCount = inactiveCounts[FreeReg];
> @@ -1070,7 +1139,7 @@
>     unsigned Reg = *I;
>     if (prt_->isRegAvail(Reg) && Reg < inactiveCounts.size() &&
>         FreeRegInactiveCount < inactiveCounts[Reg] &&
> -        li_->noEarlyclobberConflict(cur->reg, *vrm_, Reg)) {
> +        noEarlyClobberConflict(cur, *I)) {
>       FreeReg = Reg;
>       FreeRegInactiveCount = inactiveCounts[Reg];
>       if (FreeRegInactiveCount == MaxInactiveCount)
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From dalej at apple.com  Tue Sep 23 18:13:44 2008
From: dalej at apple.com (Dale Johannesen)
Date: Tue, 23 Sep 2008 16:13:44 -0700
Subject: [llvm-commits] [llvm] r56326 - in /llvm/trunk:
	include/llvm/CodeGen/LiveInterval.h
	include/llvm/CodeGen/LiveIntervalAnalysis.h	lib/CodeGen/LiveInterval.cpp
	lib/CodeGen/LiveIntervalAnalysis.cpp	lib/CodeGen/RegAllocLinearScan.cpp
In-Reply-To: <7568A867-12B5-4B05-B7CB-A4C647B86313@apple.com>
References: <200809190102.m8J12ZW2019167@zion.cs.uiuc.edu>
	<7568A867-12B5-4B05-B7CB-A4C647B86313@apple.com>
Message-ID: <66069024-4088-4288-8756-0339CF456DD7@apple.com>


On Sep 23, 2008, at 4:11 PMPDT, Dan Gohman wrote:

> Hi Dale,
>
> This commit caused a regression in
> test/CodeGen/PowerPC/2007-09-11-RegCoalescerAssert.ll
> in the "martini x86_64" nightly tester.
>
> It's an llc abort, and it's reproducible by running
> llc with the following explicit triple:
> -march=ppc64 -mtriple=powerpc-unknown-linux-gnu
>
> Can you investigate?

Sure.

>
> Thanks,
>
> Dan
>
> On Sep 18, 2008, at 6:02 PM, Dale Johannesen wrote:
>
>> Author: johannes
>> Date: Thu Sep 18 20:02:35 2008
>> New Revision: 56326
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=56326&view=rev
>> Log:
>> Remove AsmThatEarlyClobber etc. from LiveIntervalAnalysis
>> and redo as linked list walk.  Logic moved into RA.
>> Per review feedback.
>>
>>
>> Modified:
>>   llvm/trunk/include/llvm/CodeGen/LiveInterval.h
>>   llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h
>>   llvm/trunk/lib/CodeGen/LiveInterval.cpp
>>   llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp
>>   llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp
>>
>> Modified: llvm/trunk/include/llvm/CodeGen/LiveInterval.h
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/LiveInterval.h?rev=56326&r1=56325&r2=56326&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- llvm/trunk/include/llvm/CodeGen/LiveInterval.h (original)
>> +++ llvm/trunk/include/llvm/CodeGen/LiveInterval.h Thu Sep 18
>> 20:02:35 2008
>> @@ -105,12 +105,17 @@
>>                         // if the top bits is set, it represents a
>> stack slot.
>>    unsigned preference; // preferred register to allocate for this
>> interval
>>    float weight;        // weight of this interval
>> +    bool isEarlyClobber;
>> +    bool overlapsEarlyClobber;
>>    Ranges ranges;       // the ranges in which this register is live
>>    VNInfoList valnos;   // value#'s
>>
>>  public:
>> -    LiveInterval(unsigned Reg, float Weight, bool IsSS = false)
>> -      : reg(Reg), preference(0), weight(Weight) {
>> +    LiveInterval(unsigned Reg, float Weight, bool IsSS = false,
>> +                 bool IsEarlyClobber = false, bool
>> OverlapsEarlyClobber = false)
>> +      : reg(Reg), preference(0), weight(Weight),
>> +        isEarlyClobber(IsEarlyClobber),
>> +        overlapsEarlyClobber(OverlapsEarlyClobber) {
>>      if (IsSS)
>>        reg = reg | (1U << (sizeof(unsigned)*8-1));
>>    }
>>
>> Modified: llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h?rev=56326&r1=56325&r2=56326&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h (original)
>> +++ llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h Thu Sep
>> 18 20:02:35 2008
>> @@ -65,22 +65,6 @@
>>    AliasAnalysis *aa_;
>>    LiveVariables* lv_;
>>
>> -    /// AsmsWithEarlyClobber - maps a virtual register number to
>> all the
>> -    /// inline asm's that have the register marked earlyclobber.
>> -    ///
>> -    std::multimap<unsigned, MachineInstr*> AsmsThatEarlyClobber;
>> -
>> -    /// AsmsWithEarlyClobberConflict - maps a virtual register  
>> number
>> -    /// to all the inline asm's that have earlyclobber operands
>> elsewhere
>> -    /// and use the register as a (non-earlyclobber) input.
>> -    ///
>> -    /// Note: earlyclobber operands may not be assigned the same
>> register as
>> -    /// each other, or as earlyclobber-conflict operands.  However
>> two
>> -    /// earlyclobber-conflict operands may be assigned the same
>> register if
>> -    /// they happen to contain the same value.
>> -    ///
>> -    std::multimap<unsigned, MachineInstr*>
>> AsmsWithEarlyClobberConflict;
>> -
>>    /// Special pool allocator for VNInfo's (LiveInterval val#).
>>    ///
>>    BumpPtrAllocator VNInfoAllocator;
>> @@ -353,11 +337,6 @@
>>    unsigned getNumConflictsWithPhysReg(const LiveInterval &li,
>>                                        unsigned PhysReg) const;
>>
>> -    /// noEarlyclobberConflict - see whether virtual reg VReg has a
>> conflict
>> -    /// with hard reg HReg because HReg is used as an earlyclobber
>> register in
>> -    /// asm that also has VReg live into or across it.
>> -    bool noEarlyclobberConflict(unsigned VReg, VirtRegMap &vrm,
>> unsigned HReg);
>> -
>>    /// computeNumbering - Compute the index numbering.
>>    void computeNumbering();
>>
>>
>> Modified: llvm/trunk/lib/CodeGen/LiveInterval.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveInterval.cpp?rev=56326&r1=56325&r2=56326&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/CodeGen/LiveInterval.cpp (original)
>> +++ llvm/trunk/lib/CodeGen/LiveInterval.cpp Thu Sep 18 20:02:35 2008
>> @@ -686,6 +686,10 @@
>>    OS << "%reg" << reg;
>>
>>  OS << ',' << weight;
>> +  if (isEarlyClobber)
>> +    OS << ",earlyclobber";
>> +  if (overlapsEarlyClobber)
>> +    OS << ",overlapsearly";
>>
>>  if (empty())
>>    OS << " EMPTY";
>>
>> Modified: llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp?rev=56326&r1=56325&r2=56326&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp (original)
>> +++ llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Thu Sep 18
>> 20:02:35 2008
>> @@ -674,8 +674,6 @@
>> /// live interval is an interval [i, j) where 1 <= i <= j < N for
>> /// which a variable is live
>> void LiveIntervals::computeIntervals() {
>> -  AsmsThatEarlyClobber.clear();
>> -  AsmsWithEarlyClobberConflict.clear();
>>
>>  DOUT << "********** COMPUTING LIVE INTERVALS **********\n"
>>       << "********** Function: "
>> @@ -716,13 +714,15 @@
>>        if (MO.isRegister() && MO.getReg() && MO.isDef()) {
>>          handleRegisterDef(MBB, MI, MIIndex, MO, i);
>>          if (MO.isEarlyClobber()) {
>> -            AsmsThatEarlyClobber.insert(std::make_pair(MO.getReg(),
>> MI));
>> +            LiveInterval &interval =
>> getOrCreateInterval(MO.getReg());
>> +            interval.isEarlyClobber = true;
>>          }
>>        }
>>        if (MO.isRegister() && !MO.isDef() &&
>>            MO.getReg() &&
>> TargetRegisterInfo::isVirtualRegister(MO.getReg()) &&
>>            MO.overlapsEarlyClobber()) {
>> -
>> AsmsWithEarlyClobberConflict.insert(std::make_pair(MO.getReg(), MI));
>> +          LiveInterval &interval = getOrCreateInterval(MO.getReg());
>> +          interval.overlapsEarlyClobber = true;
>>        }
>>      }
>>
>> @@ -752,73 +752,6 @@
>>  return ResVal;
>> }
>>
>> -/// noEarlyclobberConflict - see whether virtual reg VReg has a
>> conflict with
>> -/// hard reg HReg because of earlyclobbers.
>> -///
>> -/// Earlyclobber operands may not be assigned the same register as
>> -/// each other, or as earlyclobber-conflict operands (i.e. those  
>> that
>> -/// are non-earlyclobbered inputs to an asm that also has
>> earlyclobbers).
>> -///
>> -/// Thus there are two cases to check for:
>> -/// 1.  VReg is an earlyclobber-conflict register and HReg is an
>> earlyclobber
>> -/// register in some asm that also has VReg as an input.
>> -/// 2.  VReg is an earlyclobber register and HReg is an
>> earlyclobber-conflict
>> -/// input elsewhere in some asm.
>> -/// In both cases HReg can be assigned by the user, or assigned
>> early in
>> -/// register allocation.
>> -///
>> -/// Dropping the distinction between earlyclobber and earlyclobber-
>> conflict,
>> -/// keeping only one multimap, looks promising, but two
>> earlyclobber-conflict
>> -/// operands may be assigned the same register if they happen to
>> contain the
>> -/// same value, and that implementation would prevent this.
>> -///
>> -bool LiveIntervals::noEarlyclobberConflict(unsigned VReg,
>> VirtRegMap &vrm,
>> -                                           unsigned HReg) {
>> -  typedef std::multimap<unsigned, MachineInstr*>::iterator It;
>> -
>> -  // Short circuit the most common case.
>> -  if (AsmsWithEarlyClobberConflict.size()!=0) {
>> -    std::pair<It, It> x =
>> AsmsWithEarlyClobberConflict.equal_range(VReg);
>> -    for (It I = x.first; I!=x.second; I++) {
>> -      MachineInstr* MI = I->second;
>> -      for (int i = MI->getNumOperands() - 1; i >= 0; --i) {
>> -        MachineOperand &MO = MI->getOperand(i);
>> -        if (MO.isRegister() && MO.isEarlyClobber()) {
>> -          unsigned PhysReg = MO.getReg();
>> -          if (PhysReg &&
>> TargetRegisterInfo::isVirtualRegister(PhysReg)) {
>> -            if (!vrm.hasPhys(PhysReg))
>> -              continue;
>> -            PhysReg = vrm.getPhys(PhysReg);
>> -          }
>> -          if (PhysReg==HReg)
>> -            return false;
>> -        }
>> -      }
>> -    }
>> -  }
>> -  // Short circuit the most common case.
>> -  if (AsmsThatEarlyClobber.size()!=0) {
>> -    std::pair<It, It> x = AsmsThatEarlyClobber.equal_range(VReg);
>> -    for (It I = x.first; I!=x.second; I++) {
>> -      MachineInstr* MI = I->second;
>> -      for (int i = MI->getNumOperands() - 1; i >= 0; --i) {
>> -        MachineOperand &MO = MI->getOperand(i);
>> -        if (MO.isRegister() && MO.overlapsEarlyClobber()) {
>> -          unsigned PhysReg = MO.getReg();
>> -          if (PhysReg &&
>> TargetRegisterInfo::isVirtualRegister(PhysReg)) {
>> -            if (!vrm.hasPhys(PhysReg))
>> -              continue;
>> -            PhysReg = vrm.getPhys(PhysReg);
>> -          }
>> -          if (PhysReg==HReg)
>> -            return false;
>> -        }
>> -      }
>> -    }
>> -  }
>> -  return true;
>> -}
>> -
>> LiveInterval* LiveIntervals::createInterval(unsigned reg) {
>>  float Weight = TargetRegisterInfo::isPhysicalRegister(reg) ?
>>                       HUGE_VALF : 0.0F;
>>
>> Modified: llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp?rev=56326&r1=56325&r2=56326&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp (original)
>> +++ llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp Thu Sep 18
>> 20:02:35 2008
>> @@ -173,6 +173,8 @@
>>
>>    void ComputeRelatedRegClasses();
>>
>> +    bool noEarlyClobberConflict(LiveInterval *cur, unsigned RegNo);
>> +
>>    template <typename ItTy>
>>    void printIntervals(const char* const str, ItTy i, ItTy e) const {
>>      if (str) DOUT << str << " intervals:\n";
>> @@ -1001,6 +1003,73 @@
>>    unhandled_.push(added[i]);
>> }
>>
>> +/// noEarlyClobberConflict - see whether LiveInternal cur has a
>> conflict with
>> +/// hard reg HReg because of earlyclobbers.
>> +///
>> +/// Earlyclobber operands may not be assigned the same register as
>> +/// each other, or as earlyclobber-conflict operands (i.e. those  
>> that
>> +/// are non-earlyclobbered inputs to an asm that also has
>> earlyclobbers).
>> +///
>> +/// Thus there are two cases to check for:
>> +/// 1.  cur->reg is an earlyclobber-conflict register and HReg is an
>> +/// earlyclobber register in some asm that also has cur->reg as an
>> input.
>> +/// 2.  cur->reg is an earlyclobber register and HReg is an
>> +/// earlyclobber-conflict input, or a different earlyclobber
>> register,
>> +/// elsewhere in some asm.
>> +/// In both cases HReg can be assigned by the user, or assigned
>> early in
>> +/// register allocation.
>> +///
>> +/// Dropping the distinction between earlyclobber and earlyclobber-
>> conflict,
>> +/// keeping only one bit, looks promising, but two earlyclobber-
>> conflict
>> +/// operands may be assigned the same register if they happen to
>> contain the
>> +/// same value, and that implementation would prevent this.
>> +///
>> +bool RALinScan::noEarlyClobberConflict(LiveInterval *cur, unsigned
>> HReg) {
>> +  if (cur->overlapsEarlyClobber) {
>> +    for (MachineRegisterInfo::use_iterator I = mri_->use_begin(cur-
>>> reg),
>> +          E = mri_->use_end(); I!=E; ++I) {
>> +      MachineInstr *MI = I.getOperand().getParent();
>> +      if (MI->getOpcode()==TargetInstrInfo::INLINEASM) {
>> +        for (int i = MI->getNumOperands()-1; i>=0; --i) {
>> +          MachineOperand &MO = MI->getOperand(i);
>> +          if (MO.isRegister() && MO.getReg() && MO.isEarlyClobber()
>> &&
>> +              HReg==MO.getReg()) {
>> +            DOUT << "  earlyclobber conflict: " <<
>> +                  "%reg" << cur->reg << ", " << tri_->getName(HReg)
>> << "\n\t";
>> +            return false;
>> +          }
>> +        }
>> +      }
>> +    }
>> +  }
>> +  if (cur->isEarlyClobber) {
>> +    for (MachineRegisterInfo::def_iterator I = mri_->def_begin(cur-
>>> reg),
>> +          E = mri_->def_end(); I!=E; ++I) {
>> +      MachineInstr *MI = I.getOperand().getParent();
>> +      if (MI->getOpcode()==TargetInstrInfo::INLINEASM) {
>> +        // make sure cur->reg is really clobbered in this
>> instruction.
>> +        bool earlyClobberFound = false, overlapFound = false;
>> +        for (int i = MI->getNumOperands()-1; i>=0; --i) {
>> +          MachineOperand &MO = MI->getOperand(i);
>> +          if (MO.isRegister() && MO.getReg()) {
>> +            if ((MO.overlapsEarlyClobber() || MO.isEarlyClobber())  
>> &&
>> +                HReg==MO.getReg())
>> +              overlapFound = true;
>> +            if (MO.isEarlyClobber() && cur->reg==MO.getReg())
>> +              earlyClobberFound = true;
>> +          }
>> +        }
>> +        if (earlyClobberFound && overlapFound) {
>> +          DOUT << "  earlyclobber conflict: " <<
>> +                  "%reg" << cur->reg << ", " << tri_->getName(HReg)
>> << "\n\t";
>> +          return false;
>> +        }
>> +      }
>> +    }
>> +  }
>> +  return true;
>> +}
>> +
>> /// getFreePhysReg - return a free physical register for this
>> virtual register
>> /// interval if we have one, otherwise return 0.
>> unsigned RALinScan::getFreePhysReg(LiveInterval *cur) {
>> @@ -1049,7 +1118,7 @@
>>  assert(I != E && "No allocatable register in this register class!");
>>  for (; I != E; ++I)
>>    if (prt_->isRegAvail(*I) &&
>> -        li_->noEarlyclobberConflict(cur->reg, *vrm_, *I)) {
>> +        noEarlyClobberConflict(cur, *I)) {
>>      FreeReg = *I;
>>      if (FreeReg < inactiveCounts.size())
>>        FreeRegInactiveCount = inactiveCounts[FreeReg];
>> @@ -1070,7 +1139,7 @@
>>    unsigned Reg = *I;
>>    if (prt_->isRegAvail(Reg) && Reg < inactiveCounts.size() &&
>>        FreeRegInactiveCount < inactiveCounts[Reg] &&
>> -        li_->noEarlyclobberConflict(cur->reg, *vrm_, Reg)) {
>> +        noEarlyClobberConflict(cur, *I)) {
>>      FreeReg = Reg;
>>      FreeRegInactiveCount = inactiveCounts[Reg];
>>      if (FreeRegInactiveCount == MaxInactiveCount)
>>
>>
>> _______________________________________________
>> 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 dpatel at apple.com  Tue Sep 23 18:16:51 2008
From: dpatel at apple.com (Devang Patel)
Date: Tue, 23 Sep 2008 16:16:51 -0700
Subject: [llvm-commits] [llvm-gcc-4.2] r56512 -
	in	/llvm-gcc-4.2/trunk/gcc: llvm-backend.cpp llvm-convert.cpp
In-Reply-To: <B9C0D4AB-8F58-4ACC-B541-BAA0A3514A11@apple.com>
References: <200809232253.m8NMrQ3w031553@zion.cs.uiuc.edu>
	<B9C0D4AB-8F58-4ACC-B541-BAA0A3514A11@apple.com>
Message-ID: <DC418AED-C02E-4A39-B633-62B54459AAB2@apple.com>


On Sep 23, 2008, at 4:07 PM, Chris Lattner wrote:

> On Sep 23, 2008, at 3:53 PM, Devang Patel wrote:
>> URL: http://llvm.org/viewvc/llvm-project?rev=56512&view=rev
>> Log:
>> Notes are implemented as an attribute at index ~0
>
> Ok
>
>>
>>  for (Module::iterator I = TheModule->begin(), E = TheModule->end();
>>       I != E; ++I)
>> -    if (I->hasNote(FN_NOTE_AlwaysInline)) {
>> +    if (I->hasNote(ParamAttr::FN_NOTE_AlwaysInline)) {
>
> Is there a reason to keep the FN_NOTE prefix?

hmm.. now it does not add much value. I'll remove these prefixes.
-
Devang


From dpatel at apple.com  Tue Sep 23 18:18:26 2008
From: dpatel at apple.com (Devang Patel)
Date: Tue, 23 Sep 2008 23:18:26 -0000
Subject: [llvm-commits] [llvm] r56515 - /llvm/trunk/include/llvm/Function.h
Message-ID: <200809232318.m8NNIQD9032306@zion.cs.uiuc.edu>

Author: dpatel
Date: Tue Sep 23 18:18:26 2008
New Revision: 56515

URL: http://llvm.org/viewvc/llvm-project?rev=56515&view=rev
Log:
Remove tabs.

Modified:
    llvm/trunk/include/llvm/Function.h

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

==============================================================================
--- llvm/trunk/include/llvm/Function.h (original)
+++ llvm/trunk/include/llvm/Function.h Tue Sep 23 18:18:26 2008
@@ -151,15 +151,15 @@
 
   /// hasNote - Return true if this function has given note.
   bool hasNote(Attributes N) const {
-  	// Notes are stored at ~0 index in parameter attribute list
+    // Notes are stored at ~0 index in parameter attribute list
     return (!isDeclaration() && paramHasAttr(~0, N));
   }
 
   /// setNotes - Set notes for this function
   ///
   void setNotes(const Attributes N) { 
-  	// Notes are stored at ~0 index in parameter attribute list
-  	addParamAttr(~0, N);
+    // Notes are stored at ~0 index in parameter attribute list
+    addParamAttr(~0, N);
   }
 
   /// hasGC/getGC/setGC/clearGC - The name of the garbage collection algorithm




From evan.cheng at apple.com  Tue Sep 23 18:21:02 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Tue, 23 Sep 2008 16:21:02 -0700
Subject: [llvm-commits] [llvm] r56513 - in /llvm/trunk: include/llvm/
	include/llvm/Support/ lib/Analysis/ lib/AsmParser/
	lib/Bitcode/Reader/ lib/Bitcode/Writer/
	lib/CodeGen/SelectionDAG/ lib/ExecutionEngine/Interpreter/
	lib/Target/CppBackend/ lib/Target/MSIL/ lib/Target/PowerPC/
	lib/Transforms/IPO/ lib/Transforms/Scalar/
	lib/Transforms/Utils/ lib/VMCore/
In-Reply-To: <200809232303.m8NN3gWx031869@zion.cs.uiuc.edu>
References: <200809232303.m8NN3gWx031869@zion.cs.uiuc.edu>
Message-ID: <85C7A0D6-4699-4F31-987B-942EC5D68776@apple.com>

Hi Devang,

This seems to be breaking the build:

llvm[2]: Building Release Archive Library libLLVMArchive.a
/Users/echeng/LLVM/llvm/lib/AsmParser/llvmAsmParser.y:997: error:  
?ParameterAttributes? in namespace ?llvm? does not name a type
/Users/echeng/LLVM/llvm/lib/AsmParser/llvmAsmParser.y:998: error:  
?ParameterAttributes? in namespace ?llvm? does not name a type
llvm[2]: Compiling AliasAnalysisEvaluator.cpp for Release build
/Users/echeng/LLVM/llvm/lib/AsmParser/llvmAsmParser.y: In function  
?int llvmAsmparse()?:
/Users/echeng/LLVM/llvm/lib/AsmParser/llvmAsmParser.y:1264: error:  
?union YYSTYPE? has no member named ?ParamAttrs?
/Users/echeng/LLVM/llvm/lib/AsmParser/llvmAsmParser.y:1265: error:  
?union YYSTYPE? has no member named ?ParamAttrs?

Can you check?

Thanks,

Evan

On Sep 23, 2008, at 4:03 PM, Devang Patel wrote:

> Author: dpatel
> Date: Tue Sep 23 18:03:40 2008
> New Revision: 56513
>
> URL: http://llvm.org/viewvc/llvm-project?rev=56513&view=rev
> Log:
> s/ParameterAttributes/Attributes/g
>
>
> Added:
>    llvm/trunk/include/llvm/Attributes.h
>      - copied, changed from r56511, llvm/trunk/include/llvm/ 
> ParameterAttributes.h
>    llvm/trunk/lib/VMCore/Attributes.cpp
>      - copied, changed from r56511, llvm/trunk/lib/VMCore/ 
> ParameterAttributes.cpp
> Removed:
>    llvm/trunk/include/llvm/ParameterAttributes.h
>    llvm/trunk/lib/VMCore/ParameterAttributes.cpp
> Modified:
>    llvm/trunk/include/llvm/Argument.h
>    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/ParserInternals.h
>    llvm/trunk/lib/Bitcode/Reader/BitcodeReader.h
>    llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.h
>    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
>    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
>    llvm/trunk/lib/ExecutionEngine/Interpreter/Execution.cpp
>    llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp
>    llvm/trunk/lib/Target/MSIL/MSILWriter.cpp
>    llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp
>    llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp
>    llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp
>    llvm/trunk/lib/Transforms/IPO/PruneEH.cpp
>    llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp
>    llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp
>    llvm/trunk/lib/Transforms/Scalar/MemCpyOptimizer.cpp
>    llvm/trunk/lib/Transforms/Scalar/SimplifyCFGPass.cpp
>    llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp
>    llvm/trunk/lib/VMCore/AsmWriter.cpp
>    llvm/trunk/lib/VMCore/Function.cpp
>    llvm/trunk/lib/VMCore/Instructions.cpp
>    llvm/trunk/lib/VMCore/Verifier.cpp
>
> Modified: llvm/trunk/include/llvm/Argument.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Argument.h?rev=56513&r1=56512&r2=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/include/llvm/Argument.h (original)
> +++ llvm/trunk/include/llvm/Argument.h Tue Sep 23 18:03:40 2008
> @@ -15,7 +15,7 @@
> #define LLVM_ARGUMENT_H
>
> #include "llvm/Value.h"
> -#include "llvm/ParameterAttributes.h"
> +#include "llvm/Attributes.h"
> #include "llvm/ADT/ilist_node.h"
>
> namespace llvm {
> @@ -61,10 +61,10 @@
>   bool hasStructRetAttr() const;
>
>   /// addAttr - Add a ParamAttr to an argument
> -  void addAttr(ParameterAttributes);
> +  void addAttr(Attributes);
>
>   /// removeAttr - Remove a ParamAttr from an argument
> -  void removeAttr(ParameterAttributes);
> +  void removeAttr(Attributes);
>
>   /// classof - Methods for support type inquiry through isa, cast,  
> and
>   /// dyn_cast:
>
> Copied: llvm/trunk/include/llvm/Attributes.h (from r56511, llvm/ 
> trunk/include/llvm/ParameterAttributes.h)
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Attributes.h?p2=llvm/trunk/include/llvm/Attributes.h&p1=llvm/trunk/include/llvm/ParameterAttributes.h&r1=56511&r2=56513&rev=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/include/llvm/ParameterAttributes.h (original)
> +++ llvm/trunk/include/llvm/Attributes.h Tue Sep 23 18:03:40 2008
> @@ -1,4 +1,4 @@
> -//===-- llvm/ParameterAttributes.h - Container for ParamAttrs ---*-  
> C++ -*-===//
> +//===-- llvm/Attributes.h - Container for ParamAttrs ---*- C++ -*- 
> ===//
> //
> //                     The LLVM Compiler Infrastructure
> //
> @@ -20,8 +20,8 @@
> namespace llvm {
> class Type;
>
> -/// ParameterAttributes - A bitset of attributes for a parameter.
> -typedef unsigned ParameterAttributes;
> +/// Attributes - A bitset of attributes for a parameter.
> +typedef unsigned Attributes;
>
> namespace ParamAttr {
>
> @@ -30,7 +30,6 @@
> /// lists the attributes that can be associated with parameters or  
> function
> /// results.
> /// @brief Function parameter attributes.
> -typedef ParameterAttributes Attributes;
>
> const Attributes None      = 0;     ///< No attributes have been set
> const Attributes ZExt      = 1<<0;  ///< Zero extended before/after  
> call
> @@ -74,26 +73,26 @@
> Attributes typeIncompatible(const Type *Ty);
>
> /// This turns an int alignment (a power of 2, normally) into the
> -/// form used internally in ParameterAttributes.
> -inline ParamAttr::Attributes constructAlignmentFromInt(unsigned i) {
> +/// form used internally in Attributes.
> +inline Attributes constructAlignmentFromInt(unsigned i) {
>   return (i << 16);
> }
>
> -/// The set of ParameterAttributes set in Attributes is converted  
> to a
> +/// The set of Attributes set in Attributes is converted to a
> /// string of equivalent mnemonics. This is, presumably, for writing  
> out
> /// the mnemonics for the assembly writer.
> /// @brief Convert parameter attribute bits to text
> -std::string getAsString(ParameterAttributes Attrs);
> +std::string getAsString(Attributes Attrs);
> } // end namespace ParamAttr
>
>
> /// This is just a pair of values to associate a set of parameter  
> attributes
> /// with a parameter index.
> struct ParamAttrsWithIndex {
> -  ParameterAttributes Attrs; ///< The attributes that are set, or'd  
> together.
> +  Attributes Attrs; ///< The attributes that are set, or'd together.
>   unsigned Index; ///< Index of the parameter for which the  
> attributes apply.
>
> -  static ParamAttrsWithIndex get(unsigned Idx, ParameterAttributes  
> Attrs) {
> +  static ParamAttrsWithIndex get(unsigned Idx, Attributes Attrs) {
>     ParamAttrsWithIndex P;
>     P.Index = Idx;
>     P.Attrs = Attrs;
> @@ -137,12 +136,12 @@
>   /// addAttr - Add the specified attribute at the specified index  
> to this
>   /// attribute list.  Since parameter attribute lists are  
> immutable, this
>   /// returns the new list.
> -  PAListPtr addAttr(unsigned Idx, ParameterAttributes Attrs) const;
> +  PAListPtr addAttr(unsigned Idx, Attributes Attrs) const;
>
>   /// removeAttr - Remove the specified attribute at the specified  
> index from
>   /// this attribute list.  Since parameter attribute lists are  
> immutable, this
>   /// returns the new list.
> -  PAListPtr removeAttr(unsigned Idx, ParameterAttributes Attrs)  
> const;
> +  PAListPtr removeAttr(unsigned Idx, Attributes Attrs) const;
>
>   // 
> = 
> = 
> =-------------------------------------------------------------------- 
> ===//
>   // Parameter Attribute List Accessors
> @@ -150,11 +149,11 @@
>
>   /// getParamAttrs - The parameter attributes for the specified  
> parameter are
>   /// returned.  Parameters for the result are denoted with Idx = 0.
> -  ParameterAttributes getParamAttrs(unsigned Idx) const;
> +  Attributes getParamAttrs(unsigned Idx) const;
>
>   /// paramHasAttr - Return true if the specified parameter index  
> has the
>   /// specified attribute set.
> -  bool paramHasAttr(unsigned Idx, ParameterAttributes Attr) const {
> +  bool paramHasAttr(unsigned Idx, Attributes Attr) const {
>     return getParamAttrs(Idx) & Attr;
>   }
>
> @@ -166,7 +165,7 @@
>
>   /// hasAttrSomewhere - Return true if the specified attribute is  
> set for at
>   /// least one parameter or for the return value.
> -  bool hasAttrSomewhere(ParameterAttributes Attr) const;
> +  bool hasAttrSomewhere(Attributes Attr) const;
>
>   /// operator==/!= - Provide equality predicates.
>   bool operator==(const PAListPtr &RHS) const { return PAList ==  
> RHS.PAList; }
>
> Modified: llvm/trunk/include/llvm/Function.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Function.h?rev=56513&r1=56512&r2=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/include/llvm/Function.h (original)
> +++ llvm/trunk/include/llvm/Function.h Tue Sep 23 18:03:40 2008
> @@ -22,7 +22,7 @@
> #include "llvm/BasicBlock.h"
> #include "llvm/Argument.h"
> #include "llvm/Support/Annotation.h"
> -#include "llvm/ParameterAttributes.h"
> +#include "llvm/Attributes.h"
>
> namespace llvm {
>
> @@ -150,14 +150,14 @@
>
>
>   /// hasNote - Return true if this function has given note.
> -  bool hasNote(ParameterAttributes N) const {
> +  bool hasNote(Attributes N) const {
>   	// Notes are stored at ~0 index in parameter attribute list
>     return (!isDeclaration() && paramHasAttr(~0, N));
>   }
>
>   /// setNotes - Set notes for this function
>   ///
> -  void setNotes(const ParameterAttributes N) {
> +  void setNotes(const Attributes N) {
>   	// Notes are stored at ~0 index in parameter attribute list
>   	addParamAttr(~0, N);
>   }
> @@ -170,15 +170,15 @@
>   void clearGC();
>
>   /// @brief Determine whether the function has the given attribute.
> -  bool paramHasAttr(unsigned i, ParameterAttributes attr) const {
> +  bool paramHasAttr(unsigned i, Attributes attr) const {
>     return ParamAttrs.paramHasAttr(i, attr);
>   }
>
>   /// addParamAttr - adds the attribute to the list of attributes.
> -  void addParamAttr(unsigned i, ParameterAttributes attr);
> +  void addParamAttr(unsigned i, Attributes attr);
>
>   /// removeParamAttr - removes the attribute from the list of  
> attributes.
> -  void removeParamAttr(unsigned i, ParameterAttributes attr);
> +  void removeParamAttr(unsigned i, Attributes attr);
>
>   /// @brief Extract the alignment for a call or parameter  
> (0=unknown).
>   unsigned getParamAlignment(unsigned i) const {
>
> Modified: llvm/trunk/include/llvm/Instructions.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Instructions.h?rev=56513&r1=56512&r2=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/include/llvm/Instructions.h (original)
> +++ llvm/trunk/include/llvm/Instructions.h Tue Sep 23 18:03:40 2008
> @@ -20,7 +20,7 @@
>
> #include "llvm/InstrTypes.h"
> #include "llvm/DerivedTypes.h"
> -#include "llvm/ParameterAttributes.h"
> +#include "llvm/Attributes.h"
> #include "llvm/BasicBlock.h"
> #include "llvm/ADT/SmallVector.h"
>
> @@ -1081,10 +1081,10 @@
>   void setParamAttrs(const PAListPtr &Attrs) { ParamAttrs = Attrs; }
>
>   /// addParamAttr - adds the attribute to the list of attributes.
> -  void addParamAttr(unsigned i, ParameterAttributes attr);
> +  void addParamAttr(unsigned i, Attributes attr);
>
>   /// removeParamAttr - removes the attribute from the list of  
> attributes.
> -  void removeParamAttr(unsigned i, ParameterAttributes attr);
> +  void removeParamAttr(unsigned i, Attributes attr);
>
>   /// @brief Determine whether the call or the callee has the given  
> attribute.
>   bool paramHasAttr(unsigned i, unsigned attr) const;
> @@ -2440,13 +2440,13 @@
>   void setParamAttrs(const PAListPtr &Attrs) { ParamAttrs = Attrs; }
>
>   /// @brief Determine whether the call or the callee has the given  
> attribute.
> -  bool paramHasAttr(unsigned i, ParameterAttributes attr) const;
> +  bool paramHasAttr(unsigned i, Attributes attr) const;
>
>   /// addParamAttr - adds the attribute to the list of attributes.
> -  void addParamAttr(unsigned i, ParameterAttributes attr);
> +  void addParamAttr(unsigned i, Attributes attr);
>
>   /// removeParamAttr - removes the attribute from the list of  
> attributes.
> -  void removeParamAttr(unsigned i, ParameterAttributes attr);
> +  void removeParamAttr(unsigned i, Attributes attr);
>
>   /// @brief Extract the alignment for a call or parameter  
> (0=unknown).
>   unsigned getParamAlignment(unsigned i) const {
>
> Removed: llvm/trunk/include/llvm/ParameterAttributes.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ParameterAttributes.h?rev=56512&view=auto
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/include/llvm/ParameterAttributes.h (original)
> +++ llvm/trunk/include/llvm/ParameterAttributes.h (removed)
> @@ -1,212 +0,0 @@
> -//===-- llvm/ParameterAttributes.h - Container for ParamAttrs ---*-  
> C++ -*-===//
> -//
> -//                     The LLVM Compiler Infrastructure
> -//
> -// This file is distributed under the University of Illinois Open  
> Source
> -// License. See LICENSE.TXT for details.
> -//
> -// 
> = 
> = 
> = 
> ----------------------------------------------------------------------= 
> ==//
> -//
> -// This file contains the simple types necessary to represent the  
> parameter
> -// attributes associated with functions and their calls.
> -//
> -// 
> = 
> = 
> = 
> ----------------------------------------------------------------------= 
> ==//
> -
> -#ifndef LLVM_PARAMETER_ATTRIBUTES_H
> -#define LLVM_PARAMETER_ATTRIBUTES_H
> -
> -#include <string>
> -
> -namespace llvm {
> -class Type;
> -
> -/// ParameterAttributes - A bitset of attributes for a parameter.
> -typedef unsigned ParameterAttributes;
> -
> -namespace ParamAttr {
> -
> -/// Function parameters and results can have attributes to indicate  
> how they
> -/// should be treated by optimizations and code generation. This  
> enumeration
> -/// lists the attributes that can be associated with parameters or  
> function
> -/// results.
> -/// @brief Function parameter attributes.
> -typedef ParameterAttributes Attributes;
> -
> -const Attributes None      = 0;     ///< No attributes have been set
> -const Attributes ZExt      = 1<<0;  ///< Zero extended before/after  
> call
> -const Attributes SExt      = 1<<1;  ///< Sign extended before/after  
> call
> -const Attributes NoReturn  = 1<<2;  ///< Mark the function as not  
> returning
> -const Attributes InReg     = 1<<3;  ///< Force argument to be  
> passed in register
> -const Attributes StructRet = 1<<4;  ///< Hidden pointer to  
> structure to return
> -const Attributes NoUnwind  = 1<<5;  ///< Function doesn't unwind  
> stack
> -const Attributes NoAlias   = 1<<6;  ///< Considered to not alias  
> after call
> -const Attributes ByVal     = 1<<7;  ///< Pass structure by value
> -const Attributes Nest      = 1<<8;  ///< Nested function static chain
> -const Attributes ReadNone  = 1<<9;  ///< Function does not access  
> memory
> -const Attributes ReadOnly  = 1<<10; ///< Function only reads from  
> memory
> -const Attributes Alignment = 0xffff<<16; ///< Alignment of  
> parameter (16 bits)
> -                                    // 0 = unknown, else in clear  
> (not log)
> -
> -/// Function notes are implemented as attributes stored at index ~0  
> in
> -/// parameter attribute list.
> -const Attributes FN_NOTE_None            = 0;
> -const Attributes FN_NOTE_NoInline        = 1<<0; // inline=never
> -const Attributes FN_NOTE_AlwaysInline    = 1<<1; // inline=always
> -const Attributes FN_NOTE_OptimizeForSize = 1<<2; // opt_size
> -
> -/// @brief Attributes that only apply to function parameters.
> -const Attributes ParameterOnly = ByVal | Nest | StructRet;
> -
> -/// @brief Attributes that only apply to function return values.
> -const Attributes ReturnOnly = NoReturn | NoUnwind | ReadNone |  
> ReadOnly;
> -
> -/// @brief Parameter attributes that do not apply to vararg call  
> arguments.
> -const Attributes VarArgsIncompatible = StructRet;
> -
> -/// @brief Attributes that are mutually incompatible.
> -const Attributes MutuallyIncompatible[3] = {
> -  ByVal | InReg | Nest  | StructRet,
> -  ZExt  | SExt,
> -  ReadNone | ReadOnly
> -};
> -
> -/// @brief Which attributes cannot be applied to a type.
> -Attributes typeIncompatible(const Type *Ty);
> -
> -/// This turns an int alignment (a power of 2, normally) into the
> -/// form used internally in ParameterAttributes.
> -inline ParamAttr::Attributes constructAlignmentFromInt(unsigned i) {
> -  return (i << 16);
> -}
> -
> -/// The set of ParameterAttributes set in Attributes is converted  
> to a
> -/// string of equivalent mnemonics. This is, presumably, for  
> writing out
> -/// the mnemonics for the assembly writer.
> -/// @brief Convert parameter attribute bits to text
> -std::string getAsString(ParameterAttributes Attrs);
> -} // end namespace ParamAttr
> -
> -
> -/// This is just a pair of values to associate a set of parameter  
> attributes
> -/// with a parameter index.
> -struct ParamAttrsWithIndex {
> -  ParameterAttributes Attrs; ///< The attributes that are set, or'd  
> together.
> -  unsigned Index; ///< Index of the parameter for which the  
> attributes apply.
> -
> -  static ParamAttrsWithIndex get(unsigned Idx, ParameterAttributes  
> Attrs) {
> -    ParamAttrsWithIndex P;
> -    P.Index = Idx;
> -    P.Attrs = Attrs;
> -    return P;
> -  }
> -};
> -
> -// 
> = 
> = 
> = 
> ----------------------------------------------------------------------= 
> ==//
> -// PAListPtr Smart Pointer
> -// 
> = 
> = 
> = 
> ----------------------------------------------------------------------= 
> ==//
> -
> -class ParamAttributeListImpl;
> -
> -/// PAListPtr - This class manages the ref count for the opaque
> -/// ParamAttributeListImpl object and provides accessors for it.
> -class PAListPtr {
> -  /// PAList - The parameter attributes that we are managing.  This  
> can be null
> -  /// to represent the empty parameter attributes list.
> -  ParamAttributeListImpl *PAList;
> -public:
> -  PAListPtr() : PAList(0) {}
> -  PAListPtr(const PAListPtr &P);
> -  const PAListPtr &operator=(const PAListPtr &RHS);
> -  ~PAListPtr();
> -
> -  // 
> = 
> = 
> =-------------------------------------------------------------------- 
> ===//
> -  // Parameter Attribute List Construction and Mutation
> -  // 
> = 
> = 
> =-------------------------------------------------------------------- 
> ===//
> -
> -  /// get - Return a ParamAttrs list with the specified parameter  
> in it.
> -  static PAListPtr get(const ParamAttrsWithIndex *Attr, unsigned  
> NumAttrs);
> -
> -  /// get - Return a ParamAttr list with the parameters specified  
> by the
> -  /// consecutive random access iterator range.
> -  template <typename Iter>
> -  static PAListPtr get(const Iter &I, const Iter &E) {
> -    if (I == E) return PAListPtr();  // Empty list.
> -    return get(&*I, static_cast<unsigned>(E-I));
> -  }
> -
> -  /// addAttr - Add the specified attribute at the specified index  
> to this
> -  /// attribute list.  Since parameter attribute lists are  
> immutable, this
> -  /// returns the new list.
> -  PAListPtr addAttr(unsigned Idx, ParameterAttributes Attrs) const;
> -
> -  /// removeAttr - Remove the specified attribute at the specified  
> index from
> -  /// this attribute list.  Since parameter attribute lists are  
> immutable, this
> -  /// returns the new list.
> -  PAListPtr removeAttr(unsigned Idx, ParameterAttributes Attrs)  
> const;
> -
> -  // 
> = 
> = 
> =-------------------------------------------------------------------- 
> ===//
> -  // Parameter Attribute List Accessors
> -  // 
> = 
> = 
> =-------------------------------------------------------------------- 
> ===//
> -
> -  /// getParamAttrs - The parameter attributes for the specified  
> parameter are
> -  /// returned.  Parameters for the result are denoted with Idx = 0.
> -  ParameterAttributes getParamAttrs(unsigned Idx) const;
> -
> -  /// paramHasAttr - Return true if the specified parameter index  
> has the
> -  /// specified attribute set.
> -  bool paramHasAttr(unsigned Idx, ParameterAttributes Attr) const {
> -    return getParamAttrs(Idx) & Attr;
> -  }
> -
> -  /// getParamAlignment - Return the alignment for the specified  
> function
> -  /// parameter.
> -  unsigned getParamAlignment(unsigned Idx) const {
> -    return (getParamAttrs(Idx) & ParamAttr::Alignment) >> 16;
> -  }
> -
> -  /// hasAttrSomewhere - Return true if the specified attribute is  
> set for at
> -  /// least one parameter or for the return value.
> -  bool hasAttrSomewhere(ParameterAttributes Attr) const;
> -
> -  /// operator==/!= - Provide equality predicates.
> -  bool operator==(const PAListPtr &RHS) const { return PAList ==  
> RHS.PAList; }
> -  bool operator!=(const PAListPtr &RHS) const { return PAList !=  
> RHS.PAList; }
> -
> -  void dump() const;
> -
> -  // 
> = 
> = 
> =-------------------------------------------------------------------- 
> ===//
> -  // Parameter Attribute List Introspection
> -  // 
> = 
> = 
> =-------------------------------------------------------------------- 
> ===//
> -
> -  /// getRawPointer - Return a raw pointer that uniquely identifies  
> this
> -  /// parameter attribute list.
> -  void *getRawPointer() const {
> -    return PAList;
> -  }
> -
> -  // Parameter attributes are stored as a dense set of slots, where  
> there is one
> -  // slot for each argument that has an attribute.  This allows  
> walking over the
> -  // dense set instead of walking the sparse list of attributes.
> -
> -  /// isEmpty - Return true if no parameters have an attribute.
> -  ///
> -  bool isEmpty() const {
> -    return PAList == 0;
> -  }
> -
> -  /// getNumSlots - Return the number of slots used in this  
> attribute list.
> -  /// This is the number of arguments that have an attribute set on  
> them
> -  /// (including the function itself).
> -  unsigned getNumSlots() const;
> -
> -  /// getSlot - Return the ParamAttrsWithIndex at the specified  
> slot.  This
> -  /// holds a parameter number plus a set of attributes.
> -  const ParamAttrsWithIndex &getSlot(unsigned Slot) const;
> -
> -private:
> -  explicit PAListPtr(ParamAttributeListImpl *L);
> -};
> -
> -} // End llvm namespace
> -
> -#endif
>
> Modified: llvm/trunk/include/llvm/Support/CallSite.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/CallSite.h?rev=56513&r1=56512&r2=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/include/llvm/Support/CallSite.h (original)
> +++ llvm/trunk/include/llvm/Support/CallSite.h Tue Sep 23 18:03:40  
> 2008
> @@ -22,7 +22,7 @@
>
> #include "llvm/Instruction.h"
> #include "llvm/BasicBlock.h"
> -#include "llvm/ParameterAttributes.h"
> +#include "llvm/Attributes.h"
>
> namespace llvm {
>
> @@ -68,7 +68,7 @@
>   void setParamAttrs(const PAListPtr &PAL);
>
>   /// paramHasAttr - whether the call or the callee has the given  
> attribute.
> -  bool paramHasAttr(uint16_t i, ParameterAttributes attr) const;
> +  bool paramHasAttr(uint16_t i, Attributes attr) const;
>
>   /// @brief Extract the alignment for a call or parameter  
> (0=unknown).
>   uint16_t getParamAlignment(uint16_t i) const;
>
> Modified: llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp?rev=56513&r1=56512&r2=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp (original)
> +++ llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp Tue Sep 23  
> 18:03:40 2008
> @@ -18,7 +18,6 @@
> #include "llvm/Constants.h"
> #include "llvm/DerivedTypes.h"
> #include "llvm/Function.h"
> -#include "llvm/ParameterAttributes.h"
> #include "llvm/GlobalVariable.h"
> #include "llvm/Instructions.h"
> #include "llvm/IntrinsicInst.h"
>
> Modified: llvm/trunk/lib/AsmParser/ParserInternals.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/ParserInternals.h?rev=56513&r1=56512&r2=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/AsmParser/ParserInternals.h (original)
> +++ llvm/trunk/lib/AsmParser/ParserInternals.h Tue Sep 23 18:03:40  
> 2008
> @@ -17,7 +17,7 @@
>
> #include "llvm/Constants.h"
> #include "llvm/DerivedTypes.h"
> -#include "llvm/ParameterAttributes.h"
> +#include "llvm/Attributes.h"
> #include "llvm/Function.h"
> #include "llvm/Instructions.h"
> #include "llvm/Assembly/Parser.h"
> @@ -232,13 +232,13 @@
>
> struct TypeWithAttrs {
>   llvm::PATypeHolder *Ty;
> -  ParameterAttributes Attrs;
> +  Attributes Attrs;
> };
>
> typedef std::vector<TypeWithAttrs> TypeWithAttrsList;
>
> struct ArgListEntry {
> -  ParameterAttributes Attrs;
> +  Attributes Attrs;
>   llvm::PATypeHolder *Ty;
>   std::string *Name;
> };
> @@ -247,7 +247,7 @@
>
> struct ParamListEntry {
>   Value *Val;
> -  ParameterAttributes Attrs;
> +  Attributes Attrs;
> };
>
> typedef std::vector<ParamListEntry> ParamList;
>
> Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.h?rev=56513&r1=56512&r2=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.h (original)
> +++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.h Tue Sep 23  
> 18:03:40 2008
> @@ -15,7 +15,7 @@
> #define BITCODE_READER_H
>
> #include "llvm/ModuleProvider.h"
> -#include "llvm/ParameterAttributes.h"
> +#include "llvm/Attributes.h"
> #include "llvm/Type.h"
> #include "llvm/OperandTraits.h"
> #include "llvm/Bitcode/BitstreamReader.h"
>
> Modified: llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.h?rev=56513&r1=56512&r2=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.h (original)
> +++ llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.h Tue Sep 23  
> 18:03:40 2008
> @@ -15,7 +15,7 @@
> #define VALUE_ENUMERATOR_H
>
> #include "llvm/ADT/DenseMap.h"
> -#include "llvm/ParameterAttributes.h"
> +#include "llvm/Attributes.h"
> #include <vector>
>
> namespace llvm {
>
> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp?rev=56513&r1=56512&r2=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp  
> (original)
> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Tue  
> Sep 23 18:03:40 2008
> @@ -25,7 +25,6 @@
> #include "llvm/Instructions.h"
> #include "llvm/Intrinsics.h"
> #include "llvm/IntrinsicInst.h"
> -#include "llvm/ParameterAttributes.h"
> #include "llvm/CodeGen/FastISel.h"
> #include "llvm/CodeGen/GCStrategy.h"
> #include "llvm/CodeGen/GCMetadata.h"
>
> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp?rev=56513&r1=56512&r2=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp  
> (original)
> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Tue Sep  
> 23 18:03:40 2008
> @@ -25,7 +25,6 @@
> #include "llvm/Instructions.h"
> #include "llvm/Intrinsics.h"
> #include "llvm/IntrinsicInst.h"
> -#include "llvm/ParameterAttributes.h"
> #include "llvm/CodeGen/FastISel.h"
> #include "llvm/CodeGen/GCStrategy.h"
> #include "llvm/CodeGen/GCMetadata.h"
>
> Modified: llvm/trunk/lib/ExecutionEngine/Interpreter/Execution.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Interpreter/Execution.cpp?rev=56513&r1=56512&r2=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/ExecutionEngine/Interpreter/Execution.cpp  
> (original)
> +++ llvm/trunk/lib/ExecutionEngine/Interpreter/Execution.cpp Tue Sep  
> 23 18:03:40 2008
> @@ -16,7 +16,6 @@
> #include "llvm/Constants.h"
> #include "llvm/DerivedTypes.h"
> #include "llvm/Instructions.h"
> -#include "llvm/ParameterAttributes.h"
> #include "llvm/CodeGen/IntrinsicLowering.h"
> #include "llvm/Support/GetElementPtrTypeIterator.h"
> #include "llvm/ADT/APInt.h"
>
> Modified: llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp?rev=56513&r1=56512&r2=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp (original)
> +++ llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp Tue Sep 23  
> 18:03:40 2008
> @@ -438,7 +438,7 @@
>       Out << "ParamAttrsWithIndex PAWI;"; nl(Out);
>       for (unsigned i = 0; i < PAL.getNumSlots(); ++i) {
>         uint16_t index = PAL.getSlot(i).Index;
> -        ParameterAttributes attrs = PAL.getSlot(i).Attrs;
> +        Attributes attrs = PAL.getSlot(i).Attrs;
>         Out << "PAWI.Index = " << index << "; PAWI.Attrs = 0 ";
>         if (attrs & ParamAttr::SExt)
>           Out << " | ParamAttr::SExt";
>
> Modified: llvm/trunk/lib/Target/MSIL/MSILWriter.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/MSIL/MSILWriter.cpp?rev=56513&r1=56512&r2=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Target/MSIL/MSILWriter.cpp (original)
> +++ llvm/trunk/lib/Target/MSIL/MSILWriter.cpp Tue Sep 23 18:03:40 2008
> @@ -16,7 +16,6 @@
> #include "llvm/DerivedTypes.h"
> #include "llvm/Intrinsics.h"
> #include "llvm/IntrinsicInst.h"
> -#include "llvm/ParameterAttributes.h"
> #include "llvm/TypeSymbolTable.h"
> #include "llvm/Analysis/ConstantsScanner.h"
> #include "llvm/Support/CallSite.h"
>
> Modified: llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp?rev=56513&r1=56512&r2=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp (original)
> +++ llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp Tue Sep 23  
> 18:03:40 2008
> @@ -29,7 +29,6 @@
> #include "llvm/Constants.h"
> #include "llvm/Function.h"
> #include "llvm/Intrinsics.h"
> -#include "llvm/ParameterAttributes.h"
> #include "llvm/Support/MathExtras.h"
> #include "llvm/Target/TargetOptions.h"
> #include "llvm/Support/CommandLine.h"
>
> Modified: llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp?rev=56513&r1=56512&r2=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp (original)
> +++ llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp Tue Sep 23  
> 18:03:40 2008
> @@ -508,7 +508,7 @@
>   const PAListPtr &PAL = F->getParamAttrs();
>
>   // Add any return attributes.
> -  if (ParameterAttributes attrs = PAL.getParamAttrs(0))
> +  if (Attributes attrs = PAL.getParamAttrs(0))
>     ParamAttrsVec.push_back(ParamAttrsWithIndex::get(0, attrs));
>
>   // First, determine the new argument list
> @@ -525,7 +525,7 @@
>     } else if (!ArgsToPromote.count(I)) {
>       // Unchanged argument
>       Params.push_back(I->getType());
> -      if (ParameterAttributes attrs = PAL.getParamAttrs(ArgIndex))
> +      if (Attributes attrs = PAL.getParamAttrs(ArgIndex))
>          
> ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Params.size(),  
> attrs));
>     } else if (I->use_empty()) {
>       // Dead argument (which are always marked as promotable)
> @@ -621,7 +621,7 @@
>     const PAListPtr &CallPAL = CS.getParamAttrs();
>
>     // Add any return attributes.
> -    if (ParameterAttributes attrs = CallPAL.getParamAttrs(0))
> +    if (Attributes attrs = CallPAL.getParamAttrs(0))
>       ParamAttrsVec.push_back(ParamAttrsWithIndex::get(0, attrs));
>
>     // Loop over the operands, inserting GEP and loads in the caller  
> as
> @@ -633,7 +633,7 @@
>       if (!ArgsToPromote.count(I) && !ByValArgsToTransform.count(I)) {
>         Args.push_back(*AI);          // Unmodified argument
>
> -        if (ParameterAttributes Attrs =  
> CallPAL.getParamAttrs(ArgIndex))
> +        if (Attributes Attrs = CallPAL.getParamAttrs(ArgIndex))
>            
> ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Args.size(), Attrs));
>
>       } else if (ByValArgsToTransform.count(I)) {
> @@ -688,7 +688,7 @@
>     // Push any varargs arguments on the list
>     for (; AI != CS.arg_end(); ++AI, ++ArgIndex) {
>       Args.push_back(*AI);
> -      if (ParameterAttributes Attrs =  
> CallPAL.getParamAttrs(ArgIndex))
> +      if (Attributes Attrs = CallPAL.getParamAttrs(ArgIndex))
>          
> ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Args.size(), Attrs));
>     }
>
>
> Modified: llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp?rev=56513&r1=56512&r2=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp  
> (original)
> +++ llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp Tue  
> Sep 23 18:03:40 2008
> @@ -593,7 +593,7 @@
>   const PAListPtr &PAL = F->getParamAttrs();
>
>   // The existing function return attributes.
> -  ParameterAttributes RAttrs = PAL.getParamAttrs(0);
> +  Attributes RAttrs = PAL.getParamAttrs(0);
>
>
>   // Find out the new return value.
> @@ -678,7 +678,7 @@
>
>       // Get the original parameter attributes (skipping the first  
> one, that is
>       // for the return value.
> -      if (ParameterAttributes Attrs = PAL.getParamAttrs(i + 1))
> +      if (Attributes Attrs = PAL.getParamAttrs(i + 1))
>          
> ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Params.size(),  
> Attrs));
>     } else {
>       ++NumArgumentsEliminated;
> @@ -730,7 +730,7 @@
>     const PAListPtr &CallPAL = CS.getParamAttrs();
>
>     // The call return attributes.
> -    ParameterAttributes RAttrs = CallPAL.getParamAttrs(0);
> +    Attributes RAttrs = CallPAL.getParamAttrs(0);
>     // Adjust in case the function was changed to return void.
>     RAttrs &= ~ParamAttr::typeIncompatible(NF->getReturnType());
>     if (RAttrs)
> @@ -746,7 +746,7 @@
>       if (ArgAlive[i]) {
>         Args.push_back(*I);
>         // Get original parameter attributes, but skip return  
> attributes.
> -        if (ParameterAttributes Attrs = CallPAL.getParamAttrs(i + 1))
> +        if (Attributes Attrs = CallPAL.getParamAttrs(i + 1))
>            
> ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Args.size(), Attrs));
>       }
>
> @@ -756,7 +756,7 @@
>     // Push any varargs arguments on the list. Don't forget their  
> attributes.
>     for (CallSite::arg_iterator E = CS.arg_end(); I != E; ++I, ++i) {
>       Args.push_back(*I);
> -      if (ParameterAttributes Attrs = CallPAL.getParamAttrs(i + 1))
> +      if (Attributes Attrs = CallPAL.getParamAttrs(i + 1))
>          
> ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Args.size(), Attrs));
>     }
>
>
> Modified: llvm/trunk/lib/Transforms/IPO/PruneEH.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/PruneEH.cpp?rev=56513&r1=56512&r2=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Transforms/IPO/PruneEH.cpp (original)
> +++ llvm/trunk/lib/Transforms/IPO/PruneEH.cpp Tue Sep 23 18:03:40 2008
> @@ -125,7 +125,7 @@
>   // If the SCC doesn't unwind or doesn't throw, note this fact.
>   if (!SCCMightUnwind || !SCCMightReturn)
>     for (unsigned i = 0, e = SCC.size(); i != e; ++i) {
> -      ParameterAttributes NewAttributes = ParamAttr::None;
> +      Attributes NewAttributes = ParamAttr::None;
>
>       if (!SCCMightUnwind)
>         NewAttributes |= ParamAttr::NoUnwind;
>
> Modified: llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp?rev=56513&r1=56512&r2=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp (original)
> +++ llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp Tue Sep 23  
> 18:03:40 2008
> @@ -210,7 +210,7 @@
>   const PAListPtr &PAL = F->getParamAttrs();
>
>   // Add any return attributes.
> -  if (ParameterAttributes attrs = PAL.getParamAttrs(0))
> +  if (Attributes attrs = PAL.getParamAttrs(0))
>     ParamAttrsVec.push_back(ParamAttrsWithIndex::get(0, attrs));
>
>   // Skip first argument.
> @@ -221,7 +221,7 @@
>   unsigned ParamIndex = 2;
>   while (I != E) {
>     Params.push_back(I->getType());
> -    if (ParameterAttributes Attrs = PAL.getParamAttrs(ParamIndex))
> +    if (Attributes Attrs = PAL.getParamAttrs(ParamIndex))
>       ParamAttrsVec.push_back(ParamAttrsWithIndex::get(ParamIndex -  
> 1, Attrs));
>     ++I;
>     ++ParamIndex;
> @@ -264,7 +264,7 @@
>
>     const PAListPtr &PAL = F->getParamAttrs();
>     // Add any return attributes.
> -    if (ParameterAttributes attrs = PAL.getParamAttrs(0))
> +    if (Attributes attrs = PAL.getParamAttrs(0))
>       ArgAttrsVec.push_back(ParamAttrsWithIndex::get(0, attrs));
>
>     // Copy arguments, however skip first one.
> @@ -276,7 +276,7 @@
>     unsigned ParamIndex = 2;
>     while (AI != AE) {
>       Args.push_back(*AI);
> -      if (ParameterAttributes Attrs = PAL.getParamAttrs(ParamIndex))
> +      if (Attributes Attrs = PAL.getParamAttrs(ParamIndex))
>         ArgAttrsVec.push_back(ParamAttrsWithIndex::get(ParamIndex -  
> 1, Attrs));
>       ++ParamIndex;
>       ++AI;
>
> Modified: llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp?rev=56513&r1=56512&r2=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp  
> (original)
> +++ llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp Tue  
> Sep 23 18:03:40 2008
> @@ -9127,7 +9127,7 @@
>       return false;   // Cannot transform this return value.
>
>     if (!CallerPAL.isEmpty() && !Caller->use_empty()) {
> -      ParameterAttributes RAttrs = CallerPAL.getParamAttrs(0);
> +      Attributes RAttrs = CallerPAL.getParamAttrs(0);
>       if (RAttrs & ParamAttr::typeIncompatible(NewRetTy))
>         return false;   // Attribute not compatible with transformed  
> value.
>     }
> @@ -9180,7 +9180,7 @@
>     for (unsigned i = CallerPAL.getNumSlots(); i; --i) {
>       if (CallerPAL.getSlot(i - 1).Index <= FT->getNumParams())
>         break;
> -      ParameterAttributes PAttrs = CallerPAL.getSlot(i - 1).Attrs;
> +      Attributes PAttrs = CallerPAL.getSlot(i - 1).Attrs;
>       if (PAttrs & ParamAttr::VarArgsIncompatible)
>         return false;
>     }
> @@ -9193,7 +9193,7 @@
>   attrVec.reserve(NumCommonArgs);
>
>   // Get any return attributes.
> -  ParameterAttributes RAttrs = CallerPAL.getParamAttrs(0);
> +  Attributes RAttrs = CallerPAL.getParamAttrs(0);
>
>   // If the return value is not being used, the type may not be  
> compatible
>   // with the existing attributes.  Wipe out any problematic  
> attributes.
> @@ -9216,7 +9216,7 @@
>     }
>
>     // Add any parameter attributes.
> -    if (ParameterAttributes PAttrs = CallerPAL.getParamAttrs(i + 1))
> +    if (Attributes PAttrs = CallerPAL.getParamAttrs(i + 1))
>       attrVec.push_back(ParamAttrsWithIndex::get(i + 1, PAttrs));
>   }
>
> @@ -9246,7 +9246,7 @@
>         }
>
>         // Add any parameter attributes.
> -        if (ParameterAttributes PAttrs = CallerPAL.getParamAttrs(i  
> + 1))
> +        if (Attributes PAttrs = CallerPAL.getParamAttrs(i + 1))
>           attrVec.push_back(ParamAttrsWithIndex::get(i + 1, PAttrs));
>       }
>     }
> @@ -9329,7 +9329,7 @@
>   if (!NestAttrs.isEmpty()) {
>     unsigned NestIdx = 1;
>     const Type *NestTy = 0;
> -    ParameterAttributes NestAttr = ParamAttr::None;
> +    Attributes NestAttr = ParamAttr::None;
>
>     // Look for a parameter marked with the 'nest' attribute.
>     for (FunctionType::param_iterator I = NestFTy->param_begin(),
> @@ -9353,7 +9353,7 @@
>       // mean appending it.  Likewise for attributes.
>
>       // Add any function result attributes.
> -      if (ParameterAttributes Attr = Attrs.getParamAttrs(0))
> +      if (Attributes Attr = Attrs.getParamAttrs(0))
>         NewAttrs.push_back(ParamAttrsWithIndex::get(0, Attr));
>
>       {
> @@ -9374,7 +9374,7 @@
>
>           // Add the original argument and attributes.
>           NewArgs.push_back(*I);
> -          if (ParameterAttributes Attr = Attrs.getParamAttrs(Idx))
> +          if (Attributes Attr = Attrs.getParamAttrs(Idx))
>             NewAttrs.push_back
>               (ParamAttrsWithIndex::get(Idx + (Idx >= NestIdx),  
> Attr));
>
>
> Modified: llvm/trunk/lib/Transforms/Scalar/MemCpyOptimizer.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/MemCpyOptimizer.cpp?rev=56513&r1=56512&r2=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Transforms/Scalar/MemCpyOptimizer.cpp (original)
> +++ llvm/trunk/lib/Transforms/Scalar/MemCpyOptimizer.cpp Tue Sep 23  
> 18:03:40 2008
> @@ -16,7 +16,6 @@
> #include "llvm/Transforms/Scalar.h"
> #include "llvm/IntrinsicInst.h"
> #include "llvm/Instructions.h"
> -#include "llvm/ParameterAttributes.h"
> #include "llvm/ADT/SmallVector.h"
> #include "llvm/ADT/Statistic.h"
> #include "llvm/Analysis/Dominators.h"
>
> Modified: llvm/trunk/lib/Transforms/Scalar/SimplifyCFGPass.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/SimplifyCFGPass.cpp?rev=56513&r1=56512&r2=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Transforms/Scalar/SimplifyCFGPass.cpp (original)
> +++ llvm/trunk/lib/Transforms/Scalar/SimplifyCFGPass.cpp Tue Sep 23  
> 18:03:40 2008
> @@ -27,7 +27,7 @@
> #include "llvm/Constants.h"
> #include "llvm/Instructions.h"
> #include "llvm/Module.h"
> -#include "llvm/ParameterAttributes.h"
> +#include "llvm/Attributes.h"
> #include "llvm/Support/CFG.h"
> #include "llvm/Support/Compiler.h"
> #include "llvm/Pass.h"
>
> Modified: llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp?rev=56513&r1=56512&r2=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp (original)
> +++ llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp Tue Sep 23  
> 18:03:40 2008
> @@ -18,7 +18,7 @@
> #include "llvm/Module.h"
> #include "llvm/Instructions.h"
> #include "llvm/Intrinsics.h"
> -#include "llvm/ParameterAttributes.h"
> +#include "llvm/Attributes.h"
> #include "llvm/Analysis/CallGraph.h"
> #include "llvm/Target/TargetData.h"
> #include "llvm/ADT/SmallVector.h"
>
> Modified: llvm/trunk/lib/VMCore/AsmWriter.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/AsmWriter.cpp?rev=56513&r1=56512&r2=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/VMCore/AsmWriter.cpp (original)
> +++ llvm/trunk/lib/VMCore/AsmWriter.cpp Tue Sep 23 18:03:40 2008
> @@ -1006,7 +1006,7 @@
>   void write(const Type *Ty)          { printType(Ty);        }
>
>   void writeOperand(const Value *Op, bool PrintType);
> -  void writeParamOperand(const Value *Operand, ParameterAttributes  
> Attrs);
> +  void writeParamOperand(const Value *Operand, Attributes Attrs);
>
>   const Module* getModule() { return TheModule; }
>
> @@ -1016,7 +1016,7 @@
>   void printGlobal(const GlobalVariable *GV);
>   void printAlias(const GlobalAlias *GV);
>   void printFunction(const Function *F);
> -  void printArgument(const Argument *FA, ParameterAttributes Attrs);
> +  void printArgument(const Argument *FA, Attributes Attrs);
>   void printBasicBlock(const BasicBlock *BB);
>   void printInstruction(const Instruction &I);
>
> @@ -1126,7 +1126,7 @@
> }
>
> void AssemblyWriter::writeParamOperand(const Value *Operand,
> -                                       ParameterAttributes Attrs) {
> +                                       Attributes Attrs) {
>   if (Operand == 0) {
>     Out << "<null operand!>";
>   } else {
> @@ -1386,7 +1386,7 @@
>       // Output type...
>       printType(FT->getParamType(i));
>
> -      ParameterAttributes ArgAttrs = Attrs.getParamAttrs(i+1);
> +      Attributes ArgAttrs = Attrs.getParamAttrs(i+1);
>       if (ArgAttrs != ParamAttr::None)
>         Out << ' ' << ParamAttr::getAsString(ArgAttrs);
>     }
> @@ -1398,7 +1398,7 @@
>     Out << "...";  // Output varargs portion of signature!
>   }
>   Out << ')';
> -  ParameterAttributes RetAttrs = Attrs.getParamAttrs(0);
> +  Attributes RetAttrs = Attrs.getParamAttrs(0);
>   if (RetAttrs != ParamAttr::None)
>     Out << ' ' << ParamAttr::getAsString(Attrs.getParamAttrs(0));
>   if (F->hasSection())
> @@ -1454,7 +1454,7 @@
> /// the function.  Simply print it out
> ///
> void AssemblyWriter::printArgument(const Argument *Arg,
> -                                   ParameterAttributes Attrs) {
> +                                   Attributes Attrs) {
>   // Output type...
>   printType(Arg->getType());
>
>
> Copied: llvm/trunk/lib/VMCore/Attributes.cpp (from r56511, llvm/ 
> trunk/lib/VMCore/ParameterAttributes.cpp)
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Attributes.cpp?p2=llvm/trunk/lib/VMCore/Attributes.cpp&p1=llvm/trunk/lib/VMCore/ParameterAttributes.cpp&r1=56511&r2=56513&rev=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/VMCore/ParameterAttributes.cpp (original)
> +++ llvm/trunk/lib/VMCore/Attributes.cpp Tue Sep 23 18:03:40 2008
> @@ -1,4 +1,4 @@
> -//===-- ParameterAttributes.cpp - Implement ParamAttrsList  
> ----------------===//
> +//===-- Attributes.cpp - Implement ParamAttrsList ---------------- 
> ===//
> //
> //                     The LLVM Compiler Infrastructure
> //
> @@ -11,7 +11,7 @@
> //
> // 
> = 
> = 
> = 
> ----------------------------------------------------------------------= 
> ==//
>
> -#include "llvm/ParameterAttributes.h"
> +#include "llvm/Attributes.h"
> #include "llvm/Type.h"
> #include "llvm/ADT/StringExtras.h"
> #include "llvm/ADT/FoldingSet.h"
> @@ -23,7 +23,7 @@
> // ParamAttr Function Definitions
> // 
> = 
> = 
> = 
> ----------------------------------------------------------------------= 
> ==//
>
> -std::string ParamAttr::getAsString(ParameterAttributes Attrs) {
> +std::string ParamAttr::getAsString(Attributes Attrs) {
>   std::string Result;
>   if (Attrs & ParamAttr::ZExt)
>     Result += "zeroext ";
> @@ -57,8 +57,8 @@
>   return Result;
> }
>
> -ParameterAttributes ParamAttr::typeIncompatible(const Type *Ty) {
> -  ParameterAttributes Incompatible = None;
> +Attributes ParamAttr::typeIncompatible(const Type *Ty) {
> +  Attributes Incompatible = None;
>
>   if (!Ty->isInteger())
>     // Attributes that only apply to integers.
> @@ -187,7 +187,7 @@
> /// getParamAttrs - The parameter attributes for the specified  
> parameter are
> /// returned.  Parameters for the result are denoted with Idx = 0.
> /// Function notes are denoted with idx = ~0.
> -ParameterAttributes PAListPtr::getParamAttrs(unsigned Idx) const {
> +Attributes PAListPtr::getParamAttrs(unsigned Idx) const {
>   if (PAList == 0) return ParamAttr::None;
>
>   const SmallVector<ParamAttrsWithIndex, 4> &Attrs = PAList->Attrs;
> @@ -199,7 +199,7 @@
>
> /// hasAttrSomewhere - Return true if the specified attribute is set  
> for at
> /// least one parameter or for the return value.
> -bool PAListPtr::hasAttrSomewhere(ParameterAttributes Attr) const {
> +bool PAListPtr::hasAttrSomewhere(Attributes Attr) const {
>   if (PAList == 0) return false;
>
>   const SmallVector<ParamAttrsWithIndex, 4> &Attrs = PAList->Attrs;
> @@ -210,18 +210,18 @@
> }
>
>
> -PAListPtr PAListPtr::addAttr(unsigned Idx, ParameterAttributes  
> Attrs) const {
> -  ParameterAttributes OldAttrs = getParamAttrs(Idx);
> +PAListPtr PAListPtr::addAttr(unsigned Idx, Attributes Attrs) const {
> +  Attributes OldAttrs = getParamAttrs(Idx);
> #ifndef NDEBUG
>   // FIXME it is not obvious how this should work for alignment.
>   // For now, say we can't change a known alignment.
> -  ParameterAttributes OldAlign = OldAttrs & ParamAttr::Alignment;
> -  ParameterAttributes NewAlign = Attrs & ParamAttr::Alignment;
> +  Attributes OldAlign = OldAttrs & ParamAttr::Alignment;
> +  Attributes NewAlign = Attrs & ParamAttr::Alignment;
>   assert((!OldAlign || !NewAlign || OldAlign == NewAlign) &&
>          "Attempt to change alignment!");
> #endif
>
> -  ParameterAttributes NewAttrs = OldAttrs | Attrs;
> +  Attributes NewAttrs = OldAttrs | Attrs;
>   if (NewAttrs == OldAttrs)
>     return *this;
>
> @@ -251,7 +251,7 @@
>   return get(&NewAttrList[0], NewAttrList.size());
> }
>
> -PAListPtr PAListPtr::removeAttr(unsigned Idx, ParameterAttributes  
> Attrs) const {
> +PAListPtr PAListPtr::removeAttr(unsigned Idx, Attributes Attrs)  
> const {
> #ifndef NDEBUG
>   // FIXME it is not obvious how this should work for alignment.
>   // For now, say we can't pass in alignment, which no current use  
> does.
> @@ -259,8 +259,8 @@
> #endif
>   if (PAList == 0) return PAListPtr();
>
> -  ParameterAttributes OldAttrs = getParamAttrs(Idx);
> -  ParameterAttributes NewAttrs = OldAttrs & ~Attrs;
> +  Attributes OldAttrs = getParamAttrs(Idx);
> +  Attributes NewAttrs = OldAttrs & ~Attrs;
>   if (NewAttrs == OldAttrs)
>     return *this;
>
>
> Modified: llvm/trunk/lib/VMCore/Function.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Function.cpp?rev=56513&r1=56512&r2=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/VMCore/Function.cpp (original)
> +++ llvm/trunk/lib/VMCore/Function.cpp Tue Sep 23 18:03:40 2008
> @@ -112,12 +112,12 @@
> }
>
> /// addAttr - Add a ParamAttr to an argument
> -void Argument::addAttr(ParameterAttributes attr) {
> +void Argument::addAttr(Attributes attr) {
>   getParent()->addParamAttr(getArgNo() + 1, attr);
> }
>
> /// removeAttr - Remove a ParamAttr from an argument
> -void Argument::removeAttr(ParameterAttributes attr) {
> +void Argument::removeAttr(Attributes attr) {
>   getParent()->removeParamAttr(getArgNo() + 1, attr);
> }
>
> @@ -229,13 +229,13 @@
>   BasicBlocks.clear();    // Delete all basic blocks...
> }
>
> -void Function::addParamAttr(unsigned i, ParameterAttributes attr) {
> +void Function::addParamAttr(unsigned i, Attributes attr) {
>   PAListPtr PAL = getParamAttrs();
>   PAL = PAL.addAttr(i, attr);
>   setParamAttrs(PAL);
> }
>
> -void Function::removeParamAttr(unsigned i, ParameterAttributes  
> attr) {
> +void Function::removeParamAttr(unsigned i, Attributes attr) {
>   PAListPtr PAL = getParamAttrs();
>   PAL = PAL.removeAttr(i, attr);
>   setParamAttrs(PAL);
> @@ -356,7 +356,7 @@
> }
>
> PAListPtr Intrinsic::getParamAttrs(ID id) {
> -  ParameterAttributes Attr = ParamAttr::None;
> +  Attributes Attr = ParamAttr::None;
>
> #define GET_INTRINSIC_ATTRIBUTES
> #include "llvm/Intrinsics.gen"
>
> Modified: llvm/trunk/lib/VMCore/Instructions.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Instructions.cpp?rev=56513&r1=56512&r2=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/VMCore/Instructions.cpp (original)
> +++ llvm/trunk/lib/VMCore/Instructions.cpp Tue Sep 23 18:03:40 2008
> @@ -53,7 +53,7 @@
>   else
>     cast<InvokeInst>(I)->setParamAttrs(PAL);
> }
> -bool CallSite::paramHasAttr(uint16_t i, ParameterAttributes attr)  
> const {
> +bool CallSite::paramHasAttr(uint16_t i, Attributes attr) const {
>   if (CallInst *CI = dyn_cast<CallInst>(I))
>     return CI->paramHasAttr(i, attr);
>   else
> @@ -402,19 +402,19 @@
>     OL[i] = InOL[i];
> }
>
> -void CallInst::addParamAttr(unsigned i, ParameterAttributes attr) {
> +void CallInst::addParamAttr(unsigned i, Attributes attr) {
>   PAListPtr PAL = getParamAttrs();
>   PAL = PAL.addAttr(i, attr);
>   setParamAttrs(PAL);
> }
>
> -void CallInst::removeParamAttr(unsigned i, ParameterAttributes  
> attr) {
> +void CallInst::removeParamAttr(unsigned i, Attributes attr) {
>   PAListPtr PAL = getParamAttrs();
>   PAL = PAL.removeAttr(i, attr);
>   setParamAttrs(PAL);
> }
>
> -bool CallInst::paramHasAttr(unsigned i, ParameterAttributes attr)  
> const {
> +bool CallInst::paramHasAttr(unsigned i, Attributes attr) const {
>   if (ParamAttrs.paramHasAttr(i, attr))
>     return true;
>   if (const Function *F = getCalledFunction())
> @@ -473,7 +473,7 @@
>   return setSuccessor(idx, B);
> }
>
> -bool InvokeInst::paramHasAttr(unsigned i, ParameterAttributes attr)  
> const {
> +bool InvokeInst::paramHasAttr(unsigned i, Attributes attr) const {
>   if (ParamAttrs.paramHasAttr(i, attr))
>     return true;
>   if (const Function *F = getCalledFunction())
> @@ -481,13 +481,13 @@
>   return false;
> }
>
> -void InvokeInst::addParamAttr(unsigned i, ParameterAttributes attr) {
> +void InvokeInst::addParamAttr(unsigned i, Attributes attr) {
>   PAListPtr PAL = getParamAttrs();
>   PAL = PAL.addAttr(i, attr);
>   setParamAttrs(PAL);
> }
>
> -void InvokeInst::removeParamAttr(unsigned i, ParameterAttributes  
> attr) {
> +void InvokeInst::removeParamAttr(unsigned i, Attributes attr) {
>   PAListPtr PAL = getParamAttrs();
>   PAL = PAL.removeAttr(i, attr);
>   setParamAttrs(PAL);
>
> Removed: llvm/trunk/lib/VMCore/ParameterAttributes.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/ParameterAttributes.cpp?rev=56512&view=auto
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/VMCore/ParameterAttributes.cpp (original)
> +++ llvm/trunk/lib/VMCore/ParameterAttributes.cpp (removed)
> @@ -1,297 +0,0 @@
> -//===-- ParameterAttributes.cpp - Implement ParamAttrsList  
> ----------------===//
> -//
> -//                     The LLVM Compiler Infrastructure
> -//
> -// This file is distributed under the University of Illinois Open  
> Source
> -// License. See LICENSE.TXT for details.
> -//
> -// 
> = 
> = 
> = 
> ----------------------------------------------------------------------= 
> ==//
> -//
> -// This file implements the ParamAttrsList class and ParamAttr  
> utilities.
> -//
> -// 
> = 
> = 
> = 
> ----------------------------------------------------------------------= 
> ==//
> -
> -#include "llvm/ParameterAttributes.h"
> -#include "llvm/Type.h"
> -#include "llvm/ADT/StringExtras.h"
> -#include "llvm/ADT/FoldingSet.h"
> -#include "llvm/Support/Streams.h"
> -#include "llvm/Support/ManagedStatic.h"
> -using namespace llvm;
> -
> -// 
> = 
> = 
> = 
> ----------------------------------------------------------------------= 
> ==//
> -// ParamAttr Function Definitions
> -// 
> = 
> = 
> = 
> ----------------------------------------------------------------------= 
> ==//
> -
> -std::string ParamAttr::getAsString(ParameterAttributes Attrs) {
> -  std::string Result;
> -  if (Attrs & ParamAttr::ZExt)
> -    Result += "zeroext ";
> -  if (Attrs & ParamAttr::SExt)
> -    Result += "signext ";
> -  if (Attrs & ParamAttr::NoReturn)
> -    Result += "noreturn ";
> -  if (Attrs & ParamAttr::NoUnwind)
> -    Result += "nounwind ";
> -  if (Attrs & ParamAttr::InReg)
> -    Result += "inreg ";
> -  if (Attrs & ParamAttr::NoAlias)
> -    Result += "noalias ";
> -  if (Attrs & ParamAttr::StructRet)
> -    Result += "sret ";
> -  if (Attrs & ParamAttr::ByVal)
> -    Result += "byval ";
> -  if (Attrs & ParamAttr::Nest)
> -    Result += "nest ";
> -  if (Attrs & ParamAttr::ReadNone)
> -    Result += "readnone ";
> -  if (Attrs & ParamAttr::ReadOnly)
> -    Result += "readonly ";
> -  if (Attrs & ParamAttr::Alignment) {
> -    Result += "align ";
> -    Result += utostr((Attrs & ParamAttr::Alignment) >> 16);
> -    Result += " ";
> -  }
> -  // Trim the trailing space.
> -  Result.erase(Result.end()-1);
> -  return Result;
> -}
> -
> -ParameterAttributes ParamAttr::typeIncompatible(const Type *Ty) {
> -  ParameterAttributes Incompatible = None;
> -
> -  if (!Ty->isInteger())
> -    // Attributes that only apply to integers.
> -    Incompatible |= SExt | ZExt;
> -
> -  if (!isa<PointerType>(Ty))
> -    // Attributes that only apply to pointers.
> -    Incompatible |= ByVal | Nest | NoAlias | StructRet;
> -
> -  return Incompatible;
> -}
> -
> -// 
> = 
> = 
> = 
> ----------------------------------------------------------------------= 
> ==//
> -// ParamAttributeListImpl Definition
> -// 
> = 
> = 
> = 
> ----------------------------------------------------------------------= 
> ==//
> -
> -namespace llvm {
> -class ParamAttributeListImpl : public FoldingSetNode {
> -  unsigned RefCount;
> -
> -  // ParamAttrsList is uniqued, these should not be publicly  
> available.
> -  void operator=(const ParamAttributeListImpl &); // Do not implement
> -  ParamAttributeListImpl(const ParamAttributeListImpl &); // Do not  
> implement
> -  ~ParamAttributeListImpl();                        // Private  
> implementation
> -public:
> -  SmallVector<ParamAttrsWithIndex, 4> Attrs;
> -
> -  ParamAttributeListImpl(const ParamAttrsWithIndex *Attr, unsigned  
> NumAttrs)
> -    : Attrs(Attr, Attr+NumAttrs) {
> -    RefCount = 0;
> -  }
> -
> -  void AddRef() { ++RefCount; }
> -  void DropRef() { if (--RefCount == 0) delete this; }
> -
> -  void Profile(FoldingSetNodeID &ID) const {
> -    Profile(ID, &Attrs[0], Attrs.size());
> -  }
> -  static void Profile(FoldingSetNodeID &ID, const  
> ParamAttrsWithIndex *Attr,
> -                      unsigned NumAttrs) {
> -    for (unsigned i = 0; i != NumAttrs; ++i)
> -      ID.AddInteger(uint64_t(Attr[i].Attrs) << 32 |  
> unsigned(Attr[i].Index));
> -  }
> -};
> -}
> -
> -static ManagedStatic<FoldingSet<ParamAttributeListImpl> >  
> ParamAttrsLists;
> -
> -ParamAttributeListImpl::~ParamAttributeListImpl() {
> -  ParamAttrsLists->RemoveNode(this);
> -}
> -
> -
> -PAListPtr PAListPtr::get(const ParamAttrsWithIndex *Attrs, unsigned  
> NumAttrs) {
> -  // If there are no attributes then return a null ParamAttrsList  
> pointer.
> -  if (NumAttrs == 0)
> -    return PAListPtr();
> -
> -#ifndef NDEBUG
> -  for (unsigned i = 0; i != NumAttrs; ++i) {
> -    assert(Attrs[i].Attrs != ParamAttr::None &&
> -           "Pointless parameter attribute!");
> -    assert((!i || Attrs[i-1].Index < Attrs[i].Index) &&
> -           "Misordered ParamAttrsList!");
> -  }
> -#endif
> -
> -  // Otherwise, build a key to look up the existing attributes.
> -  FoldingSetNodeID ID;
> -  ParamAttributeListImpl::Profile(ID, Attrs, NumAttrs);
> -  void *InsertPos;
> -  ParamAttributeListImpl *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 ParamAttributeListImpl(Attrs, NumAttrs);
> -    ParamAttrsLists->InsertNode(PAL, InsertPos);
> -  }
> -
> -  // Return the ParamAttrsList that we found or created.
> -  return PAListPtr(PAL);
> -}
> -
> -
> -// 
> = 
> = 
> = 
> ----------------------------------------------------------------------= 
> ==//
> -// PAListPtr Method Implementations
> -// 
> = 
> = 
> = 
> ----------------------------------------------------------------------= 
> ==//
> -
> -PAListPtr::PAListPtr(ParamAttributeListImpl *LI) : PAList(LI) {
> -  if (LI) LI->AddRef();
> -}
> -
> -PAListPtr::PAListPtr(const PAListPtr &P) : PAList(P.PAList) {
> -  if (PAList) PAList->AddRef();
> -}
> -
> -const PAListPtr &PAListPtr::operator=(const PAListPtr &RHS) {
> -  if (PAList == RHS.PAList) return *this;
> -  if (PAList) PAList->DropRef();
> -  PAList = RHS.PAList;
> -  if (PAList) PAList->AddRef();
> -  return *this;
> -}
> -
> -PAListPtr::~PAListPtr() {
> -  if (PAList) PAList->DropRef();
> -}
> -
> -/// getNumSlots - Return the number of slots used in this attribute  
> list.
> -/// This is the number of arguments that have an attribute set on  
> them
> -/// (including the function itself).
> -unsigned PAListPtr::getNumSlots() const {
> -  return PAList ? PAList->Attrs.size() : 0;
> -}
> -
> -/// getSlot - Return the ParamAttrsWithIndex at the specified  
> slot.  This
> -/// holds a parameter number plus a set of attributes.
> -const ParamAttrsWithIndex &PAListPtr::getSlot(unsigned Slot) const {
> -  assert(PAList && Slot < PAList->Attrs.size() && "Slot # out of  
> range!");
> -  return PAList->Attrs[Slot];
> -}
> -
> -
> -/// getParamAttrs - The parameter attributes for the specified  
> parameter are
> -/// returned.  Parameters for the result are denoted with Idx = 0.
> -/// Function notes are denoted with idx = ~0.
> -ParameterAttributes PAListPtr::getParamAttrs(unsigned Idx) const {
> -  if (PAList == 0) return ParamAttr::None;
> -
> -  const SmallVector<ParamAttrsWithIndex, 4> &Attrs = PAList->Attrs;
> -  for (unsigned i = 0, e = Attrs.size(); i != e && Attrs[i].Index  
> <= Idx; ++i)
> -    if (Attrs[i].Index == Idx)
> -      return Attrs[i].Attrs;
> -  return ParamAttr::None;
> -}
> -
> -/// hasAttrSomewhere - Return true if the specified attribute is  
> set for at
> -/// least one parameter or for the return value.
> -bool PAListPtr::hasAttrSomewhere(ParameterAttributes Attr) const {
> -  if (PAList == 0) return false;
> -
> -  const SmallVector<ParamAttrsWithIndex, 4> &Attrs = PAList->Attrs;
> -  for (unsigned i = 0, e = Attrs.size(); i != e; ++i)
> -    if (Attrs[i].Attrs & Attr)
> -      return true;
> -  return false;
> -}
> -
> -
> -PAListPtr PAListPtr::addAttr(unsigned Idx, ParameterAttributes  
> Attrs) const {
> -  ParameterAttributes OldAttrs = getParamAttrs(Idx);
> -#ifndef NDEBUG
> -  // FIXME it is not obvious how this should work for alignment.
> -  // For now, say we can't change a known alignment.
> -  ParameterAttributes OldAlign = OldAttrs & ParamAttr::Alignment;
> -  ParameterAttributes NewAlign = Attrs & ParamAttr::Alignment;
> -  assert((!OldAlign || !NewAlign || OldAlign == NewAlign) &&
> -         "Attempt to change alignment!");
> -#endif
> -
> -  ParameterAttributes NewAttrs = OldAttrs | Attrs;
> -  if (NewAttrs == OldAttrs)
> -    return *this;
> -
> -  SmallVector<ParamAttrsWithIndex, 8> NewAttrList;
> -  if (PAList == 0)
> -    NewAttrList.push_back(ParamAttrsWithIndex::get(Idx, Attrs));
> -  else {
> -    const SmallVector<ParamAttrsWithIndex, 4> &OldAttrList = PAList- 
> >Attrs;
> -    unsigned i = 0, e = OldAttrList.size();
> -    // Copy attributes for arguments before this one.
> -    for (; i != e && OldAttrList[i].Index < Idx; ++i)
> -      NewAttrList.push_back(OldAttrList[i]);
> -
> -    // If there are attributes already at this index, merge them in.
> -    if (i != e && OldAttrList[i].Index == Idx) {
> -      Attrs |= OldAttrList[i].Attrs;
> -      ++i;
> -    }
> -
> -    NewAttrList.push_back(ParamAttrsWithIndex::get(Idx, Attrs));
> -
> -    // Copy attributes for arguments after this one.
> -    NewAttrList.insert(NewAttrList.end(),
> -                       OldAttrList.begin()+i, OldAttrList.end());
> -  }
> -
> -  return get(&NewAttrList[0], NewAttrList.size());
> -}
> -
> -PAListPtr PAListPtr::removeAttr(unsigned Idx, ParameterAttributes  
> Attrs) const {
> -#ifndef NDEBUG
> -  // FIXME it is not obvious how this should work for alignment.
> -  // For now, say we can't pass in alignment, which no current use  
> does.
> -  assert(!(Attrs & ParamAttr::Alignment) && "Attempt to exclude  
> alignment!");
> -#endif
> -  if (PAList == 0) return PAListPtr();
> -
> -  ParameterAttributes OldAttrs = getParamAttrs(Idx);
> -  ParameterAttributes NewAttrs = OldAttrs & ~Attrs;
> -  if (NewAttrs == OldAttrs)
> -    return *this;
> -
> -  SmallVector<ParamAttrsWithIndex, 8> NewAttrList;
> -  const SmallVector<ParamAttrsWithIndex, 4> &OldAttrList = PAList- 
> >Attrs;
> -  unsigned i = 0, e = OldAttrList.size();
> -
> -  // Copy attributes for arguments before this one.
> -  for (; i != e && OldAttrList[i].Index < Idx; ++i)
> -    NewAttrList.push_back(OldAttrList[i]);
> -
> -  // If there are attributes already at this index, merge them in.
> -  assert(OldAttrList[i].Index == Idx && "Attribute isn't set?");
> -  Attrs = OldAttrList[i].Attrs & ~Attrs;
> -  ++i;
> -  if (Attrs)  // If any attributes left for this parameter, add them.
> -    NewAttrList.push_back(ParamAttrsWithIndex::get(Idx, Attrs));
> -
> -  // Copy attributes for arguments after this one.
> -  NewAttrList.insert(NewAttrList.end(),
> -                     OldAttrList.begin()+i, OldAttrList.end());
> -
> -  return get(&NewAttrList[0], NewAttrList.size());
> -}
> -
> -void PAListPtr::dump() const {
> -  cerr << "PAL[ ";
> -  for (unsigned i = 0; i < getNumSlots(); ++i) {
> -    const ParamAttrsWithIndex &PAWI = getSlot(i);
> -    cerr << "{" << PAWI.Index << "," << PAWI.Attrs << "} ";
> -  }
> -
> -  cerr << "]\n";
> -}
>
> Modified: llvm/trunk/lib/VMCore/Verifier.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Verifier.cpp?rev=56513&r1=56512&r2=56513&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/VMCore/Verifier.cpp (original)
> +++ llvm/trunk/lib/VMCore/Verifier.cpp Tue Sep 23 18:03:40 2008
> @@ -268,7 +268,7 @@
>     void VerifyCallSite(CallSite CS);
>     void VerifyIntrinsicPrototype(Intrinsic::ID ID, Function *F,
>                                   unsigned Count, ...);
> -    void VerifyAttrs(ParameterAttributes Attrs, const Type *Ty,
> +    void VerifyAttrs(Attributes Attrs, const Type *Ty,
>                      bool isReturnValue, const Value *V);
>     void VerifyFunctionAttrs(const FunctionType *FT, const PAListPtr  
> &Attrs,
>                              const Value *V);
> @@ -406,33 +406,33 @@
>
> // VerifyAttrs - Check the given parameter attributes for an  
> argument or return
> // value of the specified type.  The value V is printed in error  
> messages.
> -void Verifier::VerifyAttrs(ParameterAttributes Attrs, const Type *Ty,
> +void Verifier::VerifyAttrs(Attributes Attrs, const Type *Ty,
>                            bool isReturnValue, const Value *V) {
>   if (Attrs == ParamAttr::None)
>     return;
>
>   if (isReturnValue) {
> -    ParameterAttributes RetI = Attrs & ParamAttr::ParameterOnly;
> +    Attributes RetI = Attrs & ParamAttr::ParameterOnly;
>     Assert1(!RetI, "Attribute " + ParamAttr::getAsString(RetI) +
>             " does not apply to return values!", V);
>   } else {
> -    ParameterAttributes ParmI = Attrs & ParamAttr::ReturnOnly;
> +    Attributes ParmI = Attrs & ParamAttr::ReturnOnly;
>     Assert1(!ParmI, "Attribute " + ParamAttr::getAsString(ParmI) +
>             " only applies to return values!", V);
>   }
>
>   for (unsigned i = 0;
>        i < array_lengthof(ParamAttr::MutuallyIncompatible); ++i) {
> -    ParameterAttributes MutI = Attrs &  
> ParamAttr::MutuallyIncompatible[i];
> +    Attributes MutI = Attrs & ParamAttr::MutuallyIncompatible[i];
>     Assert1(!(MutI & (MutI - 1)), "Attributes " +
>             ParamAttr::getAsString(MutI) + " are incompatible!", V);
>   }
>
> -  ParameterAttributes TypeI = Attrs &  
> ParamAttr::typeIncompatible(Ty);
> +  Attributes TypeI = Attrs & ParamAttr::typeIncompatible(Ty);
>   Assert1(!TypeI, "Wrong type for attribute " +
>           ParamAttr::getAsString(TypeI), V);
>
> -  ParameterAttributes ByValI = Attrs & ParamAttr::ByVal;
> +  Attributes ByValI = Attrs & ParamAttr::ByVal;
>   if (const PointerType *PTy = dyn_cast<PointerType>(Ty)) {
>     Assert1(!ByValI || PTy->getElementType()->isSized(),
>             "Attribute " + ParamAttr::getAsString(ByValI) +
> @@ -976,11 +976,11 @@
>   if (FTy->isVarArg())
>     // Check attributes on the varargs part.
>     for (unsigned Idx = 1 + FTy->getNumParams(); Idx <=  
> CS.arg_size(); ++Idx) {
> -      ParameterAttributes Attr = Attrs.getParamAttrs(Idx);
> +      Attributes Attr = Attrs.getParamAttrs(Idx);
>
>       VerifyAttrs(Attr, CS.getArgument(Idx-1)->getType(), false, I);
>
> -      ParameterAttributes VArgI = Attr &  
> ParamAttr::VarArgsIncompatible;
> +      Attributes VArgI = Attr & ParamAttr::VarArgsIncompatible;
>       Assert1(!VArgI, "Attribute " + ParamAttr::getAsString(VArgI) +
>               " cannot be used for vararg call arguments!", I);
>     }
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits




From kremenek at apple.com  Tue Sep 23 18:21:56 2008
From: kremenek at apple.com (Ted Kremenek)
Date: Tue, 23 Sep 2008 23:21:56 -0000
Subject: [llvm-commits] [llvm] r56516 - /llvm/tags/checker/checker-97/
Message-ID: <200809232321.m8NNLu3e032410@zion.cs.uiuc.edu>

Author: kremenek
Date: Tue Sep 23 18:21:56 2008
New Revision: 56516

URL: http://llvm.org/viewvc/llvm-project?rev=56516&view=rev
Log:
Removing checker-97.

Removed:
    llvm/tags/checker/checker-97/



From kremenek at apple.com  Tue Sep 23 18:22:10 2008
From: kremenek at apple.com (Ted Kremenek)
Date: Tue, 23 Sep 2008 23:22:10 -0000
Subject: [llvm-commits] [llvm] r56518 - /llvm/tags/checker/checker-97/
Message-ID: <200809232322.m8NNMA0J032437@zion.cs.uiuc.edu>

Author: kremenek
Date: Tue Sep 23 18:22:10 2008
New Revision: 56518

URL: http://llvm.org/viewvc/llvm-project?rev=56518&view=rev
Log:
Tagging checker-97.

Added:
    llvm/tags/checker/checker-97/
      - copied from r56517, llvm/trunk/



From dpatel at apple.com  Tue Sep 23 18:22:55 2008
From: dpatel at apple.com (Devang Patel)
Date: Tue, 23 Sep 2008 16:22:55 -0700
Subject: [llvm-commits] [llvm] r56513 - in /llvm/trunk: include/llvm/
	include/llvm/Support/ lib/Analysis/
	lib/AsmParser/	lib/Bitcode/Reader/
	lib/Bitcode/Writer/	lib/CodeGen/SelectionDAG/
	lib/ExecutionEngine/Interpreter/ lib/Target/CppBackend/
	lib/Target/MSIL/ lib/Target/PowerPC/ lib/Transforms/IPO/
	lib/Transforms/Scalar/	lib/Transforms/Utils/ lib/VMCore/
In-Reply-To: <85C7A0D6-4699-4F31-987B-942EC5D68776@apple.com>
References: <200809232303.m8NN3gWx031869@zion.cs.uiuc.edu>
	<85C7A0D6-4699-4F31-987B-942EC5D68776@apple.com>
Message-ID: <F1B40DB6-24DA-426C-8E87-3FCD3540B922@apple.com>


On Sep 23, 2008, at 4:21 PM, Evan Cheng wrote:

> Hi Devang,
>
> This seems to be breaking the build:
>
> llvm[2]: Building Release Archive Library libLLVMArchive.a
> /Users/echeng/LLVM/llvm/lib/AsmParser/llvmAsmParser.y:997: error:
> ?ParameterAttributes? in namespace ?llvm? does not name a type
> /Users/echeng/LLVM/llvm/lib/AsmParser/llvmAsmParser.y:998: error:
> ?ParameterAttributes? in namespace ?llvm? does not name a type
> llvm[2]: Compiling AliasAnalysisEvaluator.cpp for Release build
> /Users/echeng/LLVM/llvm/lib/AsmParser/llvmAsmParser.y: In function
> ?int llvmAsmparse()?:
> /Users/echeng/LLVM/llvm/lib/AsmParser/llvmAsmParser.y:1264: error:
> ?union YYSTYPE? has no member named ?ParamAttrs?
> /Users/echeng/LLVM/llvm/lib/AsmParser/llvmAsmParser.y:1265: error:
> ?union YYSTYPE? has no member named ?ParamAttrs?
>
> Can you check?

I forgot to check-in .y files. Just a second.
-
Devang
>
>
> Thanks,
>
> Evan
>
> On Sep 23, 2008, at 4:03 PM, Devang Patel wrote:
>
>> Author: dpatel
>> Date: Tue Sep 23 18:03:40 2008
>> New Revision: 56513
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=56513&view=rev
>> Log:
>> s/ParameterAttributes/Attributes/g
>>
>>
>> Added:
>>   llvm/trunk/include/llvm/Attributes.h
>>     - copied, changed from r56511, llvm/trunk/include/llvm/
>> ParameterAttributes.h
>>   llvm/trunk/lib/VMCore/Attributes.cpp
>>     - copied, changed from r56511, llvm/trunk/lib/VMCore/
>> ParameterAttributes.cpp
>> Removed:
>>   llvm/trunk/include/llvm/ParameterAttributes.h
>>   llvm/trunk/lib/VMCore/ParameterAttributes.cpp
>> Modified:
>>   llvm/trunk/include/llvm/Argument.h
>>   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/ParserInternals.h
>>   llvm/trunk/lib/Bitcode/Reader/BitcodeReader.h
>>   llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.h
>>   llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
>>   llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
>>   llvm/trunk/lib/ExecutionEngine/Interpreter/Execution.cpp
>>   llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp
>>   llvm/trunk/lib/Target/MSIL/MSILWriter.cpp
>>   llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp
>>   llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp
>>   llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp
>>   llvm/trunk/lib/Transforms/IPO/PruneEH.cpp
>>   llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp
>>   llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp
>>   llvm/trunk/lib/Transforms/Scalar/MemCpyOptimizer.cpp
>>   llvm/trunk/lib/Transforms/Scalar/SimplifyCFGPass.cpp
>>   llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp
>>   llvm/trunk/lib/VMCore/AsmWriter.cpp
>>   llvm/trunk/lib/VMCore/Function.cpp
>>   llvm/trunk/lib/VMCore/Instructions.cpp
>>   llvm/trunk/lib/VMCore/Verifier.cpp
>>
>> Modified: llvm/trunk/include/llvm/Argument.h
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Argument.h?rev=56513&r1=56512&r2=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- llvm/trunk/include/llvm/Argument.h (original)
>> +++ llvm/trunk/include/llvm/Argument.h Tue Sep 23 18:03:40 2008
>> @@ -15,7 +15,7 @@
>> #define LLVM_ARGUMENT_H
>>
>> #include "llvm/Value.h"
>> -#include "llvm/ParameterAttributes.h"
>> +#include "llvm/Attributes.h"
>> #include "llvm/ADT/ilist_node.h"
>>
>> namespace llvm {
>> @@ -61,10 +61,10 @@
>>  bool hasStructRetAttr() const;
>>
>>  /// addAttr - Add a ParamAttr to an argument
>> -  void addAttr(ParameterAttributes);
>> +  void addAttr(Attributes);
>>
>>  /// removeAttr - Remove a ParamAttr from an argument
>> -  void removeAttr(ParameterAttributes);
>> +  void removeAttr(Attributes);
>>
>>  /// classof - Methods for support type inquiry through isa, cast,
>> and
>>  /// dyn_cast:
>>
>> Copied: llvm/trunk/include/llvm/Attributes.h (from r56511, llvm/
>> trunk/include/llvm/ParameterAttributes.h)
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Attributes.h?p2=llvm/trunk/include/llvm/Attributes.h&p1=llvm/trunk/include/llvm/ParameterAttributes.h&r1=56511&r2=56513&rev=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- llvm/trunk/include/llvm/ParameterAttributes.h (original)
>> +++ llvm/trunk/include/llvm/Attributes.h Tue Sep 23 18:03:40 2008
>> @@ -1,4 +1,4 @@
>> -//===-- llvm/ParameterAttributes.h - Container for ParamAttrs ---*-
>> C++ -*-===//
>> +//===-- llvm/Attributes.h - Container for ParamAttrs ---*- C++ -*-
>> ===//
>> //
>> //                     The LLVM Compiler Infrastructure
>> //
>> @@ -20,8 +20,8 @@
>> namespace llvm {
>> class Type;
>>
>> -/// ParameterAttributes - A bitset of attributes for a parameter.
>> -typedef unsigned ParameterAttributes;
>> +/// Attributes - A bitset of attributes for a parameter.
>> +typedef unsigned Attributes;
>>
>> namespace ParamAttr {
>>
>> @@ -30,7 +30,6 @@
>> /// lists the attributes that can be associated with parameters or
>> function
>> /// results.
>> /// @brief Function parameter attributes.
>> -typedef ParameterAttributes Attributes;
>>
>> const Attributes None      = 0;     ///< No attributes have been set
>> const Attributes ZExt      = 1<<0;  ///< Zero extended before/after
>> call
>> @@ -74,26 +73,26 @@
>> Attributes typeIncompatible(const Type *Ty);
>>
>> /// This turns an int alignment (a power of 2, normally) into the
>> -/// form used internally in ParameterAttributes.
>> -inline ParamAttr::Attributes constructAlignmentFromInt(unsigned i) {
>> +/// form used internally in Attributes.
>> +inline Attributes constructAlignmentFromInt(unsigned i) {
>>  return (i << 16);
>> }
>>
>> -/// The set of ParameterAttributes set in Attributes is converted
>> to a
>> +/// The set of Attributes set in Attributes is converted to a
>> /// string of equivalent mnemonics. This is, presumably, for writing
>> out
>> /// the mnemonics for the assembly writer.
>> /// @brief Convert parameter attribute bits to text
>> -std::string getAsString(ParameterAttributes Attrs);
>> +std::string getAsString(Attributes Attrs);
>> } // end namespace ParamAttr
>>
>>
>> /// This is just a pair of values to associate a set of parameter
>> attributes
>> /// with a parameter index.
>> struct ParamAttrsWithIndex {
>> -  ParameterAttributes Attrs; ///< The attributes that are set, or'd
>> together.
>> +  Attributes Attrs; ///< The attributes that are set, or'd together.
>>  unsigned Index; ///< Index of the parameter for which the
>> attributes apply.
>>
>> -  static ParamAttrsWithIndex get(unsigned Idx, ParameterAttributes
>> Attrs) {
>> +  static ParamAttrsWithIndex get(unsigned Idx, Attributes Attrs) {
>>    ParamAttrsWithIndex P;
>>    P.Index = Idx;
>>    P.Attrs = Attrs;
>> @@ -137,12 +136,12 @@
>>  /// addAttr - Add the specified attribute at the specified index
>> to this
>>  /// attribute list.  Since parameter attribute lists are
>> immutable, this
>>  /// returns the new list.
>> -  PAListPtr addAttr(unsigned Idx, ParameterAttributes Attrs) const;
>> +  PAListPtr addAttr(unsigned Idx, Attributes Attrs) const;
>>
>>  /// removeAttr - Remove the specified attribute at the specified
>> index from
>>  /// this attribute list.  Since parameter attribute lists are
>> immutable, this
>>  /// returns the new list.
>> -  PAListPtr removeAttr(unsigned Idx, ParameterAttributes Attrs)
>> const;
>> +  PAListPtr removeAttr(unsigned Idx, Attributes Attrs) const;
>>
>>  //
>> =
>> =
>> =--------------------------------------------------------------------
>> ===//
>>  // Parameter Attribute List Accessors
>> @@ -150,11 +149,11 @@
>>
>>  /// getParamAttrs - The parameter attributes for the specified
>> parameter are
>>  /// returned.  Parameters for the result are denoted with Idx = 0.
>> -  ParameterAttributes getParamAttrs(unsigned Idx) const;
>> +  Attributes getParamAttrs(unsigned Idx) const;
>>
>>  /// paramHasAttr - Return true if the specified parameter index
>> has the
>>  /// specified attribute set.
>> -  bool paramHasAttr(unsigned Idx, ParameterAttributes Attr) const {
>> +  bool paramHasAttr(unsigned Idx, Attributes Attr) const {
>>    return getParamAttrs(Idx) & Attr;
>>  }
>>
>> @@ -166,7 +165,7 @@
>>
>>  /// hasAttrSomewhere - Return true if the specified attribute is
>> set for at
>>  /// least one parameter or for the return value.
>> -  bool hasAttrSomewhere(ParameterAttributes Attr) const;
>> +  bool hasAttrSomewhere(Attributes Attr) const;
>>
>>  /// operator==/!= - Provide equality predicates.
>>  bool operator==(const PAListPtr &RHS) const { return PAList ==
>> RHS.PAList; }
>>
>> Modified: llvm/trunk/include/llvm/Function.h
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Function.h?rev=56513&r1=56512&r2=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- llvm/trunk/include/llvm/Function.h (original)
>> +++ llvm/trunk/include/llvm/Function.h Tue Sep 23 18:03:40 2008
>> @@ -22,7 +22,7 @@
>> #include "llvm/BasicBlock.h"
>> #include "llvm/Argument.h"
>> #include "llvm/Support/Annotation.h"
>> -#include "llvm/ParameterAttributes.h"
>> +#include "llvm/Attributes.h"
>>
>> namespace llvm {
>>
>> @@ -150,14 +150,14 @@
>>
>>
>>  /// hasNote - Return true if this function has given note.
>> -  bool hasNote(ParameterAttributes N) const {
>> +  bool hasNote(Attributes N) const {
>>  	// Notes are stored at ~0 index in parameter attribute list
>>    return (!isDeclaration() && paramHasAttr(~0, N));
>>  }
>>
>>  /// setNotes - Set notes for this function
>>  ///
>> -  void setNotes(const ParameterAttributes N) {
>> +  void setNotes(const Attributes N) {
>>  	// Notes are stored at ~0 index in parameter attribute list
>>  	addParamAttr(~0, N);
>>  }
>> @@ -170,15 +170,15 @@
>>  void clearGC();
>>
>>  /// @brief Determine whether the function has the given attribute.
>> -  bool paramHasAttr(unsigned i, ParameterAttributes attr) const {
>> +  bool paramHasAttr(unsigned i, Attributes attr) const {
>>    return ParamAttrs.paramHasAttr(i, attr);
>>  }
>>
>>  /// addParamAttr - adds the attribute to the list of attributes.
>> -  void addParamAttr(unsigned i, ParameterAttributes attr);
>> +  void addParamAttr(unsigned i, Attributes attr);
>>
>>  /// removeParamAttr - removes the attribute from the list of
>> attributes.
>> -  void removeParamAttr(unsigned i, ParameterAttributes attr);
>> +  void removeParamAttr(unsigned i, Attributes attr);
>>
>>  /// @brief Extract the alignment for a call or parameter
>> (0=unknown).
>>  unsigned getParamAlignment(unsigned i) const {
>>
>> Modified: llvm/trunk/include/llvm/Instructions.h
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Instructions.h?rev=56513&r1=56512&r2=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- llvm/trunk/include/llvm/Instructions.h (original)
>> +++ llvm/trunk/include/llvm/Instructions.h Tue Sep 23 18:03:40 2008
>> @@ -20,7 +20,7 @@
>>
>> #include "llvm/InstrTypes.h"
>> #include "llvm/DerivedTypes.h"
>> -#include "llvm/ParameterAttributes.h"
>> +#include "llvm/Attributes.h"
>> #include "llvm/BasicBlock.h"
>> #include "llvm/ADT/SmallVector.h"
>>
>> @@ -1081,10 +1081,10 @@
>>  void setParamAttrs(const PAListPtr &Attrs) { ParamAttrs = Attrs; }
>>
>>  /// addParamAttr - adds the attribute to the list of attributes.
>> -  void addParamAttr(unsigned i, ParameterAttributes attr);
>> +  void addParamAttr(unsigned i, Attributes attr);
>>
>>  /// removeParamAttr - removes the attribute from the list of
>> attributes.
>> -  void removeParamAttr(unsigned i, ParameterAttributes attr);
>> +  void removeParamAttr(unsigned i, Attributes attr);
>>
>>  /// @brief Determine whether the call or the callee has the given
>> attribute.
>>  bool paramHasAttr(unsigned i, unsigned attr) const;
>> @@ -2440,13 +2440,13 @@
>>  void setParamAttrs(const PAListPtr &Attrs) { ParamAttrs = Attrs; }
>>
>>  /// @brief Determine whether the call or the callee has the given
>> attribute.
>> -  bool paramHasAttr(unsigned i, ParameterAttributes attr) const;
>> +  bool paramHasAttr(unsigned i, Attributes attr) const;
>>
>>  /// addParamAttr - adds the attribute to the list of attributes.
>> -  void addParamAttr(unsigned i, ParameterAttributes attr);
>> +  void addParamAttr(unsigned i, Attributes attr);
>>
>>  /// removeParamAttr - removes the attribute from the list of
>> attributes.
>> -  void removeParamAttr(unsigned i, ParameterAttributes attr);
>> +  void removeParamAttr(unsigned i, Attributes attr);
>>
>>  /// @brief Extract the alignment for a call or parameter
>> (0=unknown).
>>  unsigned getParamAlignment(unsigned i) const {
>>
>> Removed: llvm/trunk/include/llvm/ParameterAttributes.h
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ParameterAttributes.h?rev=56512&view=auto
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- llvm/trunk/include/llvm/ParameterAttributes.h (original)
>> +++ llvm/trunk/include/llvm/ParameterAttributes.h (removed)
>> @@ -1,212 +0,0 @@
>> -//===-- llvm/ParameterAttributes.h - Container for ParamAttrs ---*-
>> C++ -*-===//
>> -//
>> -//                     The LLVM Compiler Infrastructure
>> -//
>> -// This file is distributed under the University of Illinois Open
>> Source
>> -// License. See LICENSE.TXT for details.
>> -//
>> -//
>> =
>> =
>> =
>> ----------------------------------------------------------------------=
>> ==//
>> -//
>> -// This file contains the simple types necessary to represent the
>> parameter
>> -// attributes associated with functions and their calls.
>> -//
>> -//
>> =
>> =
>> =
>> ----------------------------------------------------------------------=
>> ==//
>> -
>> -#ifndef LLVM_PARAMETER_ATTRIBUTES_H
>> -#define LLVM_PARAMETER_ATTRIBUTES_H
>> -
>> -#include <string>
>> -
>> -namespace llvm {
>> -class Type;
>> -
>> -/// ParameterAttributes - A bitset of attributes for a parameter.
>> -typedef unsigned ParameterAttributes;
>> -
>> -namespace ParamAttr {
>> -
>> -/// Function parameters and results can have attributes to indicate
>> how they
>> -/// should be treated by optimizations and code generation. This
>> enumeration
>> -/// lists the attributes that can be associated with parameters or
>> function
>> -/// results.
>> -/// @brief Function parameter attributes.
>> -typedef ParameterAttributes Attributes;
>> -
>> -const Attributes None      = 0;     ///< No attributes have been set
>> -const Attributes ZExt      = 1<<0;  ///< Zero extended before/after
>> call
>> -const Attributes SExt      = 1<<1;  ///< Sign extended before/after
>> call
>> -const Attributes NoReturn  = 1<<2;  ///< Mark the function as not
>> returning
>> -const Attributes InReg     = 1<<3;  ///< Force argument to be
>> passed in register
>> -const Attributes StructRet = 1<<4;  ///< Hidden pointer to
>> structure to return
>> -const Attributes NoUnwind  = 1<<5;  ///< Function doesn't unwind
>> stack
>> -const Attributes NoAlias   = 1<<6;  ///< Considered to not alias
>> after call
>> -const Attributes ByVal     = 1<<7;  ///< Pass structure by value
>> -const Attributes Nest      = 1<<8;  ///< Nested function static  
>> chain
>> -const Attributes ReadNone  = 1<<9;  ///< Function does not access
>> memory
>> -const Attributes ReadOnly  = 1<<10; ///< Function only reads from
>> memory
>> -const Attributes Alignment = 0xffff<<16; ///< Alignment of
>> parameter (16 bits)
>> -                                    // 0 = unknown, else in clear
>> (not log)
>> -
>> -/// Function notes are implemented as attributes stored at index ~0
>> in
>> -/// parameter attribute list.
>> -const Attributes FN_NOTE_None            = 0;
>> -const Attributes FN_NOTE_NoInline        = 1<<0; // inline=never
>> -const Attributes FN_NOTE_AlwaysInline    = 1<<1; // inline=always
>> -const Attributes FN_NOTE_OptimizeForSize = 1<<2; // opt_size
>> -
>> -/// @brief Attributes that only apply to function parameters.
>> -const Attributes ParameterOnly = ByVal | Nest | StructRet;
>> -
>> -/// @brief Attributes that only apply to function return values.
>> -const Attributes ReturnOnly = NoReturn | NoUnwind | ReadNone |
>> ReadOnly;
>> -
>> -/// @brief Parameter attributes that do not apply to vararg call
>> arguments.
>> -const Attributes VarArgsIncompatible = StructRet;
>> -
>> -/// @brief Attributes that are mutually incompatible.
>> -const Attributes MutuallyIncompatible[3] = {
>> -  ByVal | InReg | Nest  | StructRet,
>> -  ZExt  | SExt,
>> -  ReadNone | ReadOnly
>> -};
>> -
>> -/// @brief Which attributes cannot be applied to a type.
>> -Attributes typeIncompatible(const Type *Ty);
>> -
>> -/// This turns an int alignment (a power of 2, normally) into the
>> -/// form used internally in ParameterAttributes.
>> -inline ParamAttr::Attributes constructAlignmentFromInt(unsigned i) {
>> -  return (i << 16);
>> -}
>> -
>> -/// The set of ParameterAttributes set in Attributes is converted
>> to a
>> -/// string of equivalent mnemonics. This is, presumably, for
>> writing out
>> -/// the mnemonics for the assembly writer.
>> -/// @brief Convert parameter attribute bits to text
>> -std::string getAsString(ParameterAttributes Attrs);
>> -} // end namespace ParamAttr
>> -
>> -
>> -/// This is just a pair of values to associate a set of parameter
>> attributes
>> -/// with a parameter index.
>> -struct ParamAttrsWithIndex {
>> -  ParameterAttributes Attrs; ///< The attributes that are set, or'd
>> together.
>> -  unsigned Index; ///< Index of the parameter for which the
>> attributes apply.
>> -
>> -  static ParamAttrsWithIndex get(unsigned Idx, ParameterAttributes
>> Attrs) {
>> -    ParamAttrsWithIndex P;
>> -    P.Index = Idx;
>> -    P.Attrs = Attrs;
>> -    return P;
>> -  }
>> -};
>> -
>> -//
>> =
>> =
>> =
>> ----------------------------------------------------------------------=
>> ==//
>> -// PAListPtr Smart Pointer
>> -//
>> =
>> =
>> =
>> ----------------------------------------------------------------------=
>> ==//
>> -
>> -class ParamAttributeListImpl;
>> -
>> -/// PAListPtr - This class manages the ref count for the opaque
>> -/// ParamAttributeListImpl object and provides accessors for it.
>> -class PAListPtr {
>> -  /// PAList - The parameter attributes that we are managing.  This
>> can be null
>> -  /// to represent the empty parameter attributes list.
>> -  ParamAttributeListImpl *PAList;
>> -public:
>> -  PAListPtr() : PAList(0) {}
>> -  PAListPtr(const PAListPtr &P);
>> -  const PAListPtr &operator=(const PAListPtr &RHS);
>> -  ~PAListPtr();
>> -
>> -  //
>> =
>> =
>> =--------------------------------------------------------------------
>> ===//
>> -  // Parameter Attribute List Construction and Mutation
>> -  //
>> =
>> =
>> =--------------------------------------------------------------------
>> ===//
>> -
>> -  /// get - Return a ParamAttrs list with the specified parameter
>> in it.
>> -  static PAListPtr get(const ParamAttrsWithIndex *Attr, unsigned
>> NumAttrs);
>> -
>> -  /// get - Return a ParamAttr list with the parameters specified
>> by the
>> -  /// consecutive random access iterator range.
>> -  template <typename Iter>
>> -  static PAListPtr get(const Iter &I, const Iter &E) {
>> -    if (I == E) return PAListPtr();  // Empty list.
>> -    return get(&*I, static_cast<unsigned>(E-I));
>> -  }
>> -
>> -  /// addAttr - Add the specified attribute at the specified index
>> to this
>> -  /// attribute list.  Since parameter attribute lists are
>> immutable, this
>> -  /// returns the new list.
>> -  PAListPtr addAttr(unsigned Idx, ParameterAttributes Attrs) const;
>> -
>> -  /// removeAttr - Remove the specified attribute at the specified
>> index from
>> -  /// this attribute list.  Since parameter attribute lists are
>> immutable, this
>> -  /// returns the new list.
>> -  PAListPtr removeAttr(unsigned Idx, ParameterAttributes Attrs)
>> const;
>> -
>> -  //
>> =
>> =
>> =--------------------------------------------------------------------
>> ===//
>> -  // Parameter Attribute List Accessors
>> -  //
>> =
>> =
>> =--------------------------------------------------------------------
>> ===//
>> -
>> -  /// getParamAttrs - The parameter attributes for the specified
>> parameter are
>> -  /// returned.  Parameters for the result are denoted with Idx = 0.
>> -  ParameterAttributes getParamAttrs(unsigned Idx) const;
>> -
>> -  /// paramHasAttr - Return true if the specified parameter index
>> has the
>> -  /// specified attribute set.
>> -  bool paramHasAttr(unsigned Idx, ParameterAttributes Attr) const {
>> -    return getParamAttrs(Idx) & Attr;
>> -  }
>> -
>> -  /// getParamAlignment - Return the alignment for the specified
>> function
>> -  /// parameter.
>> -  unsigned getParamAlignment(unsigned Idx) const {
>> -    return (getParamAttrs(Idx) & ParamAttr::Alignment) >> 16;
>> -  }
>> -
>> -  /// hasAttrSomewhere - Return true if the specified attribute is
>> set for at
>> -  /// least one parameter or for the return value.
>> -  bool hasAttrSomewhere(ParameterAttributes Attr) const;
>> -
>> -  /// operator==/!= - Provide equality predicates.
>> -  bool operator==(const PAListPtr &RHS) const { return PAList ==
>> RHS.PAList; }
>> -  bool operator!=(const PAListPtr &RHS) const { return PAList !=
>> RHS.PAList; }
>> -
>> -  void dump() const;
>> -
>> -  //
>> =
>> =
>> =--------------------------------------------------------------------
>> ===//
>> -  // Parameter Attribute List Introspection
>> -  //
>> =
>> =
>> =--------------------------------------------------------------------
>> ===//
>> -
>> -  /// getRawPointer - Return a raw pointer that uniquely identifies
>> this
>> -  /// parameter attribute list.
>> -  void *getRawPointer() const {
>> -    return PAList;
>> -  }
>> -
>> -  // Parameter attributes are stored as a dense set of slots, where
>> there is one
>> -  // slot for each argument that has an attribute.  This allows
>> walking over the
>> -  // dense set instead of walking the sparse list of attributes.
>> -
>> -  /// isEmpty - Return true if no parameters have an attribute.
>> -  ///
>> -  bool isEmpty() const {
>> -    return PAList == 0;
>> -  }
>> -
>> -  /// getNumSlots - Return the number of slots used in this
>> attribute list.
>> -  /// This is the number of arguments that have an attribute set on
>> them
>> -  /// (including the function itself).
>> -  unsigned getNumSlots() const;
>> -
>> -  /// getSlot - Return the ParamAttrsWithIndex at the specified
>> slot.  This
>> -  /// holds a parameter number plus a set of attributes.
>> -  const ParamAttrsWithIndex &getSlot(unsigned Slot) const;
>> -
>> -private:
>> -  explicit PAListPtr(ParamAttributeListImpl *L);
>> -};
>> -
>> -} // End llvm namespace
>> -
>> -#endif
>>
>> Modified: llvm/trunk/include/llvm/Support/CallSite.h
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/CallSite.h?rev=56513&r1=56512&r2=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/include/llvm/Support/CallSite.h (original)
>> +++ llvm/trunk/include/llvm/Support/CallSite.h Tue Sep 23 18:03:40
>> 2008
>> @@ -22,7 +22,7 @@
>>
>> #include "llvm/Instruction.h"
>> #include "llvm/BasicBlock.h"
>> -#include "llvm/ParameterAttributes.h"
>> +#include "llvm/Attributes.h"
>>
>> namespace llvm {
>>
>> @@ -68,7 +68,7 @@
>>  void setParamAttrs(const PAListPtr &PAL);
>>
>>  /// paramHasAttr - whether the call or the callee has the given
>> attribute.
>> -  bool paramHasAttr(uint16_t i, ParameterAttributes attr) const;
>> +  bool paramHasAttr(uint16_t i, Attributes attr) const;
>>
>>  /// @brief Extract the alignment for a call or parameter
>> (0=unknown).
>>  uint16_t getParamAlignment(uint16_t i) const;
>>
>> Modified: llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp?rev=56513&r1=56512&r2=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp (original)
>> +++ llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp Tue Sep 23
>> 18:03:40 2008
>> @@ -18,7 +18,6 @@
>> #include "llvm/Constants.h"
>> #include "llvm/DerivedTypes.h"
>> #include "llvm/Function.h"
>> -#include "llvm/ParameterAttributes.h"
>> #include "llvm/GlobalVariable.h"
>> #include "llvm/Instructions.h"
>> #include "llvm/IntrinsicInst.h"
>>
>> Modified: llvm/trunk/lib/AsmParser/ParserInternals.h
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/ParserInternals.h?rev=56513&r1=56512&r2=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/AsmParser/ParserInternals.h (original)
>> +++ llvm/trunk/lib/AsmParser/ParserInternals.h Tue Sep 23 18:03:40
>> 2008
>> @@ -17,7 +17,7 @@
>>
>> #include "llvm/Constants.h"
>> #include "llvm/DerivedTypes.h"
>> -#include "llvm/ParameterAttributes.h"
>> +#include "llvm/Attributes.h"
>> #include "llvm/Function.h"
>> #include "llvm/Instructions.h"
>> #include "llvm/Assembly/Parser.h"
>> @@ -232,13 +232,13 @@
>>
>> struct TypeWithAttrs {
>>  llvm::PATypeHolder *Ty;
>> -  ParameterAttributes Attrs;
>> +  Attributes Attrs;
>> };
>>
>> typedef std::vector<TypeWithAttrs> TypeWithAttrsList;
>>
>> struct ArgListEntry {
>> -  ParameterAttributes Attrs;
>> +  Attributes Attrs;
>>  llvm::PATypeHolder *Ty;
>>  std::string *Name;
>> };
>> @@ -247,7 +247,7 @@
>>
>> struct ParamListEntry {
>>  Value *Val;
>> -  ParameterAttributes Attrs;
>> +  Attributes Attrs;
>> };
>>
>> typedef std::vector<ParamListEntry> ParamList;
>>
>> Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.h
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.h?rev=56513&r1=56512&r2=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.h (original)
>> +++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.h Tue Sep 23
>> 18:03:40 2008
>> @@ -15,7 +15,7 @@
>> #define BITCODE_READER_H
>>
>> #include "llvm/ModuleProvider.h"
>> -#include "llvm/ParameterAttributes.h"
>> +#include "llvm/Attributes.h"
>> #include "llvm/Type.h"
>> #include "llvm/OperandTraits.h"
>> #include "llvm/Bitcode/BitstreamReader.h"
>>
>> Modified: llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.h
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.h?rev=56513&r1=56512&r2=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.h (original)
>> +++ llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.h Tue Sep 23
>> 18:03:40 2008
>> @@ -15,7 +15,7 @@
>> #define VALUE_ENUMERATOR_H
>>
>> #include "llvm/ADT/DenseMap.h"
>> -#include "llvm/ParameterAttributes.h"
>> +#include "llvm/Attributes.h"
>> #include <vector>
>>
>> namespace llvm {
>>
>> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp?rev=56513&r1=56512&r2=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
>> (original)
>> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Tue
>> Sep 23 18:03:40 2008
>> @@ -25,7 +25,6 @@
>> #include "llvm/Instructions.h"
>> #include "llvm/Intrinsics.h"
>> #include "llvm/IntrinsicInst.h"
>> -#include "llvm/ParameterAttributes.h"
>> #include "llvm/CodeGen/FastISel.h"
>> #include "llvm/CodeGen/GCStrategy.h"
>> #include "llvm/CodeGen/GCMetadata.h"
>>
>> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp?rev=56513&r1=56512&r2=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
>> (original)
>> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Tue Sep
>> 23 18:03:40 2008
>> @@ -25,7 +25,6 @@
>> #include "llvm/Instructions.h"
>> #include "llvm/Intrinsics.h"
>> #include "llvm/IntrinsicInst.h"
>> -#include "llvm/ParameterAttributes.h"
>> #include "llvm/CodeGen/FastISel.h"
>> #include "llvm/CodeGen/GCStrategy.h"
>> #include "llvm/CodeGen/GCMetadata.h"
>>
>> Modified: llvm/trunk/lib/ExecutionEngine/Interpreter/Execution.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Interpreter/Execution.cpp?rev=56513&r1=56512&r2=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/ExecutionEngine/Interpreter/Execution.cpp
>> (original)
>> +++ llvm/trunk/lib/ExecutionEngine/Interpreter/Execution.cpp Tue Sep
>> 23 18:03:40 2008
>> @@ -16,7 +16,6 @@
>> #include "llvm/Constants.h"
>> #include "llvm/DerivedTypes.h"
>> #include "llvm/Instructions.h"
>> -#include "llvm/ParameterAttributes.h"
>> #include "llvm/CodeGen/IntrinsicLowering.h"
>> #include "llvm/Support/GetElementPtrTypeIterator.h"
>> #include "llvm/ADT/APInt.h"
>>
>> Modified: llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp?rev=56513&r1=56512&r2=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp (original)
>> +++ llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp Tue Sep 23
>> 18:03:40 2008
>> @@ -438,7 +438,7 @@
>>      Out << "ParamAttrsWithIndex PAWI;"; nl(Out);
>>      for (unsigned i = 0; i < PAL.getNumSlots(); ++i) {
>>        uint16_t index = PAL.getSlot(i).Index;
>> -        ParameterAttributes attrs = PAL.getSlot(i).Attrs;
>> +        Attributes attrs = PAL.getSlot(i).Attrs;
>>        Out << "PAWI.Index = " << index << "; PAWI.Attrs = 0 ";
>>        if (attrs & ParamAttr::SExt)
>>          Out << " | ParamAttr::SExt";
>>
>> Modified: llvm/trunk/lib/Target/MSIL/MSILWriter.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/MSIL/MSILWriter.cpp?rev=56513&r1=56512&r2=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/Target/MSIL/MSILWriter.cpp (original)
>> +++ llvm/trunk/lib/Target/MSIL/MSILWriter.cpp Tue Sep 23 18:03:40  
>> 2008
>> @@ -16,7 +16,6 @@
>> #include "llvm/DerivedTypes.h"
>> #include "llvm/Intrinsics.h"
>> #include "llvm/IntrinsicInst.h"
>> -#include "llvm/ParameterAttributes.h"
>> #include "llvm/TypeSymbolTable.h"
>> #include "llvm/Analysis/ConstantsScanner.h"
>> #include "llvm/Support/CallSite.h"
>>
>> Modified: llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp?rev=56513&r1=56512&r2=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp (original)
>> +++ llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp Tue Sep 23
>> 18:03:40 2008
>> @@ -29,7 +29,6 @@
>> #include "llvm/Constants.h"
>> #include "llvm/Function.h"
>> #include "llvm/Intrinsics.h"
>> -#include "llvm/ParameterAttributes.h"
>> #include "llvm/Support/MathExtras.h"
>> #include "llvm/Target/TargetOptions.h"
>> #include "llvm/Support/CommandLine.h"
>>
>> Modified: llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp?rev=56513&r1=56512&r2=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp (original)
>> +++ llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp Tue Sep 23
>> 18:03:40 2008
>> @@ -508,7 +508,7 @@
>>  const PAListPtr &PAL = F->getParamAttrs();
>>
>>  // Add any return attributes.
>> -  if (ParameterAttributes attrs = PAL.getParamAttrs(0))
>> +  if (Attributes attrs = PAL.getParamAttrs(0))
>>    ParamAttrsVec.push_back(ParamAttrsWithIndex::get(0, attrs));
>>
>>  // First, determine the new argument list
>> @@ -525,7 +525,7 @@
>>    } else if (!ArgsToPromote.count(I)) {
>>      // Unchanged argument
>>      Params.push_back(I->getType());
>> -      if (ParameterAttributes attrs = PAL.getParamAttrs(ArgIndex))
>> +      if (Attributes attrs = PAL.getParamAttrs(ArgIndex))
>>
>> ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Params.size(),
>> attrs));
>>    } else if (I->use_empty()) {
>>      // Dead argument (which are always marked as promotable)
>> @@ -621,7 +621,7 @@
>>    const PAListPtr &CallPAL = CS.getParamAttrs();
>>
>>    // Add any return attributes.
>> -    if (ParameterAttributes attrs = CallPAL.getParamAttrs(0))
>> +    if (Attributes attrs = CallPAL.getParamAttrs(0))
>>      ParamAttrsVec.push_back(ParamAttrsWithIndex::get(0, attrs));
>>
>>    // Loop over the operands, inserting GEP and loads in the caller
>> as
>> @@ -633,7 +633,7 @@
>>      if (!ArgsToPromote.count(I) && !ByValArgsToTransform.count(I)) {
>>        Args.push_back(*AI);          // Unmodified argument
>>
>> -        if (ParameterAttributes Attrs =
>> CallPAL.getParamAttrs(ArgIndex))
>> +        if (Attributes Attrs = CallPAL.getParamAttrs(ArgIndex))
>>
>> ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Args.size(),  
>> Attrs));
>>
>>      } else if (ByValArgsToTransform.count(I)) {
>> @@ -688,7 +688,7 @@
>>    // Push any varargs arguments on the list
>>    for (; AI != CS.arg_end(); ++AI, ++ArgIndex) {
>>      Args.push_back(*AI);
>> -      if (ParameterAttributes Attrs =
>> CallPAL.getParamAttrs(ArgIndex))
>> +      if (Attributes Attrs = CallPAL.getParamAttrs(ArgIndex))
>>
>> ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Args.size(),  
>> Attrs));
>>    }
>>
>>
>> Modified: llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp?rev=56513&r1=56512&r2=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp
>> (original)
>> +++ llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp Tue
>> Sep 23 18:03:40 2008
>> @@ -593,7 +593,7 @@
>>  const PAListPtr &PAL = F->getParamAttrs();
>>
>>  // The existing function return attributes.
>> -  ParameterAttributes RAttrs = PAL.getParamAttrs(0);
>> +  Attributes RAttrs = PAL.getParamAttrs(0);
>>
>>
>>  // Find out the new return value.
>> @@ -678,7 +678,7 @@
>>
>>      // Get the original parameter attributes (skipping the first
>> one, that is
>>      // for the return value.
>> -      if (ParameterAttributes Attrs = PAL.getParamAttrs(i + 1))
>> +      if (Attributes Attrs = PAL.getParamAttrs(i + 1))
>>
>> ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Params.size(),
>> Attrs));
>>    } else {
>>      ++NumArgumentsEliminated;
>> @@ -730,7 +730,7 @@
>>    const PAListPtr &CallPAL = CS.getParamAttrs();
>>
>>    // The call return attributes.
>> -    ParameterAttributes RAttrs = CallPAL.getParamAttrs(0);
>> +    Attributes RAttrs = CallPAL.getParamAttrs(0);
>>    // Adjust in case the function was changed to return void.
>>    RAttrs &= ~ParamAttr::typeIncompatible(NF->getReturnType());
>>    if (RAttrs)
>> @@ -746,7 +746,7 @@
>>      if (ArgAlive[i]) {
>>        Args.push_back(*I);
>>        // Get original parameter attributes, but skip return
>> attributes.
>> -        if (ParameterAttributes Attrs = CallPAL.getParamAttrs(i +  
>> 1))
>> +        if (Attributes Attrs = CallPAL.getParamAttrs(i + 1))
>>
>> ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Args.size(),  
>> Attrs));
>>      }
>>
>> @@ -756,7 +756,7 @@
>>    // Push any varargs arguments on the list. Don't forget their
>> attributes.
>>    for (CallSite::arg_iterator E = CS.arg_end(); I != E; ++I, ++i) {
>>      Args.push_back(*I);
>> -      if (ParameterAttributes Attrs = CallPAL.getParamAttrs(i + 1))
>> +      if (Attributes Attrs = CallPAL.getParamAttrs(i + 1))
>>
>> ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Args.size(),  
>> Attrs));
>>    }
>>
>>
>> Modified: llvm/trunk/lib/Transforms/IPO/PruneEH.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/PruneEH.cpp?rev=56513&r1=56512&r2=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/Transforms/IPO/PruneEH.cpp (original)
>> +++ llvm/trunk/lib/Transforms/IPO/PruneEH.cpp Tue Sep 23 18:03:40  
>> 2008
>> @@ -125,7 +125,7 @@
>>  // If the SCC doesn't unwind or doesn't throw, note this fact.
>>  if (!SCCMightUnwind || !SCCMightReturn)
>>    for (unsigned i = 0, e = SCC.size(); i != e; ++i) {
>> -      ParameterAttributes NewAttributes = ParamAttr::None;
>> +      Attributes NewAttributes = ParamAttr::None;
>>
>>      if (!SCCMightUnwind)
>>        NewAttributes |= ParamAttr::NoUnwind;
>>
>> Modified: llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp?rev=56513&r1=56512&r2=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp (original)
>> +++ llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp Tue Sep 23
>> 18:03:40 2008
>> @@ -210,7 +210,7 @@
>>  const PAListPtr &PAL = F->getParamAttrs();
>>
>>  // Add any return attributes.
>> -  if (ParameterAttributes attrs = PAL.getParamAttrs(0))
>> +  if (Attributes attrs = PAL.getParamAttrs(0))
>>    ParamAttrsVec.push_back(ParamAttrsWithIndex::get(0, attrs));
>>
>>  // Skip first argument.
>> @@ -221,7 +221,7 @@
>>  unsigned ParamIndex = 2;
>>  while (I != E) {
>>    Params.push_back(I->getType());
>> -    if (ParameterAttributes Attrs = PAL.getParamAttrs(ParamIndex))
>> +    if (Attributes Attrs = PAL.getParamAttrs(ParamIndex))
>>      ParamAttrsVec.push_back(ParamAttrsWithIndex::get(ParamIndex -
>> 1, Attrs));
>>    ++I;
>>    ++ParamIndex;
>> @@ -264,7 +264,7 @@
>>
>>    const PAListPtr &PAL = F->getParamAttrs();
>>    // Add any return attributes.
>> -    if (ParameterAttributes attrs = PAL.getParamAttrs(0))
>> +    if (Attributes attrs = PAL.getParamAttrs(0))
>>      ArgAttrsVec.push_back(ParamAttrsWithIndex::get(0, attrs));
>>
>>    // Copy arguments, however skip first one.
>> @@ -276,7 +276,7 @@
>>    unsigned ParamIndex = 2;
>>    while (AI != AE) {
>>      Args.push_back(*AI);
>> -      if (ParameterAttributes Attrs = PAL.getParamAttrs(ParamIndex))
>> +      if (Attributes Attrs = PAL.getParamAttrs(ParamIndex))
>>        ArgAttrsVec.push_back(ParamAttrsWithIndex::get(ParamIndex -
>> 1, Attrs));
>>      ++ParamIndex;
>>      ++AI;
>>
>> Modified: llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp?rev=56513&r1=56512&r2=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp
>> (original)
>> +++ llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp Tue
>> Sep 23 18:03:40 2008
>> @@ -9127,7 +9127,7 @@
>>      return false;   // Cannot transform this return value.
>>
>>    if (!CallerPAL.isEmpty() && !Caller->use_empty()) {
>> -      ParameterAttributes RAttrs = CallerPAL.getParamAttrs(0);
>> +      Attributes RAttrs = CallerPAL.getParamAttrs(0);
>>      if (RAttrs & ParamAttr::typeIncompatible(NewRetTy))
>>        return false;   // Attribute not compatible with transformed
>> value.
>>    }
>> @@ -9180,7 +9180,7 @@
>>    for (unsigned i = CallerPAL.getNumSlots(); i; --i) {
>>      if (CallerPAL.getSlot(i - 1).Index <= FT->getNumParams())
>>        break;
>> -      ParameterAttributes PAttrs = CallerPAL.getSlot(i - 1).Attrs;
>> +      Attributes PAttrs = CallerPAL.getSlot(i - 1).Attrs;
>>      if (PAttrs & ParamAttr::VarArgsIncompatible)
>>        return false;
>>    }
>> @@ -9193,7 +9193,7 @@
>>  attrVec.reserve(NumCommonArgs);
>>
>>  // Get any return attributes.
>> -  ParameterAttributes RAttrs = CallerPAL.getParamAttrs(0);
>> +  Attributes RAttrs = CallerPAL.getParamAttrs(0);
>>
>>  // If the return value is not being used, the type may not be
>> compatible
>>  // with the existing attributes.  Wipe out any problematic
>> attributes.
>> @@ -9216,7 +9216,7 @@
>>    }
>>
>>    // Add any parameter attributes.
>> -    if (ParameterAttributes PAttrs = CallerPAL.getParamAttrs(i + 1))
>> +    if (Attributes PAttrs = CallerPAL.getParamAttrs(i + 1))
>>      attrVec.push_back(ParamAttrsWithIndex::get(i + 1, PAttrs));
>>  }
>>
>> @@ -9246,7 +9246,7 @@
>>        }
>>
>>        // Add any parameter attributes.
>> -        if (ParameterAttributes PAttrs = CallerPAL.getParamAttrs(i
>> + 1))
>> +        if (Attributes PAttrs = CallerPAL.getParamAttrs(i + 1))
>>          attrVec.push_back(ParamAttrsWithIndex::get(i + 1, PAttrs));
>>      }
>>    }
>> @@ -9329,7 +9329,7 @@
>>  if (!NestAttrs.isEmpty()) {
>>    unsigned NestIdx = 1;
>>    const Type *NestTy = 0;
>> -    ParameterAttributes NestAttr = ParamAttr::None;
>> +    Attributes NestAttr = ParamAttr::None;
>>
>>    // Look for a parameter marked with the 'nest' attribute.
>>    for (FunctionType::param_iterator I = NestFTy->param_begin(),
>> @@ -9353,7 +9353,7 @@
>>      // mean appending it.  Likewise for attributes.
>>
>>      // Add any function result attributes.
>> -      if (ParameterAttributes Attr = Attrs.getParamAttrs(0))
>> +      if (Attributes Attr = Attrs.getParamAttrs(0))
>>        NewAttrs.push_back(ParamAttrsWithIndex::get(0, Attr));
>>
>>      {
>> @@ -9374,7 +9374,7 @@
>>
>>          // Add the original argument and attributes.
>>          NewArgs.push_back(*I);
>> -          if (ParameterAttributes Attr = Attrs.getParamAttrs(Idx))
>> +          if (Attributes Attr = Attrs.getParamAttrs(Idx))
>>            NewAttrs.push_back
>>              (ParamAttrsWithIndex::get(Idx + (Idx >= NestIdx),
>> Attr));
>>
>>
>> Modified: llvm/trunk/lib/Transforms/Scalar/MemCpyOptimizer.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/MemCpyOptimizer.cpp?rev=56513&r1=56512&r2=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/Transforms/Scalar/MemCpyOptimizer.cpp (original)
>> +++ llvm/trunk/lib/Transforms/Scalar/MemCpyOptimizer.cpp Tue Sep 23
>> 18:03:40 2008
>> @@ -16,7 +16,6 @@
>> #include "llvm/Transforms/Scalar.h"
>> #include "llvm/IntrinsicInst.h"
>> #include "llvm/Instructions.h"
>> -#include "llvm/ParameterAttributes.h"
>> #include "llvm/ADT/SmallVector.h"
>> #include "llvm/ADT/Statistic.h"
>> #include "llvm/Analysis/Dominators.h"
>>
>> Modified: llvm/trunk/lib/Transforms/Scalar/SimplifyCFGPass.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/SimplifyCFGPass.cpp?rev=56513&r1=56512&r2=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/Transforms/Scalar/SimplifyCFGPass.cpp (original)
>> +++ llvm/trunk/lib/Transforms/Scalar/SimplifyCFGPass.cpp Tue Sep 23
>> 18:03:40 2008
>> @@ -27,7 +27,7 @@
>> #include "llvm/Constants.h"
>> #include "llvm/Instructions.h"
>> #include "llvm/Module.h"
>> -#include "llvm/ParameterAttributes.h"
>> +#include "llvm/Attributes.h"
>> #include "llvm/Support/CFG.h"
>> #include "llvm/Support/Compiler.h"
>> #include "llvm/Pass.h"
>>
>> Modified: llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp?rev=56513&r1=56512&r2=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp (original)
>> +++ llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp Tue Sep 23
>> 18:03:40 2008
>> @@ -18,7 +18,7 @@
>> #include "llvm/Module.h"
>> #include "llvm/Instructions.h"
>> #include "llvm/Intrinsics.h"
>> -#include "llvm/ParameterAttributes.h"
>> +#include "llvm/Attributes.h"
>> #include "llvm/Analysis/CallGraph.h"
>> #include "llvm/Target/TargetData.h"
>> #include "llvm/ADT/SmallVector.h"
>>
>> Modified: llvm/trunk/lib/VMCore/AsmWriter.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/AsmWriter.cpp?rev=56513&r1=56512&r2=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/VMCore/AsmWriter.cpp (original)
>> +++ llvm/trunk/lib/VMCore/AsmWriter.cpp Tue Sep 23 18:03:40 2008
>> @@ -1006,7 +1006,7 @@
>>  void write(const Type *Ty)          { printType(Ty);        }
>>
>>  void writeOperand(const Value *Op, bool PrintType);
>> -  void writeParamOperand(const Value *Operand, ParameterAttributes
>> Attrs);
>> +  void writeParamOperand(const Value *Operand, Attributes Attrs);
>>
>>  const Module* getModule() { return TheModule; }
>>
>> @@ -1016,7 +1016,7 @@
>>  void printGlobal(const GlobalVariable *GV);
>>  void printAlias(const GlobalAlias *GV);
>>  void printFunction(const Function *F);
>> -  void printArgument(const Argument *FA, ParameterAttributes Attrs);
>> +  void printArgument(const Argument *FA, Attributes Attrs);
>>  void printBasicBlock(const BasicBlock *BB);
>>  void printInstruction(const Instruction &I);
>>
>> @@ -1126,7 +1126,7 @@
>> }
>>
>> void AssemblyWriter::writeParamOperand(const Value *Operand,
>> -                                       ParameterAttributes Attrs) {
>> +                                       Attributes Attrs) {
>>  if (Operand == 0) {
>>    Out << "<null operand!>";
>>  } else {
>> @@ -1386,7 +1386,7 @@
>>      // Output type...
>>      printType(FT->getParamType(i));
>>
>> -      ParameterAttributes ArgAttrs = Attrs.getParamAttrs(i+1);
>> +      Attributes ArgAttrs = Attrs.getParamAttrs(i+1);
>>      if (ArgAttrs != ParamAttr::None)
>>        Out << ' ' << ParamAttr::getAsString(ArgAttrs);
>>    }
>> @@ -1398,7 +1398,7 @@
>>    Out << "...";  // Output varargs portion of signature!
>>  }
>>  Out << ')';
>> -  ParameterAttributes RetAttrs = Attrs.getParamAttrs(0);
>> +  Attributes RetAttrs = Attrs.getParamAttrs(0);
>>  if (RetAttrs != ParamAttr::None)
>>    Out << ' ' << ParamAttr::getAsString(Attrs.getParamAttrs(0));
>>  if (F->hasSection())
>> @@ -1454,7 +1454,7 @@
>> /// the function.  Simply print it out
>> ///
>> void AssemblyWriter::printArgument(const Argument *Arg,
>> -                                   ParameterAttributes Attrs) {
>> +                                   Attributes Attrs) {
>>  // Output type...
>>  printType(Arg->getType());
>>
>>
>> Copied: llvm/trunk/lib/VMCore/Attributes.cpp (from r56511, llvm/
>> trunk/lib/VMCore/ParameterAttributes.cpp)
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Attributes.cpp?p2=llvm/trunk/lib/VMCore/Attributes.cpp&p1=llvm/trunk/lib/VMCore/ParameterAttributes.cpp&r1=56511&r2=56513&rev=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/VMCore/ParameterAttributes.cpp (original)
>> +++ llvm/trunk/lib/VMCore/Attributes.cpp Tue Sep 23 18:03:40 2008
>> @@ -1,4 +1,4 @@
>> -//===-- ParameterAttributes.cpp - Implement ParamAttrsList
>> ----------------===//
>> +//===-- Attributes.cpp - Implement ParamAttrsList ----------------
>> ===//
>> //
>> //                     The LLVM Compiler Infrastructure
>> //
>> @@ -11,7 +11,7 @@
>> //
>> //
>> =
>> =
>> =
>> ----------------------------------------------------------------------=
>> ==//
>>
>> -#include "llvm/ParameterAttributes.h"
>> +#include "llvm/Attributes.h"
>> #include "llvm/Type.h"
>> #include "llvm/ADT/StringExtras.h"
>> #include "llvm/ADT/FoldingSet.h"
>> @@ -23,7 +23,7 @@
>> // ParamAttr Function Definitions
>> //
>> =
>> =
>> =
>> ----------------------------------------------------------------------=
>> ==//
>>
>> -std::string ParamAttr::getAsString(ParameterAttributes Attrs) {
>> +std::string ParamAttr::getAsString(Attributes Attrs) {
>>  std::string Result;
>>  if (Attrs & ParamAttr::ZExt)
>>    Result += "zeroext ";
>> @@ -57,8 +57,8 @@
>>  return Result;
>> }
>>
>> -ParameterAttributes ParamAttr::typeIncompatible(const Type *Ty) {
>> -  ParameterAttributes Incompatible = None;
>> +Attributes ParamAttr::typeIncompatible(const Type *Ty) {
>> +  Attributes Incompatible = None;
>>
>>  if (!Ty->isInteger())
>>    // Attributes that only apply to integers.
>> @@ -187,7 +187,7 @@
>> /// getParamAttrs - The parameter attributes for the specified
>> parameter are
>> /// returned.  Parameters for the result are denoted with Idx = 0.
>> /// Function notes are denoted with idx = ~0.
>> -ParameterAttributes PAListPtr::getParamAttrs(unsigned Idx) const {
>> +Attributes PAListPtr::getParamAttrs(unsigned Idx) const {
>>  if (PAList == 0) return ParamAttr::None;
>>
>>  const SmallVector<ParamAttrsWithIndex, 4> &Attrs = PAList->Attrs;
>> @@ -199,7 +199,7 @@
>>
>> /// hasAttrSomewhere - Return true if the specified attribute is set
>> for at
>> /// least one parameter or for the return value.
>> -bool PAListPtr::hasAttrSomewhere(ParameterAttributes Attr) const {
>> +bool PAListPtr::hasAttrSomewhere(Attributes Attr) const {
>>  if (PAList == 0) return false;
>>
>>  const SmallVector<ParamAttrsWithIndex, 4> &Attrs = PAList->Attrs;
>> @@ -210,18 +210,18 @@
>> }
>>
>>
>> -PAListPtr PAListPtr::addAttr(unsigned Idx, ParameterAttributes
>> Attrs) const {
>> -  ParameterAttributes OldAttrs = getParamAttrs(Idx);
>> +PAListPtr PAListPtr::addAttr(unsigned Idx, Attributes Attrs) const {
>> +  Attributes OldAttrs = getParamAttrs(Idx);
>> #ifndef NDEBUG
>>  // FIXME it is not obvious how this should work for alignment.
>>  // For now, say we can't change a known alignment.
>> -  ParameterAttributes OldAlign = OldAttrs & ParamAttr::Alignment;
>> -  ParameterAttributes NewAlign = Attrs & ParamAttr::Alignment;
>> +  Attributes OldAlign = OldAttrs & ParamAttr::Alignment;
>> +  Attributes NewAlign = Attrs & ParamAttr::Alignment;
>>  assert((!OldAlign || !NewAlign || OldAlign == NewAlign) &&
>>         "Attempt to change alignment!");
>> #endif
>>
>> -  ParameterAttributes NewAttrs = OldAttrs | Attrs;
>> +  Attributes NewAttrs = OldAttrs | Attrs;
>>  if (NewAttrs == OldAttrs)
>>    return *this;
>>
>> @@ -251,7 +251,7 @@
>>  return get(&NewAttrList[0], NewAttrList.size());
>> }
>>
>> -PAListPtr PAListPtr::removeAttr(unsigned Idx, ParameterAttributes
>> Attrs) const {
>> +PAListPtr PAListPtr::removeAttr(unsigned Idx, Attributes Attrs)
>> const {
>> #ifndef NDEBUG
>>  // FIXME it is not obvious how this should work for alignment.
>>  // For now, say we can't pass in alignment, which no current use
>> does.
>> @@ -259,8 +259,8 @@
>> #endif
>>  if (PAList == 0) return PAListPtr();
>>
>> -  ParameterAttributes OldAttrs = getParamAttrs(Idx);
>> -  ParameterAttributes NewAttrs = OldAttrs & ~Attrs;
>> +  Attributes OldAttrs = getParamAttrs(Idx);
>> +  Attributes NewAttrs = OldAttrs & ~Attrs;
>>  if (NewAttrs == OldAttrs)
>>    return *this;
>>
>>
>> Modified: llvm/trunk/lib/VMCore/Function.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Function.cpp?rev=56513&r1=56512&r2=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/VMCore/Function.cpp (original)
>> +++ llvm/trunk/lib/VMCore/Function.cpp Tue Sep 23 18:03:40 2008
>> @@ -112,12 +112,12 @@
>> }
>>
>> /// addAttr - Add a ParamAttr to an argument
>> -void Argument::addAttr(ParameterAttributes attr) {
>> +void Argument::addAttr(Attributes attr) {
>>  getParent()->addParamAttr(getArgNo() + 1, attr);
>> }
>>
>> /// removeAttr - Remove a ParamAttr from an argument
>> -void Argument::removeAttr(ParameterAttributes attr) {
>> +void Argument::removeAttr(Attributes attr) {
>>  getParent()->removeParamAttr(getArgNo() + 1, attr);
>> }
>>
>> @@ -229,13 +229,13 @@
>>  BasicBlocks.clear();    // Delete all basic blocks...
>> }
>>
>> -void Function::addParamAttr(unsigned i, ParameterAttributes attr) {
>> +void Function::addParamAttr(unsigned i, Attributes attr) {
>>  PAListPtr PAL = getParamAttrs();
>>  PAL = PAL.addAttr(i, attr);
>>  setParamAttrs(PAL);
>> }
>>
>> -void Function::removeParamAttr(unsigned i, ParameterAttributes
>> attr) {
>> +void Function::removeParamAttr(unsigned i, Attributes attr) {
>>  PAListPtr PAL = getParamAttrs();
>>  PAL = PAL.removeAttr(i, attr);
>>  setParamAttrs(PAL);
>> @@ -356,7 +356,7 @@
>> }
>>
>> PAListPtr Intrinsic::getParamAttrs(ID id) {
>> -  ParameterAttributes Attr = ParamAttr::None;
>> +  Attributes Attr = ParamAttr::None;
>>
>> #define GET_INTRINSIC_ATTRIBUTES
>> #include "llvm/Intrinsics.gen"
>>
>> Modified: llvm/trunk/lib/VMCore/Instructions.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Instructions.cpp?rev=56513&r1=56512&r2=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/VMCore/Instructions.cpp (original)
>> +++ llvm/trunk/lib/VMCore/Instructions.cpp Tue Sep 23 18:03:40 2008
>> @@ -53,7 +53,7 @@
>>  else
>>    cast<InvokeInst>(I)->setParamAttrs(PAL);
>> }
>> -bool CallSite::paramHasAttr(uint16_t i, ParameterAttributes attr)
>> const {
>> +bool CallSite::paramHasAttr(uint16_t i, Attributes attr) const {
>>  if (CallInst *CI = dyn_cast<CallInst>(I))
>>    return CI->paramHasAttr(i, attr);
>>  else
>> @@ -402,19 +402,19 @@
>>    OL[i] = InOL[i];
>> }
>>
>> -void CallInst::addParamAttr(unsigned i, ParameterAttributes attr) {
>> +void CallInst::addParamAttr(unsigned i, Attributes attr) {
>>  PAListPtr PAL = getParamAttrs();
>>  PAL = PAL.addAttr(i, attr);
>>  setParamAttrs(PAL);
>> }
>>
>> -void CallInst::removeParamAttr(unsigned i, ParameterAttributes
>> attr) {
>> +void CallInst::removeParamAttr(unsigned i, Attributes attr) {
>>  PAListPtr PAL = getParamAttrs();
>>  PAL = PAL.removeAttr(i, attr);
>>  setParamAttrs(PAL);
>> }
>>
>> -bool CallInst::paramHasAttr(unsigned i, ParameterAttributes attr)
>> const {
>> +bool CallInst::paramHasAttr(unsigned i, Attributes attr) const {
>>  if (ParamAttrs.paramHasAttr(i, attr))
>>    return true;
>>  if (const Function *F = getCalledFunction())
>> @@ -473,7 +473,7 @@
>>  return setSuccessor(idx, B);
>> }
>>
>> -bool InvokeInst::paramHasAttr(unsigned i, ParameterAttributes attr)
>> const {
>> +bool InvokeInst::paramHasAttr(unsigned i, Attributes attr) const {
>>  if (ParamAttrs.paramHasAttr(i, attr))
>>    return true;
>>  if (const Function *F = getCalledFunction())
>> @@ -481,13 +481,13 @@
>>  return false;
>> }
>>
>> -void InvokeInst::addParamAttr(unsigned i, ParameterAttributes  
>> attr) {
>> +void InvokeInst::addParamAttr(unsigned i, Attributes attr) {
>>  PAListPtr PAL = getParamAttrs();
>>  PAL = PAL.addAttr(i, attr);
>>  setParamAttrs(PAL);
>> }
>>
>> -void InvokeInst::removeParamAttr(unsigned i, ParameterAttributes
>> attr) {
>> +void InvokeInst::removeParamAttr(unsigned i, Attributes attr) {
>>  PAListPtr PAL = getParamAttrs();
>>  PAL = PAL.removeAttr(i, attr);
>>  setParamAttrs(PAL);
>>
>> Removed: llvm/trunk/lib/VMCore/ParameterAttributes.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/ParameterAttributes.cpp?rev=56512&view=auto
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/VMCore/ParameterAttributes.cpp (original)
>> +++ llvm/trunk/lib/VMCore/ParameterAttributes.cpp (removed)
>> @@ -1,297 +0,0 @@
>> -//===-- ParameterAttributes.cpp - Implement ParamAttrsList
>> ----------------===//
>> -//
>> -//                     The LLVM Compiler Infrastructure
>> -//
>> -// This file is distributed under the University of Illinois Open
>> Source
>> -// License. See LICENSE.TXT for details.
>> -//
>> -//
>> =
>> =
>> =
>> ----------------------------------------------------------------------=
>> ==//
>> -//
>> -// This file implements the ParamAttrsList class and ParamAttr
>> utilities.
>> -//
>> -//
>> =
>> =
>> =
>> ----------------------------------------------------------------------=
>> ==//
>> -
>> -#include "llvm/ParameterAttributes.h"
>> -#include "llvm/Type.h"
>> -#include "llvm/ADT/StringExtras.h"
>> -#include "llvm/ADT/FoldingSet.h"
>> -#include "llvm/Support/Streams.h"
>> -#include "llvm/Support/ManagedStatic.h"
>> -using namespace llvm;
>> -
>> -//
>> =
>> =
>> =
>> ----------------------------------------------------------------------=
>> ==//
>> -// ParamAttr Function Definitions
>> -//
>> =
>> =
>> =
>> ----------------------------------------------------------------------=
>> ==//
>> -
>> -std::string ParamAttr::getAsString(ParameterAttributes Attrs) {
>> -  std::string Result;
>> -  if (Attrs & ParamAttr::ZExt)
>> -    Result += "zeroext ";
>> -  if (Attrs & ParamAttr::SExt)
>> -    Result += "signext ";
>> -  if (Attrs & ParamAttr::NoReturn)
>> -    Result += "noreturn ";
>> -  if (Attrs & ParamAttr::NoUnwind)
>> -    Result += "nounwind ";
>> -  if (Attrs & ParamAttr::InReg)
>> -    Result += "inreg ";
>> -  if (Attrs & ParamAttr::NoAlias)
>> -    Result += "noalias ";
>> -  if (Attrs & ParamAttr::StructRet)
>> -    Result += "sret ";
>> -  if (Attrs & ParamAttr::ByVal)
>> -    Result += "byval ";
>> -  if (Attrs & ParamAttr::Nest)
>> -    Result += "nest ";
>> -  if (Attrs & ParamAttr::ReadNone)
>> -    Result += "readnone ";
>> -  if (Attrs & ParamAttr::ReadOnly)
>> -    Result += "readonly ";
>> -  if (Attrs & ParamAttr::Alignment) {
>> -    Result += "align ";
>> -    Result += utostr((Attrs & ParamAttr::Alignment) >> 16);
>> -    Result += " ";
>> -  }
>> -  // Trim the trailing space.
>> -  Result.erase(Result.end()-1);
>> -  return Result;
>> -}
>> -
>> -ParameterAttributes ParamAttr::typeIncompatible(const Type *Ty) {
>> -  ParameterAttributes Incompatible = None;
>> -
>> -  if (!Ty->isInteger())
>> -    // Attributes that only apply to integers.
>> -    Incompatible |= SExt | ZExt;
>> -
>> -  if (!isa<PointerType>(Ty))
>> -    // Attributes that only apply to pointers.
>> -    Incompatible |= ByVal | Nest | NoAlias | StructRet;
>> -
>> -  return Incompatible;
>> -}
>> -
>> -//
>> =
>> =
>> =
>> ----------------------------------------------------------------------=
>> ==//
>> -// ParamAttributeListImpl Definition
>> -//
>> =
>> =
>> =
>> ----------------------------------------------------------------------=
>> ==//
>> -
>> -namespace llvm {
>> -class ParamAttributeListImpl : public FoldingSetNode {
>> -  unsigned RefCount;
>> -
>> -  // ParamAttrsList is uniqued, these should not be publicly
>> available.
>> -  void operator=(const ParamAttributeListImpl &); // Do not  
>> implement
>> -  ParamAttributeListImpl(const ParamAttributeListImpl &); // Do not
>> implement
>> -  ~ParamAttributeListImpl();                        // Private
>> implementation
>> -public:
>> -  SmallVector<ParamAttrsWithIndex, 4> Attrs;
>> -
>> -  ParamAttributeListImpl(const ParamAttrsWithIndex *Attr, unsigned
>> NumAttrs)
>> -    : Attrs(Attr, Attr+NumAttrs) {
>> -    RefCount = 0;
>> -  }
>> -
>> -  void AddRef() { ++RefCount; }
>> -  void DropRef() { if (--RefCount == 0) delete this; }
>> -
>> -  void Profile(FoldingSetNodeID &ID) const {
>> -    Profile(ID, &Attrs[0], Attrs.size());
>> -  }
>> -  static void Profile(FoldingSetNodeID &ID, const
>> ParamAttrsWithIndex *Attr,
>> -                      unsigned NumAttrs) {
>> -    for (unsigned i = 0; i != NumAttrs; ++i)
>> -      ID.AddInteger(uint64_t(Attr[i].Attrs) << 32 |
>> unsigned(Attr[i].Index));
>> -  }
>> -};
>> -}
>> -
>> -static ManagedStatic<FoldingSet<ParamAttributeListImpl> >
>> ParamAttrsLists;
>> -
>> -ParamAttributeListImpl::~ParamAttributeListImpl() {
>> -  ParamAttrsLists->RemoveNode(this);
>> -}
>> -
>> -
>> -PAListPtr PAListPtr::get(const ParamAttrsWithIndex *Attrs, unsigned
>> NumAttrs) {
>> -  // If there are no attributes then return a null ParamAttrsList
>> pointer.
>> -  if (NumAttrs == 0)
>> -    return PAListPtr();
>> -
>> -#ifndef NDEBUG
>> -  for (unsigned i = 0; i != NumAttrs; ++i) {
>> -    assert(Attrs[i].Attrs != ParamAttr::None &&
>> -           "Pointless parameter attribute!");
>> -    assert((!i || Attrs[i-1].Index < Attrs[i].Index) &&
>> -           "Misordered ParamAttrsList!");
>> -  }
>> -#endif
>> -
>> -  // Otherwise, build a key to look up the existing attributes.
>> -  FoldingSetNodeID ID;
>> -  ParamAttributeListImpl::Profile(ID, Attrs, NumAttrs);
>> -  void *InsertPos;
>> -  ParamAttributeListImpl *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 ParamAttributeListImpl(Attrs, NumAttrs);
>> -    ParamAttrsLists->InsertNode(PAL, InsertPos);
>> -  }
>> -
>> -  // Return the ParamAttrsList that we found or created.
>> -  return PAListPtr(PAL);
>> -}
>> -
>> -
>> -//
>> =
>> =
>> =
>> ----------------------------------------------------------------------=
>> ==//
>> -// PAListPtr Method Implementations
>> -//
>> =
>> =
>> =
>> ----------------------------------------------------------------------=
>> ==//
>> -
>> -PAListPtr::PAListPtr(ParamAttributeListImpl *LI) : PAList(LI) {
>> -  if (LI) LI->AddRef();
>> -}
>> -
>> -PAListPtr::PAListPtr(const PAListPtr &P) : PAList(P.PAList) {
>> -  if (PAList) PAList->AddRef();
>> -}
>> -
>> -const PAListPtr &PAListPtr::operator=(const PAListPtr &RHS) {
>> -  if (PAList == RHS.PAList) return *this;
>> -  if (PAList) PAList->DropRef();
>> -  PAList = RHS.PAList;
>> -  if (PAList) PAList->AddRef();
>> -  return *this;
>> -}
>> -
>> -PAListPtr::~PAListPtr() {
>> -  if (PAList) PAList->DropRef();
>> -}
>> -
>> -/// getNumSlots - Return the number of slots used in this attribute
>> list.
>> -/// This is the number of arguments that have an attribute set on
>> them
>> -/// (including the function itself).
>> -unsigned PAListPtr::getNumSlots() const {
>> -  return PAList ? PAList->Attrs.size() : 0;
>> -}
>> -
>> -/// getSlot - Return the ParamAttrsWithIndex at the specified
>> slot.  This
>> -/// holds a parameter number plus a set of attributes.
>> -const ParamAttrsWithIndex &PAListPtr::getSlot(unsigned Slot) const {
>> -  assert(PAList && Slot < PAList->Attrs.size() && "Slot # out of
>> range!");
>> -  return PAList->Attrs[Slot];
>> -}
>> -
>> -
>> -/// getParamAttrs - The parameter attributes for the specified
>> parameter are
>> -/// returned.  Parameters for the result are denoted with Idx = 0.
>> -/// Function notes are denoted with idx = ~0.
>> -ParameterAttributes PAListPtr::getParamAttrs(unsigned Idx) const {
>> -  if (PAList == 0) return ParamAttr::None;
>> -
>> -  const SmallVector<ParamAttrsWithIndex, 4> &Attrs = PAList->Attrs;
>> -  for (unsigned i = 0, e = Attrs.size(); i != e && Attrs[i].Index
>> <= Idx; ++i)
>> -    if (Attrs[i].Index == Idx)
>> -      return Attrs[i].Attrs;
>> -  return ParamAttr::None;
>> -}
>> -
>> -/// hasAttrSomewhere - Return true if the specified attribute is
>> set for at
>> -/// least one parameter or for the return value.
>> -bool PAListPtr::hasAttrSomewhere(ParameterAttributes Attr) const {
>> -  if (PAList == 0) return false;
>> -
>> -  const SmallVector<ParamAttrsWithIndex, 4> &Attrs = PAList->Attrs;
>> -  for (unsigned i = 0, e = Attrs.size(); i != e; ++i)
>> -    if (Attrs[i].Attrs & Attr)
>> -      return true;
>> -  return false;
>> -}
>> -
>> -
>> -PAListPtr PAListPtr::addAttr(unsigned Idx, ParameterAttributes
>> Attrs) const {
>> -  ParameterAttributes OldAttrs = getParamAttrs(Idx);
>> -#ifndef NDEBUG
>> -  // FIXME it is not obvious how this should work for alignment.
>> -  // For now, say we can't change a known alignment.
>> -  ParameterAttributes OldAlign = OldAttrs & ParamAttr::Alignment;
>> -  ParameterAttributes NewAlign = Attrs & ParamAttr::Alignment;
>> -  assert((!OldAlign || !NewAlign || OldAlign == NewAlign) &&
>> -         "Attempt to change alignment!");
>> -#endif
>> -
>> -  ParameterAttributes NewAttrs = OldAttrs | Attrs;
>> -  if (NewAttrs == OldAttrs)
>> -    return *this;
>> -
>> -  SmallVector<ParamAttrsWithIndex, 8> NewAttrList;
>> -  if (PAList == 0)
>> -    NewAttrList.push_back(ParamAttrsWithIndex::get(Idx, Attrs));
>> -  else {
>> -    const SmallVector<ParamAttrsWithIndex, 4> &OldAttrList = PAList-
>>> Attrs;
>> -    unsigned i = 0, e = OldAttrList.size();
>> -    // Copy attributes for arguments before this one.
>> -    for (; i != e && OldAttrList[i].Index < Idx; ++i)
>> -      NewAttrList.push_back(OldAttrList[i]);
>> -
>> -    // If there are attributes already at this index, merge them in.
>> -    if (i != e && OldAttrList[i].Index == Idx) {
>> -      Attrs |= OldAttrList[i].Attrs;
>> -      ++i;
>> -    }
>> -
>> -    NewAttrList.push_back(ParamAttrsWithIndex::get(Idx, Attrs));
>> -
>> -    // Copy attributes for arguments after this one.
>> -    NewAttrList.insert(NewAttrList.end(),
>> -                       OldAttrList.begin()+i, OldAttrList.end());
>> -  }
>> -
>> -  return get(&NewAttrList[0], NewAttrList.size());
>> -}
>> -
>> -PAListPtr PAListPtr::removeAttr(unsigned Idx, ParameterAttributes
>> Attrs) const {
>> -#ifndef NDEBUG
>> -  // FIXME it is not obvious how this should work for alignment.
>> -  // For now, say we can't pass in alignment, which no current use
>> does.
>> -  assert(!(Attrs & ParamAttr::Alignment) && "Attempt to exclude
>> alignment!");
>> -#endif
>> -  if (PAList == 0) return PAListPtr();
>> -
>> -  ParameterAttributes OldAttrs = getParamAttrs(Idx);
>> -  ParameterAttributes NewAttrs = OldAttrs & ~Attrs;
>> -  if (NewAttrs == OldAttrs)
>> -    return *this;
>> -
>> -  SmallVector<ParamAttrsWithIndex, 8> NewAttrList;
>> -  const SmallVector<ParamAttrsWithIndex, 4> &OldAttrList = PAList-
>>> Attrs;
>> -  unsigned i = 0, e = OldAttrList.size();
>> -
>> -  // Copy attributes for arguments before this one.
>> -  for (; i != e && OldAttrList[i].Index < Idx; ++i)
>> -    NewAttrList.push_back(OldAttrList[i]);
>> -
>> -  // If there are attributes already at this index, merge them in.
>> -  assert(OldAttrList[i].Index == Idx && "Attribute isn't set?");
>> -  Attrs = OldAttrList[i].Attrs & ~Attrs;
>> -  ++i;
>> -  if (Attrs)  // If any attributes left for this parameter, add  
>> them.
>> -    NewAttrList.push_back(ParamAttrsWithIndex::get(Idx, Attrs));
>> -
>> -  // Copy attributes for arguments after this one.
>> -  NewAttrList.insert(NewAttrList.end(),
>> -                     OldAttrList.begin()+i, OldAttrList.end());
>> -
>> -  return get(&NewAttrList[0], NewAttrList.size());
>> -}
>> -
>> -void PAListPtr::dump() const {
>> -  cerr << "PAL[ ";
>> -  for (unsigned i = 0; i < getNumSlots(); ++i) {
>> -    const ParamAttrsWithIndex &PAWI = getSlot(i);
>> -    cerr << "{" << PAWI.Index << "," << PAWI.Attrs << "} ";
>> -  }
>> -
>> -  cerr << "]\n";
>> -}
>>
>> Modified: llvm/trunk/lib/VMCore/Verifier.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Verifier.cpp?rev=56513&r1=56512&r2=56513&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/VMCore/Verifier.cpp (original)
>> +++ llvm/trunk/lib/VMCore/Verifier.cpp Tue Sep 23 18:03:40 2008
>> @@ -268,7 +268,7 @@
>>    void VerifyCallSite(CallSite CS);
>>    void VerifyIntrinsicPrototype(Intrinsic::ID ID, Function *F,
>>                                  unsigned Count, ...);
>> -    void VerifyAttrs(ParameterAttributes Attrs, const Type *Ty,
>> +    void VerifyAttrs(Attributes Attrs, const Type *Ty,
>>                     bool isReturnValue, const Value *V);
>>    void VerifyFunctionAttrs(const FunctionType *FT, const PAListPtr
>> &Attrs,
>>                             const Value *V);
>> @@ -406,33 +406,33 @@
>>
>> // VerifyAttrs - Check the given parameter attributes for an
>> argument or return
>> // value of the specified type.  The value V is printed in error
>> messages.
>> -void Verifier::VerifyAttrs(ParameterAttributes Attrs, const Type  
>> *Ty,
>> +void Verifier::VerifyAttrs(Attributes Attrs, const Type *Ty,
>>                           bool isReturnValue, const Value *V) {
>>  if (Attrs == ParamAttr::None)
>>    return;
>>
>>  if (isReturnValue) {
>> -    ParameterAttributes RetI = Attrs & ParamAttr::ParameterOnly;
>> +    Attributes RetI = Attrs & ParamAttr::ParameterOnly;
>>    Assert1(!RetI, "Attribute " + ParamAttr::getAsString(RetI) +
>>            " does not apply to return values!", V);
>>  } else {
>> -    ParameterAttributes ParmI = Attrs & ParamAttr::ReturnOnly;
>> +    Attributes ParmI = Attrs & ParamAttr::ReturnOnly;
>>    Assert1(!ParmI, "Attribute " + ParamAttr::getAsString(ParmI) +
>>            " only applies to return values!", V);
>>  }
>>
>>  for (unsigned i = 0;
>>       i < array_lengthof(ParamAttr::MutuallyIncompatible); ++i) {
>> -    ParameterAttributes MutI = Attrs &
>> ParamAttr::MutuallyIncompatible[i];
>> +    Attributes MutI = Attrs & ParamAttr::MutuallyIncompatible[i];
>>    Assert1(!(MutI & (MutI - 1)), "Attributes " +
>>            ParamAttr::getAsString(MutI) + " are incompatible!", V);
>>  }
>>
>> -  ParameterAttributes TypeI = Attrs &
>> ParamAttr::typeIncompatible(Ty);
>> +  Attributes TypeI = Attrs & ParamAttr::typeIncompatible(Ty);
>>  Assert1(!TypeI, "Wrong type for attribute " +
>>          ParamAttr::getAsString(TypeI), V);
>>
>> -  ParameterAttributes ByValI = Attrs & ParamAttr::ByVal;
>> +  Attributes ByValI = Attrs & ParamAttr::ByVal;
>>  if (const PointerType *PTy = dyn_cast<PointerType>(Ty)) {
>>    Assert1(!ByValI || PTy->getElementType()->isSized(),
>>            "Attribute " + ParamAttr::getAsString(ByValI) +
>> @@ -976,11 +976,11 @@
>>  if (FTy->isVarArg())
>>    // Check attributes on the varargs part.
>>    for (unsigned Idx = 1 + FTy->getNumParams(); Idx <=
>> CS.arg_size(); ++Idx) {
>> -      ParameterAttributes Attr = Attrs.getParamAttrs(Idx);
>> +      Attributes Attr = Attrs.getParamAttrs(Idx);
>>
>>      VerifyAttrs(Attr, CS.getArgument(Idx-1)->getType(), false, I);
>>
>> -      ParameterAttributes VArgI = Attr &
>> ParamAttr::VarArgsIncompatible;
>> +      Attributes VArgI = Attr & ParamAttr::VarArgsIncompatible;
>>      Assert1(!VArgI, "Attribute " + ParamAttr::getAsString(VArgI) +
>>              " cannot be used for vararg call arguments!", I);
>>    }
>>
>>
>> _______________________________________________
>> 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

-
Devang






From dpatel at apple.com  Tue Sep 23 18:25:44 2008
From: dpatel at apple.com (Devang Patel)
Date: Tue, 23 Sep 2008 23:25:44 -0000
Subject: [llvm-commits] [llvm] r56520 - in /llvm/trunk/lib/AsmParser:
 llvmAsmParser.cpp.cvs llvmAsmParser.h.cvs llvmAsmParser.y
 llvmAsmParser.y.cvs
Message-ID: <200809232325.m8NNPiqp032596@zion.cs.uiuc.edu>

Author: dpatel
Date: Tue Sep 23 18:25:44 2008
New Revision: 56520

URL: http://llvm.org/viewvc/llvm-project?rev=56520&view=rev
Log:
s/ParameterAttributes/Attributes/g

Modified:
    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

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

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs Tue Sep 23 18:25:44 2008
@@ -400,7 +400,7 @@
 
 
 /* Copy the first part of user declarations.  */
-#line 14 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 14 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
 
 #include "ParserInternals.h"
 #include "llvm/CallingConv.h"
@@ -1377,7 +1377,7 @@
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 970 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 970 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
@@ -1405,8 +1405,7 @@
 
   llvm::GlobalValue::LinkageTypes         Linkage;
   llvm::GlobalValue::VisibilityTypes      Visibility;
-  llvm::ParameterAttributes         ParamAttrs;
-  llvm::FunctionNotes               FunctionNotes;
+  llvm::Attributes                  ParamAttrs;
   llvm::APInt                       *APIntVal;
   int64_t                           SInt64Val;
   uint64_t                          UInt64Val;
@@ -1427,7 +1426,7 @@
   llvm::FCmpInst::Predicate         FPredicate;
 }
 /* Line 193 of yacc.c.  */
-#line 1431 "llvmAsmParser.tab.c"
+#line 1430 "llvmAsmParser.tab.c"
 	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -1440,7 +1439,7 @@
 
 
 /* Line 216 of yacc.c.  */
-#line 1444 "llvmAsmParser.tab.c"
+#line 1443 "llvmAsmParser.tab.c"
 
 #ifdef short
 # undef short
@@ -1887,42 +1886,42 @@
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,  1142,  1142,  1142,  1142,  1142,  1142,  1142,  1142,  1142,
-    1142,  1143,  1143,  1143,  1143,  1143,  1143,  1144,  1144,  1144,
-    1144,  1144,  1144,  1145,  1145,  1145,  1145,  1145,  1145,  1148,
-    1148,  1149,  1149,  1150,  1150,  1151,  1151,  1152,  1152,  1156,
-    1156,  1157,  1157,  1158,  1158,  1159,  1159,  1160,  1160,  1161,
-    1161,  1162,  1162,  1163,  1164,  1169,  1170,  1170,  1170,  1170,
-    1170,  1172,  1172,  1172,  1173,  1173,  1175,  1176,  1180,  1184,
-    1189,  1195,  1195,  1197,  1198,  1203,  1209,  1210,  1211,  1212,
-    1213,  1214,  1218,  1219,  1220,  1224,  1225,  1226,  1227,  1231,
-    1232,  1233,  1237,  1238,  1239,  1240,  1241,  1245,  1246,  1247,
-    1250,  1251,  1252,  1253,  1254,  1255,  1256,  1257,  1264,  1265,
-    1266,  1267,  1268,  1269,  1270,  1271,  1272,  1273,  1277,  1278,
-    1283,  1284,  1285,  1286,  1287,  1288,  1289,  1292,  1293,  1298,
-    1299,  1310,  1311,  1312,  1315,  1316,  1321,  1322,  1329,  1330,
-    1336,  1337,  1346,  1354,  1355,  1360,  1361,  1362,  1367,  1380,
-    1380,  1380,  1380,  1380,  1380,  1380,  1383,  1387,  1391,  1398,
-    1403,  1411,  1440,  1465,  1470,  1480,  1490,  1494,  1504,  1511,
-    1520,  1527,  1532,  1537,  1544,  1545,  1552,  1559,  1567,  1573,
-    1585,  1613,  1629,  1656,  1684,  1710,  1730,  1756,  1776,  1788,
-    1795,  1861,  1871,  1881,  1887,  1897,  1903,  1913,  1919,  1925,
-    1938,  1950,  1971,  1979,  1985,  1996,  2001,  2006,  2011,  2016,
-    2022,  2028,  2034,  2042,  2053,  2057,  2065,  2065,  2068,  2068,
-    2071,  2083,  2104,  2109,  2117,  2118,  2122,  2122,  2126,  2126,
-    2129,  2132,  2156,  2168,  2167,  2179,  2178,  2188,  2187,  2198,
-    2238,  2241,  2247,  2257,  2261,  2266,  2268,  2273,  2278,  2287,
-    2297,  2308,  2312,  2321,  2330,  2335,  2467,  2467,  2469,  2478,
-    2478,  2480,  2485,  2497,  2501,  2506,  2510,  2514,  2519,  2524,
-    2528,  2532,  2536,  2540,  2544,  2548,  2570,  2592,  2598,  2611,
-    2623,  2628,  2640,  2646,  2650,  2660,  2664,  2668,  2673,  2680,
-    2680,  2686,  2695,  2700,  2705,  2709,  2718,  2727,  2740,  2749,
-    2753,  2761,  2781,  2785,  2790,  2801,  2820,  2829,  2915,  2919,
-    2926,  2937,  2950,  2959,  2972,  2983,  2993,  3004,  3012,  3022,
-    3029,  3032,  3033,  3041,  3047,  3056,  3060,  3065,  3081,  3098,
-    3110,  3122,  3136,  3150,  3162,  3183,  3190,  3196,  3202,  3208,
-    3223,  3313,  3318,  3322,  3329,  3336,  3346,  3353,  3363,  3371,
-    3385,  3402,  3416,  3431,  3446
+       0,  1141,  1141,  1141,  1141,  1141,  1141,  1141,  1141,  1141,
+    1141,  1142,  1142,  1142,  1142,  1142,  1142,  1143,  1143,  1143,
+    1143,  1143,  1143,  1144,  1144,  1144,  1144,  1144,  1144,  1147,
+    1147,  1148,  1148,  1149,  1149,  1150,  1150,  1151,  1151,  1155,
+    1155,  1156,  1156,  1157,  1157,  1158,  1158,  1159,  1159,  1160,
+    1160,  1161,  1161,  1162,  1163,  1168,  1169,  1169,  1169,  1169,
+    1169,  1171,  1171,  1171,  1172,  1172,  1174,  1175,  1179,  1183,
+    1188,  1194,  1194,  1196,  1197,  1202,  1208,  1209,  1210,  1211,
+    1212,  1213,  1217,  1218,  1219,  1223,  1224,  1225,  1226,  1230,
+    1231,  1232,  1236,  1237,  1238,  1239,  1240,  1244,  1245,  1246,
+    1249,  1250,  1251,  1252,  1253,  1254,  1255,  1256,  1263,  1264,
+    1265,  1266,  1267,  1268,  1269,  1270,  1271,  1272,  1276,  1277,
+    1282,  1283,  1284,  1285,  1286,  1287,  1288,  1291,  1292,  1297,
+    1298,  1311,  1312,  1313,  1316,  1317,  1322,  1323,  1330,  1331,
+    1337,  1338,  1347,  1355,  1356,  1361,  1362,  1363,  1368,  1381,
+    1381,  1381,  1381,  1381,  1381,  1381,  1384,  1388,  1392,  1399,
+    1404,  1412,  1441,  1466,  1471,  1481,  1491,  1495,  1505,  1512,
+    1521,  1528,  1533,  1538,  1545,  1546,  1553,  1560,  1568,  1574,
+    1586,  1614,  1630,  1657,  1685,  1711,  1731,  1757,  1777,  1789,
+    1796,  1862,  1872,  1882,  1888,  1898,  1904,  1914,  1920,  1926,
+    1939,  1951,  1972,  1980,  1986,  1997,  2002,  2007,  2012,  2017,
+    2023,  2029,  2035,  2043,  2054,  2058,  2066,  2066,  2069,  2069,
+    2072,  2084,  2105,  2110,  2118,  2119,  2123,  2123,  2127,  2127,
+    2130,  2133,  2157,  2169,  2168,  2180,  2179,  2189,  2188,  2199,
+    2239,  2242,  2248,  2258,  2262,  2267,  2269,  2274,  2279,  2288,
+    2298,  2309,  2313,  2322,  2331,  2336,  2468,  2468,  2470,  2479,
+    2479,  2481,  2486,  2498,  2502,  2507,  2511,  2515,  2520,  2525,
+    2529,  2533,  2537,  2541,  2545,  2549,  2571,  2593,  2599,  2612,
+    2624,  2629,  2641,  2647,  2651,  2661,  2665,  2669,  2674,  2681,
+    2681,  2687,  2696,  2701,  2706,  2710,  2719,  2728,  2741,  2750,
+    2754,  2762,  2782,  2786,  2791,  2802,  2821,  2830,  2916,  2920,
+    2927,  2938,  2951,  2960,  2973,  2984,  2994,  3005,  3013,  3023,
+    3030,  3033,  3034,  3042,  3048,  3057,  3061,  3066,  3082,  3099,
+    3111,  3123,  3137,  3151,  3163,  3184,  3191,  3197,  3203,  3209,
+    3224,  3314,  3319,  3323,  3330,  3337,  3347,  3354,  3364,  3372,
+    3386,  3403,  3417,  3432,  3447
 };
 #endif
 
@@ -3658,152 +3657,152 @@
   switch (yyn)
     {
         case 29:
-#line 1148 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1147 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_EQ; ;}
     break;
 
   case 30:
-#line 1148 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1147 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_NE; ;}
     break;
 
   case 31:
-#line 1149 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1148 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SLT; ;}
     break;
 
   case 32:
-#line 1149 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1148 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SGT; ;}
     break;
 
   case 33:
-#line 1150 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1149 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SLE; ;}
     break;
 
   case 34:
-#line 1150 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1149 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SGE; ;}
     break;
 
   case 35:
-#line 1151 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1150 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_ULT; ;}
     break;
 
   case 36:
-#line 1151 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1150 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_UGT; ;}
     break;
 
   case 37:
-#line 1152 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1151 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_ULE; ;}
     break;
 
   case 38:
-#line 1152 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1151 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_UGE; ;}
     break;
 
   case 39:
-#line 1156 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1155 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OEQ; ;}
     break;
 
   case 40:
-#line 1156 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1155 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ONE; ;}
     break;
 
   case 41:
-#line 1157 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1156 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OLT; ;}
     break;
 
   case 42:
-#line 1157 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1156 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OGT; ;}
     break;
 
   case 43:
-#line 1158 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1157 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OLE; ;}
     break;
 
   case 44:
-#line 1158 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1157 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OGE; ;}
     break;
 
   case 45:
-#line 1159 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1158 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ORD; ;}
     break;
 
   case 46:
-#line 1159 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1158 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UNO; ;}
     break;
 
   case 47:
-#line 1160 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1159 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UEQ; ;}
     break;
 
   case 48:
-#line 1160 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1159 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UNE; ;}
     break;
 
   case 49:
-#line 1161 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1160 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ULT; ;}
     break;
 
   case 50:
-#line 1161 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1160 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UGT; ;}
     break;
 
   case 51:
-#line 1162 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1161 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ULE; ;}
     break;
 
   case 52:
-#line 1162 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1161 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UGE; ;}
     break;
 
   case 53:
-#line 1163 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1162 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_TRUE; ;}
     break;
 
   case 54:
-#line 1164 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1163 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_FALSE; ;}
     break;
 
   case 65:
-#line 1173 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1172 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 66:
-#line 1175 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1174 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal)=(yyvsp[(3) - (4)].UInt64Val); ;}
     break;
 
   case 67:
-#line 1176 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1175 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal)=0; ;}
     break;
 
   case 68:
-#line 1180 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1179 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal);
     CHECK_FOR_ERROR
@@ -3811,7 +3810,7 @@
     break;
 
   case 69:
-#line 1184 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1183 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
@@ -3819,7 +3818,7 @@
     break;
 
   case 70:
-#line 1189 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1188 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[(1) - (2)].UIntVal);
   CHECK_FOR_ERROR
@@ -3827,7 +3826,7 @@
     break;
 
   case 74:
-#line 1198 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1197 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
@@ -3835,7 +3834,7 @@
     break;
 
   case 75:
-#line 1203 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1202 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal);
     CHECK_FOR_ERROR
@@ -3843,162 +3842,162 @@
     break;
 
   case 76:
-#line 1209 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1208 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 77:
-#line 1210 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1209 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 78:
-#line 1211 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1210 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 79:
-#line 1212 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1211 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
     break;
 
   case 80:
-#line 1213 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1212 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 81:
-#line 1214 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1213 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::CommonLinkage; ;}
     break;
 
   case 82:
-#line 1218 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1217 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 83:
-#line 1219 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1218 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 84:
-#line 1220 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1219 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 85:
-#line 1224 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1223 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::DefaultVisibility;   ;}
     break;
 
   case 86:
-#line 1225 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1224 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::DefaultVisibility;   ;}
     break;
 
   case 87:
-#line 1226 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1225 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::HiddenVisibility;    ;}
     break;
 
   case 88:
-#line 1227 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1226 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::ProtectedVisibility; ;}
     break;
 
   case 89:
-#line 1231 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1230 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 90:
-#line 1232 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1231 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 91:
-#line 1233 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1232 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 92:
-#line 1237 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1236 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 93:
-#line 1238 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1237 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 94:
-#line 1239 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1238 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 95:
-#line 1240 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1239 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 96:
-#line 1241 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1240 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 97:
-#line 1245 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1244 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 98:
-#line 1246 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1245 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 99:
-#line 1247 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1246 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 100:
-#line 1250 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1249 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 101:
-#line 1251 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1250 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 102:
-#line 1252 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1251 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Fast; ;}
     break;
 
   case 103:
-#line 1253 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1252 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Cold; ;}
     break;
 
   case 104:
-#line 1254 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1253 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_StdCall; ;}
     break;
 
   case 105:
-#line 1255 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1254 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_FastCall; ;}
     break;
 
   case 106:
-#line 1256 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1255 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_SSECall; ;}
     break;
 
   case 107:
-#line 1257 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1256 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                    if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val))
                      GEN_ERROR("Calling conv too large");
@@ -4008,179 +4007,181 @@
     break;
 
   case 108:
-#line 1264 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1263 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ZExt;      ;}
     break;
 
   case 109:
-#line 1265 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1264 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ZExt;      ;}
     break;
 
   case 110:
-#line 1266 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1265 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::SExt;      ;}
     break;
 
   case 111:
-#line 1267 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1266 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::SExt;      ;}
     break;
 
   case 112:
-#line 1268 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1267 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::InReg;     ;}
     break;
 
   case 113:
-#line 1269 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1268 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::StructRet; ;}
     break;
 
   case 114:
-#line 1270 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1269 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::NoAlias;   ;}
     break;
 
   case 115:
-#line 1271 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1270 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ByVal;     ;}
     break;
 
   case 116:
-#line 1272 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1271 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::Nest;      ;}
     break;
 
   case 117:
-#line 1273 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1272 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = 
                           ParamAttr::constructAlignmentFromInt((yyvsp[(2) - (2)].UInt64Val));    ;}
     break;
 
   case 118:
-#line 1277 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1276 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::None; ;}
     break;
 
   case 119:
-#line 1278 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1277 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs);
               ;}
     break;
 
   case 120:
-#line 1283 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1282 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::NoReturn; ;}
     break;
 
   case 121:
-#line 1284 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1283 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::NoUnwind; ;}
     break;
 
   case 122:
-#line 1285 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1284 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::InReg;     ;}
     break;
 
   case 123:
-#line 1286 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1285 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ZExt;     ;}
     break;
 
   case 124:
-#line 1287 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1286 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::SExt;     ;}
     break;
 
   case 125:
-#line 1288 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1287 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ReadNone; ;}
     break;
 
   case 126:
-#line 1289 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1288 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ReadOnly; ;}
     break;
 
   case 127:
-#line 1292 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1291 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::None; ;}
     break;
 
   case 128:
-#line 1293 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1292 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs);
               ;}
     break;
 
   case 129:
-#line 1298 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.FunctionNotes) = (yyvsp[(1) - (1)].FunctionNotes); ;}
+#line 1297 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = (yyvsp[(1) - (1)].ParamAttrs); ;}
     break;
 
   case 130:
-#line 1299 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1298 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { 
-                FunctionNotes tmp = (yyvsp[(1) - (3)].FunctionNotes) | (yyvsp[(3) - (3)].FunctionNotes);
-                if ((yyvsp[(3) - (3)].FunctionNotes) == FN_NOTE_NoInline && ((yyvsp[(1) - (3)].FunctionNotes) & FN_NOTE_AlwaysInline))
+                unsigned tmp = (yyvsp[(1) - (3)].ParamAttrs) | (yyvsp[(3) - (3)].ParamAttrs);
+                if ((yyvsp[(3) - (3)].ParamAttrs) == ParamAttr::FN_NOTE_NoInline 
+                    && ((yyvsp[(1) - (3)].ParamAttrs) & ParamAttr::FN_NOTE_AlwaysInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
-                if ((yyvsp[(3) - (3)].FunctionNotes) == FN_NOTE_AlwaysInline && ((yyvsp[(1) - (3)].FunctionNotes) & FN_NOTE_NoInline))
+                    if ((yyvsp[(3) - (3)].ParamAttrs) == ParamAttr::FN_NOTE_AlwaysInline 
+                        && ((yyvsp[(1) - (3)].ParamAttrs) & ParamAttr::FN_NOTE_NoInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
-                (yyval.FunctionNotes) = tmp;
+                (yyval.ParamAttrs) = tmp;
                 CHECK_FOR_ERROR 
               ;}
     break;
 
   case 131:
-#line 1310 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.FunctionNotes) = FN_NOTE_NoInline; ;}
+#line 1311 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::FN_NOTE_NoInline; ;}
     break;
 
   case 132:
-#line 1311 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.FunctionNotes) = FN_NOTE_AlwaysInline; ;}
+#line 1312 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::FN_NOTE_AlwaysInline; ;}
     break;
 
   case 133:
-#line 1312 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.FunctionNotes) = FN_NOTE_OptimizeForSize; ;}
+#line 1313 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::FN_NOTE_OptimizeForSize; ;}
     break;
 
   case 134:
-#line 1315 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.FunctionNotes) = FN_NOTE_None; ;}
+#line 1316 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::FN_NOTE_None; ;}
     break;
 
   case 135:
-#line 1316 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1317 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-                (yyval.FunctionNotes) =  (yyvsp[(3) - (4)].FunctionNotes);
+                (yyval.ParamAttrs) =  (yyvsp[(3) - (4)].ParamAttrs);
               ;}
     break;
 
   case 136:
-#line 1321 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1322 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 137:
-#line 1322 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1323 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.StrVal) = (yyvsp[(2) - (2)].StrVal);
               ;}
     break;
 
   case 138:
-#line 1329 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1330 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
   case 139:
-#line 1330 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1331 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[(2) - (2)].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -4190,12 +4191,12 @@
     break;
 
   case 140:
-#line 1336 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1337 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
   case 141:
-#line 1337 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1338 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[(3) - (3)].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -4205,7 +4206,7 @@
     break;
 
   case 142:
-#line 1346 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1347 "/Volumes/Nanpura/mainline/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] == '\\')
@@ -4216,27 +4217,27 @@
     break;
 
   case 143:
-#line 1354 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1355 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 144:
-#line 1355 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1356 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = (yyvsp[(1) - (1)].StrVal); ;}
     break;
 
   case 145:
-#line 1360 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1361 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
   case 146:
-#line 1361 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1362 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
   case 147:
-#line 1362 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1363 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV->setSection(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -4245,7 +4246,7 @@
     break;
 
   case 148:
-#line 1367 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1368 "/Volumes/Nanpura/mainline/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");
@@ -4255,7 +4256,7 @@
     break;
 
   case 156:
-#line 1383 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1384 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
@@ -4263,7 +4264,7 @@
     break;
 
   case 157:
-#line 1387 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1388 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder((yyvsp[(1) - (1)].PrimType));
     CHECK_FOR_ERROR
@@ -4271,7 +4272,7 @@
     break;
 
   case 158:
-#line 1391 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1392 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {                             // Pointer type?
     if (*(yyvsp[(1) - (3)].TypeVal) == Type::LabelTy)
       GEN_ERROR("Cannot form a pointer to a basic block");
@@ -4282,7 +4283,7 @@
     break;
 
   case 159:
-#line 1398 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1399 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {            // Named types are also simple types...
     const Type* tmp = getTypeVal((yyvsp[(1) - (1)].ValIDVal));
     CHECK_FOR_ERROR
@@ -4291,7 +4292,7 @@
     break;
 
   case 160:
-#line 1403 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1404 "/Volumes/Nanpura/mainline/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
@@ -4303,7 +4304,7 @@
     break;
 
   case 161:
-#line 1411 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1412 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
@@ -4336,7 +4337,7 @@
     break;
 
   case 162:
-#line 1440 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1441 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
@@ -4364,7 +4365,7 @@
     break;
 
   case 163:
-#line 1465 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1466 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {          // Sized array type?
     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(ArrayType::get(*(yyvsp[(4) - (5)].TypeVal), (yyvsp[(2) - (5)].UInt64Val))));
     delete (yyvsp[(4) - (5)].TypeVal);
@@ -4373,7 +4374,7 @@
     break;
 
   case 164:
-#line 1470 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1471 "/Volumes/Nanpura/mainline/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))
@@ -4387,7 +4388,7 @@
     break;
 
   case 165:
-#line 1480 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1481 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {                        // Structure type?
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[(2) - (3)].TypeList)->begin(),
@@ -4401,7 +4402,7 @@
     break;
 
   case 166:
-#line 1490 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1491 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {                                  // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>()));
     CHECK_FOR_ERROR
@@ -4409,7 +4410,7 @@
     break;
 
   case 167:
-#line 1494 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1495 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[(3) - (5)].TypeList)->begin(),
@@ -4423,7 +4424,7 @@
     break;
 
   case 168:
-#line 1504 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1505 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {                         // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>(), true));
     CHECK_FOR_ERROR
@@ -4431,7 +4432,7 @@
     break;
 
   case 169:
-#line 1511 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1512 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
@@ -4441,7 +4442,7 @@
     break;
 
   case 170:
-#line 1520 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1521 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (1)].TypeVal))->getDescription());
@@ -4452,14 +4453,14 @@
     break;
 
   case 171:
-#line 1527 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1528 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(Type::VoidTy);
   ;}
     break;
 
   case 172:
-#line 1532 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1533 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     (yyval.TypeWithAttrsList)->push_back((yyvsp[(1) - (1)].TypeWithAttrs));
@@ -4468,7 +4469,7 @@
     break;
 
   case 173:
-#line 1537 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1538 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList))->push_back((yyvsp[(3) - (3)].TypeWithAttrs));
     CHECK_FOR_ERROR
@@ -4476,7 +4477,7 @@
     break;
 
   case 175:
-#line 1545 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1546 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList);
     TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
@@ -4487,7 +4488,7 @@
     break;
 
   case 176:
-#line 1552 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1553 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList;
     TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
@@ -4498,7 +4499,7 @@
     break;
 
   case 177:
-#line 1559 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1560 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     CHECK_FOR_ERROR
@@ -4506,7 +4507,7 @@
     break;
 
   case 178:
-#line 1567 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1568 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeList) = new std::list<PATypeHolder>();
     (yyval.TypeList)->push_back(*(yyvsp[(1) - (1)].TypeVal)); 
@@ -4516,7 +4517,7 @@
     break;
 
   case 179:
-#line 1573 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1574 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeList)=(yyvsp[(1) - (3)].TypeList))->push_back(*(yyvsp[(3) - (3)].TypeVal)); 
     delete (yyvsp[(3) - (3)].TypeVal);
@@ -4525,7 +4526,7 @@
     break;
 
   case 180:
-#line 1585 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1586 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
@@ -4557,7 +4558,7 @@
     break;
 
   case 181:
-#line 1613 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1614 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -4577,7 +4578,7 @@
     break;
 
   case 182:
-#line 1629 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1630 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -4608,7 +4609,7 @@
     break;
 
   case 183:
-#line 1656 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1657 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
@@ -4640,7 +4641,7 @@
     break;
 
   case 184:
-#line 1684 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1685 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (4)].TypeVal)->get());
     if (STy == 0)
@@ -4670,7 +4671,7 @@
     break;
 
   case 185:
-#line 1710 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1711 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -4694,7 +4695,7 @@
     break;
 
   case 186:
-#line 1730 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1731 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (6)].TypeVal)->get());
     if (STy == 0)
@@ -4724,7 +4725,7 @@
     break;
 
   case 187:
-#line 1756 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1757 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (5)].TypeVal))->getDescription());
@@ -4748,7 +4749,7 @@
     break;
 
   case 188:
-#line 1776 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1777 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4764,7 +4765,7 @@
     break;
 
   case 189:
-#line 1788 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1789 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4775,7 +4776,7 @@
     break;
 
   case 190:
-#line 1795 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1796 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4845,7 +4846,7 @@
     break;
 
   case 191:
-#line 1861 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1862 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4859,7 +4860,7 @@
     break;
 
   case 192:
-#line 1871 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1872 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4873,7 +4874,7 @@
     break;
 
   case 193:
-#line 1881 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1882 "/Volumes/Nanpura/mainline/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");
@@ -4883,7 +4884,7 @@
     break;
 
   case 194:
-#line 1887 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1888 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     uint32_t BitWidth = cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth();
     if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > BitWidth) {
@@ -4897,7 +4898,7 @@
     break;
 
   case 195:
-#line 1897 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1898 "/Volumes/Nanpura/mainline/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");
@@ -4907,7 +4908,7 @@
     break;
 
   case 196:
-#line 1903 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1904 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     uint32_t BitWidth = cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth();
     if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > BitWidth) {
@@ -4921,7 +4922,7 @@
     break;
 
   case 197:
-#line 1913 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1914 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {                      // Boolean constants
     if (cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth() != 1)
       GEN_ERROR("Constant true must have type i1");
@@ -4931,7 +4932,7 @@
     break;
 
   case 198:
-#line 1919 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1920 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {                     // Boolean constants
     if (cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth() != 1)
       GEN_ERROR("Constant false must have type i1");
@@ -4941,7 +4942,7 @@
     break;
 
   case 199:
-#line 1925 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1926 "/Volumes/Nanpura/mainline/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");
@@ -4956,7 +4957,7 @@
     break;
 
   case 200:
-#line 1938 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1939 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (6)].TypeVal))->getDescription());
@@ -4972,7 +4973,7 @@
     break;
 
   case 201:
-#line 1950 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1951 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[(3) - (5)].ConstVal)->getType()))
       GEN_ERROR("GetElementPtr requires a pointer operand");
@@ -4997,7 +4998,7 @@
     break;
 
   case 202:
-#line 1971 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1972 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (8)].ConstVal)->getType() != Type::Int1Ty)
       GEN_ERROR("Select condition must be of boolean type");
@@ -5009,7 +5010,7 @@
     break;
 
   case 203:
-#line 1979 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1980 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType())
       GEN_ERROR("Binary operator types must match");
@@ -5019,7 +5020,7 @@
     break;
 
   case 204:
-#line 1985 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1986 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType())
       GEN_ERROR("Logical operator types must match");
@@ -5034,7 +5035,7 @@
     break;
 
   case 205:
-#line 1996 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1997 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("icmp operand types must match");
@@ -5043,7 +5044,7 @@
     break;
 
   case 206:
-#line 2001 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2002 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("fcmp operand types must match");
@@ -5052,7 +5053,7 @@
     break;
 
   case 207:
-#line 2006 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2007 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("vicmp operand types must match");
@@ -5061,7 +5062,7 @@
     break;
 
   case 208:
-#line 2011 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2012 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("vfcmp operand types must match");
@@ -5070,7 +5071,7 @@
     break;
 
   case 209:
-#line 2016 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2017 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -5080,7 +5081,7 @@
     break;
 
   case 210:
-#line 2022 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2023 "/Volumes/Nanpura/mainline/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");
@@ -5090,7 +5091,7 @@
     break;
 
   case 211:
-#line 2028 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2029 "/Volumes/Nanpura/mainline/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");
@@ -5100,7 +5101,7 @@
     break;
 
   case 212:
-#line 2034 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2035 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<StructType>((yyvsp[(3) - (5)].ConstVal)->getType()) && !isa<ArrayType>((yyvsp[(3) - (5)].ConstVal)->getType()))
       GEN_ERROR("ExtractValue requires an aggregate operand");
@@ -5112,7 +5113,7 @@
     break;
 
   case 213:
-#line 2042 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2043 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<StructType>((yyvsp[(3) - (7)].ConstVal)->getType()) && !isa<ArrayType>((yyvsp[(3) - (7)].ConstVal)->getType()))
       GEN_ERROR("InsertValue requires an aggregate operand");
@@ -5124,7 +5125,7 @@
     break;
 
   case 214:
-#line 2053 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2054 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ConstVector) = (yyvsp[(1) - (3)].ConstVector))->push_back((yyvsp[(3) - (3)].ConstVal));
     CHECK_FOR_ERROR
@@ -5132,7 +5133,7 @@
     break;
 
   case 215:
-#line 2057 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2058 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstVector) = new std::vector<Constant*>();
     (yyval.ConstVector)->push_back((yyvsp[(1) - (1)].ConstVal));
@@ -5141,27 +5142,27 @@
     break;
 
   case 216:
-#line 2065 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2066 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
   case 217:
-#line 2065 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2066 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
   case 218:
-#line 2068 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2069 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
   case 219:
-#line 2068 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2069 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
   case 220:
-#line 2071 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2072 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const Type* VTy = (yyvsp[(1) - (2)].TypeVal)->get();
     Value *V = getVal(VTy, (yyvsp[(2) - (2)].ValIDVal));
@@ -5177,7 +5178,7 @@
     break;
 
   case 221:
-#line 2083 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2084 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     Constant *Val = (yyvsp[(3) - (6)].ConstVal);
     const Type *DestTy = (yyvsp[(5) - (6)].TypeVal)->get();
@@ -5193,7 +5194,7 @@
     break;
 
   case 222:
-#line 2104 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2105 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -5202,7 +5203,7 @@
     break;
 
   case 223:
-#line 2109 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2110 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -5211,12 +5212,12 @@
     break;
 
   case 226:
-#line 2122 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2123 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = false; ;}
     break;
 
   case 227:
-#line 2122 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2123 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
@@ -5224,26 +5225,26 @@
     break;
 
   case 228:
-#line 2126 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2127 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = true; ;}
     break;
 
   case 229:
-#line 2126 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2127 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 230:
-#line 2129 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2130 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 231:
-#line 2132 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2133 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (3)].TypeVal))->getDescription());
@@ -5271,7 +5272,7 @@
     break;
 
   case 232:
-#line 2156 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2157 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ResolveTypeTo((yyvsp[(1) - (3)].StrVal), (yyvsp[(3) - (3)].PrimType));
 
@@ -5286,7 +5287,7 @@
     break;
 
   case 233:
-#line 2168 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2169 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { 
     /* "Externally Visible" Linkage */
     if ((yyvsp[(5) - (6)].ConstVal) == 0) 
@@ -5298,14 +5299,14 @@
     break;
 
   case 234:
-#line 2175 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2176 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
   case 235:
-#line 2179 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2180 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(6) - (7)].ConstVal) == 0) 
       GEN_ERROR("Global value initializer is not a constant");
@@ -5315,14 +5316,14 @@
     break;
 
   case 236:
-#line 2184 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2185 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
   case 237:
-#line 2188 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2189 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(6) - (7)].TypeVal))->getDescription());
@@ -5333,7 +5334,7 @@
     break;
 
   case 238:
-#line 2194 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2195 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
@@ -5341,7 +5342,7 @@
     break;
 
   case 239:
-#line 2198 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2199 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     std::string Name;
     if ((yyvsp[(1) - (5)].StrVal)) {
@@ -5385,21 +5386,21 @@
     break;
 
   case 240:
-#line 2238 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2239 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { 
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 241:
-#line 2241 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2242 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 242:
-#line 2247 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2248 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
   if (AsmSoFar.empty())
@@ -5412,7 +5413,7 @@
     break;
 
   case 243:
-#line 2257 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2258 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setTargetTriple(*(yyvsp[(3) - (3)].StrVal));
     delete (yyvsp[(3) - (3)].StrVal);
@@ -5420,7 +5421,7 @@
     break;
 
   case 244:
-#line 2261 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2262 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setDataLayout(*(yyvsp[(3) - (3)].StrVal));
     delete (yyvsp[(3) - (3)].StrVal);
@@ -5428,7 +5429,7 @@
     break;
 
   case 246:
-#line 2268 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2269 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary(*(yyvsp[(3) - (3)].StrVal));
           delete (yyvsp[(3) - (3)].StrVal);
@@ -5437,7 +5438,7 @@
     break;
 
   case 247:
-#line 2273 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2274 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary(*(yyvsp[(1) - (1)].StrVal));
           delete (yyvsp[(1) - (1)].StrVal);
@@ -5446,14 +5447,14 @@
     break;
 
   case 248:
-#line 2278 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2279 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
           CHECK_FOR_ERROR
         ;}
     break;
 
   case 249:
-#line 2287 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2288 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
@@ -5467,7 +5468,7 @@
     break;
 
   case 250:
-#line 2297 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2298 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -5481,7 +5482,7 @@
     break;
 
   case 251:
-#line 2308 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2309 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[(1) - (1)].ArgList);
     CHECK_FOR_ERROR
@@ -5489,7 +5490,7 @@
     break;
 
   case 252:
-#line 2312 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2313 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[(1) - (3)].ArgList);
     struct ArgListEntry E;
@@ -5502,7 +5503,7 @@
     break;
 
   case 253:
-#line 2321 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2322 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = new ArgListType;
     struct ArgListEntry E;
@@ -5515,7 +5516,7 @@
     break;
 
   case 254:
-#line 2330 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2331 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = 0;
     CHECK_FOR_ERROR
@@ -5523,7 +5524,7 @@
     break;
 
   case 255:
-#line 2336 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2337 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   std::string FunctionName(*(yyvsp[(3) - (11)].StrVal));
   delete (yyvsp[(3) - (11)].StrVal);  // Free strdup'd memory!
@@ -5626,8 +5627,8 @@
     Fn->setGC((yyvsp[(10) - (11)].StrVal)->c_str());
     delete (yyvsp[(10) - (11)].StrVal);
   }
-  if ((yyvsp[(11) - (11)].FunctionNotes)) {
-    Fn->setNotes((yyvsp[(11) - (11)].FunctionNotes));
+  if ((yyvsp[(11) - (11)].ParamAttrs)) {
+    Fn->setNotes((yyvsp[(11) - (11)].ParamAttrs));
   }
 
   // Add all of the arguments we parsed to the function...
@@ -5657,7 +5658,7 @@
     break;
 
   case 258:
-#line 2469 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2470 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = CurFun.CurrentFunction;
 
@@ -5669,7 +5670,7 @@
     break;
 
   case 261:
-#line 2480 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2481 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
   CHECK_FOR_ERROR
@@ -5677,7 +5678,7 @@
     break;
 
   case 262:
-#line 2485 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2486 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.CurrentFunction->setLinkage((yyvsp[(1) - (3)].Linkage));
     CurFun.CurrentFunction->setVisibility((yyvsp[(2) - (3)].Visibility));
@@ -5688,7 +5689,7 @@
     break;
 
   case 263:
-#line 2497 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2498 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -5696,7 +5697,7 @@
     break;
 
   case 264:
-#line 2501 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2502 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -5704,7 +5705,7 @@
     break;
 
   case 265:
-#line 2506 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2507 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {    // A reference to a direct constant
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].SInt64Val));
     CHECK_FOR_ERROR
@@ -5712,7 +5713,7 @@
     break;
 
   case 266:
-#line 2510 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2511 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].UInt64Val));
     CHECK_FOR_ERROR
@@ -5720,7 +5721,7 @@
     break;
 
   case 267:
-#line 2514 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2515 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     (yyval.ValIDVal) = ValID::create(*(yyvsp[(1) - (1)].APIntVal), true);
     delete (yyvsp[(1) - (1)].APIntVal);
@@ -5729,7 +5730,7 @@
     break;
 
   case 268:
-#line 2519 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2520 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     (yyval.ValIDVal) = ValID::create(*(yyvsp[(1) - (1)].APIntVal), false);
     delete (yyvsp[(1) - (1)].APIntVal);
@@ -5738,7 +5739,7 @@
     break;
 
   case 269:
-#line 2524 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2525 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {                     // Perhaps it's an FP constant?
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].FPVal));
     CHECK_FOR_ERROR
@@ -5746,7 +5747,7 @@
     break;
 
   case 270:
-#line 2528 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2529 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getTrue());
     CHECK_FOR_ERROR
@@ -5754,7 +5755,7 @@
     break;
 
   case 271:
-#line 2532 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2533 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getFalse());
     CHECK_FOR_ERROR
@@ -5762,7 +5763,7 @@
     break;
 
   case 272:
-#line 2536 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2537 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createNull();
     CHECK_FOR_ERROR
@@ -5770,7 +5771,7 @@
     break;
 
   case 273:
-#line 2540 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2541 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createUndef();
     CHECK_FOR_ERROR
@@ -5778,7 +5779,7 @@
     break;
 
   case 274:
-#line 2544 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2545 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {     // A vector zero constant.
     (yyval.ValIDVal) = ValID::createZeroInit();
     CHECK_FOR_ERROR
@@ -5786,7 +5787,7 @@
     break;
 
   case 275:
-#line 2548 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2549 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized packed vector
     const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0]->getType();
     unsigned NumElements = (yyvsp[(2) - (3)].ConstVector)->size(); 
@@ -5812,7 +5813,7 @@
     break;
 
   case 276:
-#line 2570 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2571 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0]->getType();
     uint64_t NumElements = (yyvsp[(2) - (3)].ConstVector)->size(); 
@@ -5838,7 +5839,7 @@
     break;
 
   case 277:
-#line 2592 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2593 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Use undef instead of an array because it's inconvenient to determine
     // the element type at this point, there being no elements to examine.
@@ -5848,7 +5849,7 @@
     break;
 
   case 278:
-#line 2598 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2599 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     uint64_t NumElements = (yyvsp[(2) - (2)].StrVal)->length();
     const Type *ETy = Type::Int8Ty;
@@ -5865,7 +5866,7 @@
     break;
 
   case 279:
-#line 2611 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2612 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements((yyvsp[(2) - (3)].ConstVector)->size());
     for (unsigned i = 0, e = (yyvsp[(2) - (3)].ConstVector)->size(); i != e; ++i)
@@ -5881,7 +5882,7 @@
     break;
 
   case 280:
-#line 2623 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2624 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = StructType::get(std::vector<const Type*>());
     (yyval.ValIDVal) = ValID::create(ConstantStruct::get(STy, std::vector<Constant*>()));
@@ -5890,7 +5891,7 @@
     break;
 
   case 281:
-#line 2628 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2629 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements((yyvsp[(3) - (5)].ConstVector)->size());
     for (unsigned i = 0, e = (yyvsp[(3) - (5)].ConstVector)->size(); i != e; ++i)
@@ -5906,7 +5907,7 @@
     break;
 
   case 282:
-#line 2640 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2641 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = StructType::get(std::vector<const Type*>(),
                                             /*isPacked=*/true);
@@ -5916,7 +5917,7 @@
     break;
 
   case 283:
-#line 2646 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2647 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].ConstVal));
     CHECK_FOR_ERROR
@@ -5924,7 +5925,7 @@
     break;
 
   case 284:
-#line 2650 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2651 "/Volumes/Nanpura/mainline/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);
@@ -5934,7 +5935,7 @@
     break;
 
   case 285:
-#line 2660 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2661 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {  // Is it an integer reference...?
     (yyval.ValIDVal) = ValID::createLocalID((yyvsp[(1) - (1)].UIntVal));
     CHECK_FOR_ERROR
@@ -5942,7 +5943,7 @@
     break;
 
   case 286:
-#line 2664 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2665 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createGlobalID((yyvsp[(1) - (1)].UIntVal));
     CHECK_FOR_ERROR
@@ -5950,7 +5951,7 @@
     break;
 
   case 287:
-#line 2668 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2669 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -5959,7 +5960,7 @@
     break;
 
   case 288:
-#line 2673 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2674 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createGlobalName(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -5968,7 +5969,7 @@
     break;
 
   case 291:
-#line 2686 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2687 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -5979,7 +5980,7 @@
     break;
 
   case 292:
-#line 2695 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2696 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = new std::vector<Value *>();
     (yyval.ValueList)->push_back((yyvsp[(1) - (1)].ValueVal)); 
@@ -5988,7 +5989,7 @@
     break;
 
   case 293:
-#line 2700 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2701 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ValueList)=(yyvsp[(1) - (3)].ValueList))->push_back((yyvsp[(3) - (3)].ValueVal)); 
     CHECK_FOR_ERROR
@@ -5996,7 +5997,7 @@
     break;
 
   case 294:
-#line 2705 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2706 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
     CHECK_FOR_ERROR
@@ -6004,7 +6005,7 @@
     break;
 
   case 295:
-#line 2709 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2710 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Do not allow functions with 0 basic blocks   
     (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
     CHECK_FOR_ERROR
@@ -6012,7 +6013,7 @@
     break;
 
   case 296:
-#line 2718 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2719 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     setValueName((yyvsp[(3) - (3)].TermInstVal), (yyvsp[(2) - (3)].StrVal));
     CHECK_FOR_ERROR
@@ -6024,7 +6025,7 @@
     break;
 
   case 297:
-#line 2727 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2728 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   CHECK_FOR_ERROR
   int ValNum = InsertValue((yyvsp[(3) - (3)].TermInstVal));
@@ -6039,7 +6040,7 @@
     break;
 
   case 298:
-#line 2740 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2741 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (CastInst *CI1 = dyn_cast<CastInst>((yyvsp[(2) - (2)].InstVal)))
       if (CastInst *CI2 = dyn_cast<CastInst>(CI1->getOperand(0)))
@@ -6052,7 +6053,7 @@
     break;
 
   case 299:
-#line 2749 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2750 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {          // Empty space between instruction lists
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
     CHECK_FOR_ERROR
@@ -6060,7 +6061,7 @@
     break;
 
   case 300:
-#line 2753 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2754 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {             // Labelled (named) basic block
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal)));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -6070,7 +6071,7 @@
     break;
 
   case 301:
-#line 2761 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2762 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Return with a result...
     ValueList &VL = *(yyvsp[(2) - (2)].ValueList);
     assert(!VL.empty() && "Invalid ret operands!");
@@ -6094,7 +6095,7 @@
     break;
 
   case 302:
-#line 2781 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2782 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {                                    // Return with no result...
     (yyval.TermInstVal) = ReturnInst::Create();
     CHECK_FOR_ERROR
@@ -6102,7 +6103,7 @@
     break;
 
   case 303:
-#line 2785 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2786 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {                           // Unconditional Branch...
     BasicBlock* tmpBB = getBBVal((yyvsp[(3) - (3)].ValIDVal));
     CHECK_FOR_ERROR
@@ -6111,7 +6112,7 @@
     break;
 
   case 304:
-#line 2790 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2791 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {  
     if (cast<IntegerType>((yyvsp[(2) - (9)].PrimType))->getBitWidth() != 1)
       GEN_ERROR("Branch condition must have type i1");
@@ -6126,7 +6127,7 @@
     break;
 
   case 305:
-#line 2801 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2802 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[(2) - (9)].PrimType), (yyvsp[(3) - (9)].ValIDVal));
     CHECK_FOR_ERROR
@@ -6149,7 +6150,7 @@
     break;
 
   case 306:
-#line 2820 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2821 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[(2) - (8)].PrimType), (yyvsp[(3) - (8)].ValIDVal));
     CHECK_FOR_ERROR
@@ -6162,7 +6163,7 @@
     break;
 
   case 307:
-#line 2830 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2831 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -6251,7 +6252,7 @@
     break;
 
   case 308:
-#line 2915 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2916 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnwindInst();
     CHECK_FOR_ERROR
@@ -6259,7 +6260,7 @@
     break;
 
   case 309:
-#line 2919 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2920 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnreachableInst();
     CHECK_FOR_ERROR
@@ -6267,7 +6268,7 @@
     break;
 
   case 310:
-#line 2926 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2927 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = (yyvsp[(1) - (6)].JumpTable);
     Constant *V = cast<Constant>(getExistingVal((yyvsp[(2) - (6)].PrimType), (yyvsp[(3) - (6)].ValIDVal)));
@@ -6282,7 +6283,7 @@
     break;
 
   case 311:
-#line 2937 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2938 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
     Constant *V = cast<Constant>(getExistingVal((yyvsp[(1) - (5)].PrimType), (yyvsp[(2) - (5)].ValIDVal)));
@@ -6298,7 +6299,7 @@
     break;
 
   case 312:
-#line 2950 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2951 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Is this definition named?? if so, assign the name...
     setValueName((yyvsp[(2) - (2)].InstVal), (yyvsp[(1) - (2)].StrVal));
@@ -6310,7 +6311,7 @@
     break;
 
   case 313:
-#line 2959 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2960 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
     int ValNum = InsertValue((yyvsp[(2) - (2)].InstVal));
@@ -6325,7 +6326,7 @@
     break;
 
   case 314:
-#line 2972 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2973 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {    // Used for PHI nodes
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (6)].TypeVal))->getDescription());
@@ -6340,7 +6341,7 @@
     break;
 
   case 315:
-#line 2983 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2984 "/Volumes/Nanpura/mainline/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));
@@ -6352,7 +6353,7 @@
     break;
 
   case 316:
-#line 2993 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2994 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
     if (!UpRefs.empty())
@@ -6367,7 +6368,7 @@
     break;
 
   case 317:
-#line 3004 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3005 "/Volumes/Nanpura/mainline/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
@@ -6379,7 +6380,7 @@
     break;
 
   case 318:
-#line 3012 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3013 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
     if (!UpRefs.empty())
@@ -6393,7 +6394,7 @@
     break;
 
   case 319:
-#line 3022 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3023 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
     (yyval.ParamList) = (yyvsp[(1) - (6)].ParamList);
@@ -6404,17 +6405,17 @@
     break;
 
   case 320:
-#line 3029 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3030 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamList) = new ParamList(); ;}
     break;
 
   case 321:
-#line 3032 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3033 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueList) = new std::vector<Value*>(); ;}
     break;
 
   case 322:
-#line 3033 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3034 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = (yyvsp[(1) - (3)].ValueList);
     (yyval.ValueList)->push_back((yyvsp[(3) - (3)].ValueVal));
@@ -6423,7 +6424,7 @@
     break;
 
   case 323:
-#line 3041 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3042 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstantList) = new std::vector<unsigned>();
     if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val))
@@ -6433,7 +6434,7 @@
     break;
 
   case 324:
-#line 3047 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3048 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstantList) = (yyvsp[(1) - (3)].ConstantList);
     if ((unsigned)(yyvsp[(3) - (3)].UInt64Val) != (yyvsp[(3) - (3)].UInt64Val))
@@ -6444,7 +6445,7 @@
     break;
 
   case 325:
-#line 3056 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3057 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -6452,7 +6453,7 @@
     break;
 
   case 326:
-#line 3060 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3061 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -6460,7 +6461,7 @@
     break;
 
   case 327:
-#line 3065 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3066 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
@@ -6480,7 +6481,7 @@
     break;
 
   case 328:
-#line 3081 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3082 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
@@ -6501,7 +6502,7 @@
     break;
 
   case 329:
-#line 3098 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3099 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6517,7 +6518,7 @@
     break;
 
   case 330:
-#line 3110 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3111 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6533,7 +6534,7 @@
     break;
 
   case 331:
-#line 3122 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3123 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6551,7 +6552,7 @@
     break;
 
   case 332:
-#line 3136 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3137 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6569,7 +6570,7 @@
     break;
 
   case 333:
-#line 3150 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3151 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription());
@@ -6585,7 +6586,7 @@
     break;
 
   case 334:
-#line 3162 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3163 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (isa<VectorType>((yyvsp[(2) - (6)].ValueVal)->getType())) {
       // vector select
@@ -6610,7 +6611,7 @@
     break;
 
   case 335:
-#line 3183 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3184 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription());
@@ -6621,7 +6622,7 @@
     break;
 
   case 336:
-#line 3190 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3191 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[(2) - (4)].ValueVal), (yyvsp[(4) - (4)].ValueVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -6631,7 +6632,7 @@
     break;
 
   case 337:
-#line 3196 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3197 "/Volumes/Nanpura/mainline/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");
@@ -6641,7 +6642,7 @@
     break;
 
   case 338:
-#line 3202 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3203 "/Volumes/Nanpura/mainline/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");
@@ -6651,7 +6652,7 @@
     break;
 
   case 339:
-#line 3208 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3209 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const Type *Ty = (yyvsp[(2) - (2)].PHIList)->front().first->getType();
     if (!Ty->isFirstClassType())
@@ -6670,7 +6671,7 @@
     break;
 
   case 340:
-#line 3224 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3225 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -6763,7 +6764,7 @@
     break;
 
   case 341:
-#line 3313 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3314 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = (yyvsp[(1) - (1)].InstVal);
     CHECK_FOR_ERROR
@@ -6771,7 +6772,7 @@
     break;
 
   case 342:
-#line 3318 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3319 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -6779,7 +6780,7 @@
     break;
 
   case 343:
-#line 3322 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3323 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -6787,7 +6788,7 @@
     break;
 
   case 344:
-#line 3329 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3330 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription());
@@ -6798,7 +6799,7 @@
     break;
 
   case 345:
-#line 3336 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3337 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription());
@@ -6812,7 +6813,7 @@
     break;
 
   case 346:
-#line 3346 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3347 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription());
@@ -6823,7 +6824,7 @@
     break;
 
   case 347:
-#line 3353 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3354 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription());
@@ -6837,7 +6838,7 @@
     break;
 
   case 348:
-#line 3363 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3364 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[(2) - (2)].ValueVal)->getType()))
       GEN_ERROR("Trying to free nonpointer type " + 
@@ -6848,7 +6849,7 @@
     break;
 
   case 349:
-#line 3371 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3372 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
@@ -6866,7 +6867,7 @@
     break;
 
   case 350:
-#line 3385 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3386 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (7)].TypeVal))->getDescription());
@@ -6887,7 +6888,7 @@
     break;
 
   case 351:
-#line 3402 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3403 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
@@ -6905,7 +6906,7 @@
     break;
 
   case 352:
-#line 3416 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3417 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription());
@@ -6924,7 +6925,7 @@
     break;
 
   case 353:
-#line 3431 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3432 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription());
@@ -6943,7 +6944,7 @@
     break;
 
   case 354:
-#line 3446 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3447 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (7)].TypeVal))->getDescription());
@@ -6965,7 +6966,7 @@
 
 
 /* Line 1267 of yacc.c.  */
-#line 6969 "llvmAsmParser.tab.c"
+#line 6970 "llvmAsmParser.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -7179,7 +7180,7 @@
 }
 
 
-#line 3465 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3466 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
 
 
 // common code from the two 'RunVMAsmParser' functions

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

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs Tue Sep 23 18:25:44 2008
@@ -394,8 +394,7 @@
 
   llvm::GlobalValue::LinkageTypes         Linkage;
   llvm::GlobalValue::VisibilityTypes      Visibility;
-  llvm::ParameterAttributes         ParamAttrs;
-  llvm::ParameterAttributes         FunctionNotes;
+  llvm::Attributes                  ParamAttrs;
   llvm::APInt                       *APIntVal;
   int64_t                           SInt64Val;
   uint64_t                          UInt64Val;
@@ -416,7 +415,7 @@
   llvm::FCmpInst::Predicate         FPredicate;
 }
 /* Line 1529 of yacc.c.  */
-#line 420 "llvmAsmParser.tab.h"
+#line 419 "llvmAsmParser.tab.h"
 	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1

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

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.y (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.y Tue Sep 23 18:25:44 2008
@@ -994,8 +994,7 @@
 
   llvm::GlobalValue::LinkageTypes         Linkage;
   llvm::GlobalValue::VisibilityTypes      Visibility;
-  llvm::ParameterAttributes         ParamAttrs;
-  llvm::ParameterAttributes         FunctionNotes;
+  llvm::Attributes                  ParamAttrs;
   llvm::APInt                       *APIntVal;
   int64_t                           SInt64Val;
   uint64_t                          UInt64Val;

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

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs Tue Sep 23 18:25:44 2008
@@ -994,8 +994,7 @@
 
   llvm::GlobalValue::LinkageTypes         Linkage;
   llvm::GlobalValue::VisibilityTypes      Visibility;
-  llvm::ParameterAttributes         ParamAttrs;
-  llvm::ParameterAttributes         FunctionNotes;
+  llvm::Attributes                  ParamAttrs;
   llvm::APInt                       *APIntVal;
   int64_t                           SInt64Val;
   uint64_t                          UInt64Val;




From evan.cheng at apple.com  Tue Sep 23 18:27:39 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Tue, 23 Sep 2008 16:27:39 -0700
Subject: [llvm-commits] [llvm] r56384 - in /llvm/trunk/lib/CodeGen:
	RegAllocLinearScan.cpp SimpleRegisterCoalescing.cpp
In-Reply-To: <787EC48F-5ED1-4529-A821-021FC97B069F@apple.com>
References: <200809200203.m8K234YA013252@zion.cs.uiuc.edu>
	<4F71A860-E342-4A07-8211-0A59A1AA154D@apple.com>
	<F80F5034-326C-4AF5-A7A6-84F8C1C3AF23@apple.com>
	<8D81D6DA-8289-49E2-B352-53C6C313FDA8@apple.com>
	<33791BFC-A09D-43EB-B4D0-6582A9243EED@apple.com>
	<ADDCBC77-DB9F-46BB-A73D-FADC943C29D7@apple.com>
	<6AABEF56-39B2-4D47-8928-7FC4AC7AB61B@apple.com>
	<73CDDC9A-1C75-4A15-9931-12DDC51EABCB@apple.com>
	<C661BBE3-98E2-461C-BD90-5CA12268A65C@apple.com>
	<AAA125E9-8897-4B47-A405-CDFA1C83E8DA@apple.com>
	<99141E76-1A5C-4852-B1B5-7053DA9B02D5@apple.com>
	<787EC48F-5ED1-4529-A821-021FC97B069F@apple.com>
Message-ID: <E6EE2B40-6E5D-43D8-AFFA-FBEC61B72ED2@apple.com>


On Sep 23, 2008, at 3:17 PM, Dale Johannesen wrote:
>>
>
> This did basically Just Work (I haven't run the gcc testsuite yet, but
> it doesn't break anything in
> the llvm testsuite and fixes all the examples in our bug reports.)
> Unfortunately, this approach
> only works in the linear scan RA, while we use a different RA with -
> O0.... I guess I need to fix
> that before turning it on.

Yay. Good thing I was wrong. :-) Would you like to add the support  
that allows us to model it as operand constraint so we can test it on  
more things?

Evan

>
>
>> Owen, can your liveintervals renumbering work be impacted?
>> i.e. Does it assume def must be one cycle before use?
>>
>>>
>>>
>>>>> Can earlyclobber operands be used to model the armv4 "mul"  
>>>>> register
>>>>> weirdness where the input and output regs can't be the same?
>>>>
>>>> We could, but the correct way to model it is to push the use down
>>>> one
>>>> cycle, not def up one cycle. The problem with early clobber is the
>>>> def
>>>> cannot overlap any of the uses (both Rm and Rs). In the ARM mul
>>>> case,
>>>> the def cannot overlap Rm only.
>>>
>>> Sure, I agree with that.  This is also true of most inline asms with
>>> multiple instructions (like the example I gave).  Using earlyclobber
>>> should be a conservative but correct solution (and much better than
>>> using the 'multiply fixer' pass that used to exist).
>>>
>>> This would also make it easier to test that earlyclobber is working
>>> right (multiplies are more frequent than & in asms), which is why I
>>> brought it up. :)
>>
>> That will require some minor tblgen and TargetInstrDesc changes. If
>> someone want to do that, sure.
>>
>> Evan
>>
>>>
>>>
>>> -Chris
>>>
>>> _______________________________________________
>>> 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
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From dpatel at apple.com  Tue Sep 23 18:27:47 2008
From: dpatel at apple.com (Devang Patel)
Date: Tue, 23 Sep 2008 16:27:47 -0700
Subject: [llvm-commits] [llvm] r56511 - in /llvm/trunk: include/llvm/
	lib/AsmParser/ lib/Bitcode/Reader/ lib/Bitcode/Writer/
	lib/Target/X86/AsmPrinter/
	lib/Transforms/IPO/	lib/Transforms/Scalar/
	lib/Transforms/Utils/ lib/VMCore/
In-Reply-To: <D7685178-B66C-4822-A33D-C27F4A93238A@apple.com>
References: <200809232235.m8NMZJGn030760@zion.cs.uiuc.edu>
	<D7685178-B66C-4822-A33D-C27F4A93238A@apple.com>
Message-ID: <C491355D-79B5-4741-8D79-9A1912614E8C@apple.com>


On Sep 23, 2008, at 4:09 PM, Chris Lattner wrote:

> On Sep 23, 2008, at 3:35 PM, Devang Patel wrote:
>> URL: http://llvm.org/viewvc/llvm-project?rev=56511&view=rev
>> Log:
>> Use parameter attribute store (soon to be renamed) for
>> Function Notes also. Function notes are stored at index ~0.
>
> Yay for convergence :)
>
>> +  bool hasNote(ParameterAttributes N) const {
>> +  	// Notes are stored at ~0 index in parameter attribute list
>> +    return (!isDeclaration() && paramHasAttr(~0, N));
>>  }
>
> Is there a specific reason to check isDeclaration() here?  That seems
> somewhat strange.  Clients should check this if they care.

ok

>
>
>>
>>
>>  /// setNotes - Set notes for this function
>>  ///
>> -  void setNotes(const FunctionNotes P) { Notes = Notes | P;}
>> +  void setNotes(const ParameterAttributes N) {
>> +  	// Notes are stored at ~0 index in parameter attribute list
>> +  	addParamAttr(~0, N);
>> +  }
>
> Tabs.

oops. gone.

>
>
>> +++ llvm/trunk/lib/AsmParser/llvmAsmParser.y Tue Sep 23 17:35:17 2008
>> @@ -995,7 +995,7 @@
>>  llvm::GlobalValue::LinkageTypes         Linkage;
>>  llvm::GlobalValue::VisibilityTypes      Visibility;
>>  llvm::ParameterAttributes         ParamAttrs;
>> -  llvm::FunctionNotes               FunctionNotes;
>> +  llvm::ParameterAttributes         FunctionNotes;
>
> Why not just use the existing 'ParamAttrs' field?

Fixed.

>
>
> Is the syntax of notes in .ll files going to change to follow
> attributes?

No. We'll continue to use notes() syntax.
-
Devang


From dalej at apple.com  Tue Sep 23 18:31:58 2008
From: dalej at apple.com (Dale Johannesen)
Date: Tue, 23 Sep 2008 16:31:58 -0700
Subject: [llvm-commits] [llvm] r56384 - in /llvm/trunk/lib/CodeGen:
	RegAllocLinearScan.cpp SimpleRegisterCoalescing.cpp
In-Reply-To: <E6EE2B40-6E5D-43D8-AFFA-FBEC61B72ED2@apple.com>
References: <200809200203.m8K234YA013252@zion.cs.uiuc.edu>
	<4F71A860-E342-4A07-8211-0A59A1AA154D@apple.com>
	<F80F5034-326C-4AF5-A7A6-84F8C1C3AF23@apple.com>
	<8D81D6DA-8289-49E2-B352-53C6C313FDA8@apple.com>
	<33791BFC-A09D-43EB-B4D0-6582A9243EED@apple.com>
	<ADDCBC77-DB9F-46BB-A73D-FADC943C29D7@apple.com>
	<6AABEF56-39B2-4D47-8928-7FC4AC7AB61B@apple.com>
	<73CDDC9A-1C75-4A15-9931-12DDC51EABCB@apple.com>
	<C661BBE3-98E2-461C-BD90-5CA12268A65C@apple.com>
	<AAA125E9-8897-4B47-A405-CDFA1C83E8DA@apple.com>
	<99141E76-1A5C-4852-B1B5-7053DA9B02D5@apple.com>
	<787EC48F-5ED1-4529-A821-021FC97B069F@apple.com>
	<E6EE2B40-6E5D-43D8-AFFA-FBEC61B72ED2@apple.com>
Message-ID: <F8333ED3-A96A-435F-8DFD-976A8F13733C@apple.com>


On Sep 23, 2008, at 4:27 PMPDT, Evan Cheng wrote:

>
> On Sep 23, 2008, at 3:17 PM, Dale Johannesen wrote:
>>>
>>
>> This did basically Just Work (I haven't run the gcc testsuite yet,  
>> but
>> it doesn't break anything in
>> the llvm testsuite and fixes all the examples in our bug reports.)
>> Unfortunately, this approach
>> only works in the linear scan RA, while we use a different RA with -
>> O0.... I guess I need to fix
>> that before turning it on.
>
> Yay. Good thing I was wrong. :-) Would you like to add the support
> that allows us to model it as operand constraint so we can test it on
> more things?

Are you talking about the "minor tblgen and TargetInstrDesc changes"
described below?   Not sure I understand how that would work, and I
don't really want to wait for it before checking in.

> Evan
>
>>
>>
>>> Owen, can your liveintervals renumbering work be impacted?
>>> i.e. Does it assume def must be one cycle before use?
>>>
>>>>
>>>>
>>>>>> Can earlyclobber operands be used to model the armv4 "mul"
>>>>>> register
>>>>>> weirdness where the input and output regs can't be the same?
>>>>>
>>>>> We could, but the correct way to model it is to push the use down
>>>>> one
>>>>> cycle, not def up one cycle. The problem with early clobber is the
>>>>> def
>>>>> cannot overlap any of the uses (both Rm and Rs). In the ARM mul
>>>>> case,
>>>>> the def cannot overlap Rm only.
>>>>
>>>> Sure, I agree with that.  This is also true of most inline asms  
>>>> with
>>>> multiple instructions (like the example I gave).  Using  
>>>> earlyclobber
>>>> should be a conservative but correct solution (and much better than
>>>> using the 'multiply fixer' pass that used to exist).
>>>>
>>>> This would also make it easier to test that earlyclobber is working
>>>> right (multiplies are more frequent than & in asms), which is why I
>>>> brought it up. :)
>>>
>>> That will require some minor tblgen and TargetInstrDesc changes. If
>>> someone want to do that, sure.
>>>
>>> Evan
>>>
>>>>
>>>>
>>>> -Chris
>>>>
>>>> _______________________________________________
>>>> 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
>>
>> _______________________________________________
>> 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 dpatel at apple.com  Tue Sep 23 18:32:17 2008
From: dpatel at apple.com (Devang Patel)
Date: Tue, 23 Sep 2008 23:32:17 -0000
Subject: [llvm-commits] [llvm] r56521 - in /llvm/trunk:
 include/llvm/Attributes.h lib/VMCore/Attributes.cpp
Message-ID: <200809232332.m8NNWIeN000365@zion.cs.uiuc.edu>

Author: dpatel
Date: Tue Sep 23 18:32:15 2008
New Revision: 56521

URL: http://llvm.org/viewvc/llvm-project?rev=56521&view=rev
Log:
80 cols

Modified:
    llvm/trunk/include/llvm/Attributes.h
    llvm/trunk/lib/VMCore/Attributes.cpp

Modified: llvm/trunk/include/llvm/Attributes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Attributes.h?rev=56521&r1=56520&r2=56521&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Attributes.h (original)
+++ llvm/trunk/include/llvm/Attributes.h Tue Sep 23 18:32:15 2008
@@ -1,4 +1,4 @@
-//===-- llvm/Attributes.h - Container for ParamAttrs ---*- C++ -*-===//
+//===-- llvm/Attributes.h - Container for ParamAttrs ---*---------- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //

Modified: llvm/trunk/lib/VMCore/Attributes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Attributes.cpp?rev=56521&r1=56520&r2=56521&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/Attributes.cpp (original)
+++ llvm/trunk/lib/VMCore/Attributes.cpp Tue Sep 23 18:32:15 2008
@@ -1,4 +1,4 @@
-//===-- Attributes.cpp - Implement ParamAttrsList ----------------===//
+//===-- Attributes.cpp - Implement ParamAttrsList -------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //




From dalej at apple.com  Tue Sep 23 18:37:38 2008
From: dalej at apple.com (Dale Johannesen)
Date: Tue, 23 Sep 2008 16:37:38 -0700
Subject: [llvm-commits] [llvm] r56326 - in /llvm/trunk:
	include/llvm/CodeGen/LiveInterval.h
	include/llvm/CodeGen/LiveIntervalAnalysis.h	lib/CodeGen/LiveInterval.cpp
	lib/CodeGen/LiveIntervalAnalysis.cpp	lib/CodeGen/RegAllocLinearScan.cpp
In-Reply-To: <7568A867-12B5-4B05-B7CB-A4C647B86313@apple.com>
References: <200809190102.m8J12ZW2019167@zion.cs.uiuc.edu>
	<7568A867-12B5-4B05-B7CB-A4C647B86313@apple.com>
Message-ID: <94295C3A-12E4-4316-90E4-65AA19D104A3@apple.com>


On Sep 23, 2008, at 4:11 PMPDT, Dan Gohman wrote:

> Hi Dale,
>
> This commit caused a regression in
> test/CodeGen/PowerPC/2007-09-11-RegCoalescerAssert.ll
> in the "martini x86_64" nightly tester.
>
> It's an llc abort, and it's reproducible by running
> llc with the following explicit triple:
> -march=ppc64 -mtriple=powerpc-unknown-linux-gnu
>
> Can you investigate?

It works correctly in my local llc, with the latest rewrite of this  
stuff.
So I think the thing to do is finish that and check it in.
(Odd that it didn't crash when I ran this before checkin, though, only
obvious difference between linux & darwin is the output register syntax,
and I don't see that causing a crash.  What does the crash look like?)

> Thanks,
>
> Dan
>
> On Sep 18, 2008, at 6:02 PM, Dale Johannesen wrote:
>
>> Author: johannes
>> Date: Thu Sep 18 20:02:35 2008
>> New Revision: 56326
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=56326&view=rev
>> Log:
>> Remove AsmThatEarlyClobber etc. from LiveIntervalAnalysis
>> and redo as linked list walk.  Logic moved into RA.
>> Per review feedback.
>>
>>
>> Modified:
>>   llvm/trunk/include/llvm/CodeGen/LiveInterval.h
>>   llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h
>>   llvm/trunk/lib/CodeGen/LiveInterval.cpp
>>   llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp
>>   llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp
>>
>> Modified: llvm/trunk/include/llvm/CodeGen/LiveInterval.h
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/LiveInterval.h?rev=56326&r1=56325&r2=56326&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/include/llvm/CodeGen/LiveInterval.h (original)
>> +++ llvm/trunk/include/llvm/CodeGen/LiveInterval.h Thu Sep 18
>> 20:02:35 2008
>> @@ -105,12 +105,17 @@
>>                         // if the top bits is set, it represents a
>> stack slot.
>>    unsigned preference; // preferred register to allocate for this
>> interval
>>    float weight;        // weight of this interval
>> +    bool isEarlyClobber;
>> +    bool overlapsEarlyClobber;
>>    Ranges ranges;       // the ranges in which this register is live
>>    VNInfoList valnos;   // value#'s
>>
>>  public:
>> -    LiveInterval(unsigned Reg, float Weight, bool IsSS = false)
>> -      : reg(Reg), preference(0), weight(Weight) {
>> +    LiveInterval(unsigned Reg, float Weight, bool IsSS = false,
>> +                 bool IsEarlyClobber = false, bool
>> OverlapsEarlyClobber = false)
>> +      : reg(Reg), preference(0), weight(Weight),
>> +        isEarlyClobber(IsEarlyClobber),
>> +        overlapsEarlyClobber(OverlapsEarlyClobber) {
>>      if (IsSS)
>>        reg = reg | (1U << (sizeof(unsigned)*8-1));
>>    }
>>
>> Modified: llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h?rev=56326&r1=56325&r2=56326&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h (original)
>> +++ llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h Thu Sep
>> 18 20:02:35 2008
>> @@ -65,22 +65,6 @@
>>    AliasAnalysis *aa_;
>>    LiveVariables* lv_;
>>
>> -    /// AsmsWithEarlyClobber - maps a virtual register number to
>> all the
>> -    /// inline asm's that have the register marked earlyclobber.
>> -    ///
>> -    std::multimap<unsigned, MachineInstr*> AsmsThatEarlyClobber;
>> -
>> -    /// AsmsWithEarlyClobberConflict - maps a virtual register  
>> number
>> -    /// to all the inline asm's that have earlyclobber operands
>> elsewhere
>> -    /// and use the register as a (non-earlyclobber) input.
>> -    ///
>> -    /// Note: earlyclobber operands may not be assigned the same
>> register as
>> -    /// each other, or as earlyclobber-conflict operands.  However
>> two
>> -    /// earlyclobber-conflict operands may be assigned the same
>> register if
>> -    /// they happen to contain the same value.
>> -    ///
>> -    std::multimap<unsigned, MachineInstr*>
>> AsmsWithEarlyClobberConflict;
>> -
>>    /// Special pool allocator for VNInfo's (LiveInterval val#).
>>    ///
>>    BumpPtrAllocator VNInfoAllocator;
>> @@ -353,11 +337,6 @@
>>    unsigned getNumConflictsWithPhysReg(const LiveInterval &li,
>>                                        unsigned PhysReg) const;
>>
>> -    /// noEarlyclobberConflict - see whether virtual reg VReg has a
>> conflict
>> -    /// with hard reg HReg because HReg is used as an earlyclobber
>> register in
>> -    /// asm that also has VReg live into or across it.
>> -    bool noEarlyclobberConflict(unsigned VReg, VirtRegMap &vrm,
>> unsigned HReg);
>> -
>>    /// computeNumbering - Compute the index numbering.
>>    void computeNumbering();
>>
>>
>> Modified: llvm/trunk/lib/CodeGen/LiveInterval.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveInterval.cpp?rev=56326&r1=56325&r2=56326&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/CodeGen/LiveInterval.cpp (original)
>> +++ llvm/trunk/lib/CodeGen/LiveInterval.cpp Thu Sep 18 20:02:35 2008
>> @@ -686,6 +686,10 @@
>>    OS << "%reg" << reg;
>>
>>  OS << ',' << weight;
>> +  if (isEarlyClobber)
>> +    OS << ",earlyclobber";
>> +  if (overlapsEarlyClobber)
>> +    OS << ",overlapsearly";
>>
>>  if (empty())
>>    OS << " EMPTY";
>>
>> Modified: llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp?rev=56326&r1=56325&r2=56326&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp (original)
>> +++ llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Thu Sep 18
>> 20:02:35 2008
>> @@ -674,8 +674,6 @@
>> /// live interval is an interval [i, j) where 1 <= i <= j < N for
>> /// which a variable is live
>> void LiveIntervals::computeIntervals() {
>> -  AsmsThatEarlyClobber.clear();
>> -  AsmsWithEarlyClobberConflict.clear();
>>
>>  DOUT << "********** COMPUTING LIVE INTERVALS **********\n"
>>       << "********** Function: "
>> @@ -716,13 +714,15 @@
>>        if (MO.isRegister() && MO.getReg() && MO.isDef()) {
>>          handleRegisterDef(MBB, MI, MIIndex, MO, i);
>>          if (MO.isEarlyClobber()) {
>> -            AsmsThatEarlyClobber.insert(std::make_pair(MO.getReg(),
>> MI));
>> +            LiveInterval &interval =
>> getOrCreateInterval(MO.getReg());
>> +            interval.isEarlyClobber = true;
>>          }
>>        }
>>        if (MO.isRegister() && !MO.isDef() &&
>>            MO.getReg() &&
>> TargetRegisterInfo::isVirtualRegister(MO.getReg()) &&
>>            MO.overlapsEarlyClobber()) {
>> -
>> AsmsWithEarlyClobberConflict.insert(std::make_pair(MO.getReg(), MI));
>> +          LiveInterval &interval = getOrCreateInterval(MO.getReg());
>> +          interval.overlapsEarlyClobber = true;
>>        }
>>      }
>>
>> @@ -752,73 +752,6 @@
>>  return ResVal;
>> }
>>
>> -/// noEarlyclobberConflict - see whether virtual reg VReg has a
>> conflict with
>> -/// hard reg HReg because of earlyclobbers.
>> -///
>> -/// Earlyclobber operands may not be assigned the same register as
>> -/// each other, or as earlyclobber-conflict operands (i.e. those  
>> that
>> -/// are non-earlyclobbered inputs to an asm that also has
>> earlyclobbers).
>> -///
>> -/// Thus there are two cases to check for:
>> -/// 1.  VReg is an earlyclobber-conflict register and HReg is an
>> earlyclobber
>> -/// register in some asm that also has VReg as an input.
>> -/// 2.  VReg is an earlyclobber register and HReg is an
>> earlyclobber-conflict
>> -/// input elsewhere in some asm.
>> -/// In both cases HReg can be assigned by the user, or assigned
>> early in
>> -/// register allocation.
>> -///
>> -/// Dropping the distinction between earlyclobber and earlyclobber-
>> conflict,
>> -/// keeping only one multimap, looks promising, but two
>> earlyclobber-conflict
>> -/// operands may be assigned the same register if they happen to
>> contain the
>> -/// same value, and that implementation would prevent this.
>> -///
>> -bool LiveIntervals::noEarlyclobberConflict(unsigned VReg,
>> VirtRegMap &vrm,
>> -                                           unsigned HReg) {
>> -  typedef std::multimap<unsigned, MachineInstr*>::iterator It;
>> -
>> -  // Short circuit the most common case.
>> -  if (AsmsWithEarlyClobberConflict.size()!=0) {
>> -    std::pair<It, It> x =
>> AsmsWithEarlyClobberConflict.equal_range(VReg);
>> -    for (It I = x.first; I!=x.second; I++) {
>> -      MachineInstr* MI = I->second;
>> -      for (int i = MI->getNumOperands() - 1; i >= 0; --i) {
>> -        MachineOperand &MO = MI->getOperand(i);
>> -        if (MO.isRegister() && MO.isEarlyClobber()) {
>> -          unsigned PhysReg = MO.getReg();
>> -          if (PhysReg &&
>> TargetRegisterInfo::isVirtualRegister(PhysReg)) {
>> -            if (!vrm.hasPhys(PhysReg))
>> -              continue;
>> -            PhysReg = vrm.getPhys(PhysReg);
>> -          }
>> -          if (PhysReg==HReg)
>> -            return false;
>> -        }
>> -      }
>> -    }
>> -  }
>> -  // Short circuit the most common case.
>> -  if (AsmsThatEarlyClobber.size()!=0) {
>> -    std::pair<It, It> x = AsmsThatEarlyClobber.equal_range(VReg);
>> -    for (It I = x.first; I!=x.second; I++) {
>> -      MachineInstr* MI = I->second;
>> -      for (int i = MI->getNumOperands() - 1; i >= 0; --i) {
>> -        MachineOperand &MO = MI->getOperand(i);
>> -        if (MO.isRegister() && MO.overlapsEarlyClobber()) {
>> -          unsigned PhysReg = MO.getReg();
>> -          if (PhysReg &&
>> TargetRegisterInfo::isVirtualRegister(PhysReg)) {
>> -            if (!vrm.hasPhys(PhysReg))
>> -              continue;
>> -            PhysReg = vrm.getPhys(PhysReg);
>> -          }
>> -          if (PhysReg==HReg)
>> -            return false;
>> -        }
>> -      }
>> -    }
>> -  }
>> -  return true;
>> -}
>> -
>> LiveInterval* LiveIntervals::createInterval(unsigned reg) {
>>  float Weight = TargetRegisterInfo::isPhysicalRegister(reg) ?
>>                       HUGE_VALF : 0.0F;
>>
>> Modified: llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp?rev=56326&r1=56325&r2=56326&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp (original)
>> +++ llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp Thu Sep 18
>> 20:02:35 2008
>> @@ -173,6 +173,8 @@
>>
>>    void ComputeRelatedRegClasses();
>>
>> +    bool noEarlyClobberConflict(LiveInterval *cur, unsigned RegNo);
>> +
>>    template <typename ItTy>
>>    void printIntervals(const char* const str, ItTy i, ItTy e) const {
>>      if (str) DOUT << str << " intervals:\n";
>> @@ -1001,6 +1003,73 @@
>>    unhandled_.push(added[i]);
>> }
>>
>> +/// noEarlyClobberConflict - see whether LiveInternal cur has a
>> conflict with
>> +/// hard reg HReg because of earlyclobbers.
>> +///
>> +/// Earlyclobber operands may not be assigned the same register as
>> +/// each other, or as earlyclobber-conflict operands (i.e. those  
>> that
>> +/// are non-earlyclobbered inputs to an asm that also has
>> earlyclobbers).
>> +///
>> +/// Thus there are two cases to check for:
>> +/// 1.  cur->reg is an earlyclobber-conflict register and HReg is an
>> +/// earlyclobber register in some asm that also has cur->reg as an
>> input.
>> +/// 2.  cur->reg is an earlyclobber register and HReg is an
>> +/// earlyclobber-conflict input, or a different earlyclobber
>> register,
>> +/// elsewhere in some asm.
>> +/// In both cases HReg can be assigned by the user, or assigned
>> early in
>> +/// register allocation.
>> +///
>> +/// Dropping the distinction between earlyclobber and earlyclobber-
>> conflict,
>> +/// keeping only one bit, looks promising, but two earlyclobber-
>> conflict
>> +/// operands may be assigned the same register if they happen to
>> contain the
>> +/// same value, and that implementation would prevent this.
>> +///
>> +bool RALinScan::noEarlyClobberConflict(LiveInterval *cur, unsigned
>> HReg) {
>> +  if (cur->overlapsEarlyClobber) {
>> +    for (MachineRegisterInfo::use_iterator I = mri_->use_begin(cur-
>>> reg),
>> +          E = mri_->use_end(); I!=E; ++I) {
>> +      MachineInstr *MI = I.getOperand().getParent();
>> +      if (MI->getOpcode()==TargetInstrInfo::INLINEASM) {
>> +        for (int i = MI->getNumOperands()-1; i>=0; --i) {
>> +          MachineOperand &MO = MI->getOperand(i);
>> +          if (MO.isRegister() && MO.getReg() && MO.isEarlyClobber()
>> &&
>> +              HReg==MO.getReg()) {
>> +            DOUT << "  earlyclobber conflict: " <<
>> +                  "%reg" << cur->reg << ", " << tri_->getName(HReg)
>> << "\n\t";
>> +            return false;
>> +          }
>> +        }
>> +      }
>> +    }
>> +  }
>> +  if (cur->isEarlyClobber) {
>> +    for (MachineRegisterInfo::def_iterator I = mri_->def_begin(cur-
>>> reg),
>> +          E = mri_->def_end(); I!=E; ++I) {
>> +      MachineInstr *MI = I.getOperand().getParent();
>> +      if (MI->getOpcode()==TargetInstrInfo::INLINEASM) {
>> +        // make sure cur->reg is really clobbered in this
>> instruction.
>> +        bool earlyClobberFound = false, overlapFound = false;
>> +        for (int i = MI->getNumOperands()-1; i>=0; --i) {
>> +          MachineOperand &MO = MI->getOperand(i);
>> +          if (MO.isRegister() && MO.getReg()) {
>> +            if ((MO.overlapsEarlyClobber() || MO.isEarlyClobber())  
>> &&
>> +                HReg==MO.getReg())
>> +              overlapFound = true;
>> +            if (MO.isEarlyClobber() && cur->reg==MO.getReg())
>> +              earlyClobberFound = true;
>> +          }
>> +        }
>> +        if (earlyClobberFound && overlapFound) {
>> +          DOUT << "  earlyclobber conflict: " <<
>> +                  "%reg" << cur->reg << ", " << tri_->getName(HReg)
>> << "\n\t";
>> +          return false;
>> +        }
>> +      }
>> +    }
>> +  }
>> +  return true;
>> +}
>> +
>> /// getFreePhysReg - return a free physical register for this
>> virtual register
>> /// interval if we have one, otherwise return 0.
>> unsigned RALinScan::getFreePhysReg(LiveInterval *cur) {
>> @@ -1049,7 +1118,7 @@
>>  assert(I != E && "No allocatable register in this register class!");
>>  for (; I != E; ++I)
>>    if (prt_->isRegAvail(*I) &&
>> -        li_->noEarlyclobberConflict(cur->reg, *vrm_, *I)) {
>> +        noEarlyClobberConflict(cur, *I)) {
>>      FreeReg = *I;
>>      if (FreeReg < inactiveCounts.size())
>>        FreeRegInactiveCount = inactiveCounts[FreeReg];
>> @@ -1070,7 +1139,7 @@
>>    unsigned Reg = *I;
>>    if (prt_->isRegAvail(Reg) && Reg < inactiveCounts.size() &&
>>        FreeRegInactiveCount < inactiveCounts[Reg] &&
>> -        li_->noEarlyclobberConflict(cur->reg, *vrm_, Reg)) {
>> +        noEarlyClobberConflict(cur, *I)) {
>>      FreeReg = Reg;
>>      FreeRegInactiveCount = inactiveCounts[Reg];
>>      if (FreeRegInactiveCount == MaxInactiveCount)
>>
>>
>> _______________________________________________
>> 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 kremenek at apple.com  Tue Sep 23 18:38:29 2008
From: kremenek at apple.com (Ted Kremenek)
Date: Tue, 23 Sep 2008 23:38:29 -0000
Subject: [llvm-commits] [llvm] r56522 - /llvm/tags/checker/checker-97/
Message-ID: <200809232338.m8NNcUZd000533@zion.cs.uiuc.edu>

Author: kremenek
Date: Tue Sep 23 18:38:29 2008
New Revision: 56522

URL: http://llvm.org/viewvc/llvm-project?rev=56522&view=rev
Log:
Removing checker-97.

Removed:
    llvm/tags/checker/checker-97/



From gohman at apple.com  Tue Sep 23 18:46:11 2008
From: gohman at apple.com (Dan Gohman)
Date: Tue, 23 Sep 2008 16:46:11 -0700
Subject: [llvm-commits] [llvm] r56326 - in /llvm/trunk:
	include/llvm/CodeGen/LiveInterval.h
	include/llvm/CodeGen/LiveIntervalAnalysis.h	lib/CodeGen/LiveInterval.cpp
	lib/CodeGen/LiveIntervalAnalysis.cpp	lib/CodeGen/RegAllocLinearScan.cpp
In-Reply-To: <94295C3A-12E4-4316-90E4-65AA19D104A3@apple.com>
References: <200809190102.m8J12ZW2019167@zion.cs.uiuc.edu>
	<7568A867-12B5-4B05-B7CB-A4C647B86313@apple.com>
	<94295C3A-12E4-4316-90E4-65AA19D104A3@apple.com>
Message-ID: <2293D48E-E941-42E8-8F31-84242CEF8382@apple.com>

On Sep 23, 2008, at 4:37 PM, Dale Johannesen wrote:

>
> On Sep 23, 2008, at 4:11 PMPDT, Dan Gohman wrote:
>
>> Hi Dale,
>>
>> This commit caused a regression in
>> test/CodeGen/PowerPC/2007-09-11-RegCoalescerAssert.ll
>> in the "martini x86_64" nightly tester.
>>
>> It's an llc abort, and it's reproducible by running
>> llc with the following explicit triple:
>> -march=ppc64 -mtriple=powerpc-unknown-linux-gnu
>>
>> Can you investigate?
>
> It works correctly in my local llc, with the latest rewrite of this
> stuff.
> So I think the thing to do is finish that and check it in.
> (Odd that it didn't crash when I ran this before checkin, though, only
> obvious difference between linux & darwin is the output register  
> syntax,
> and I don't see that causing a crash.  What does the crash look like?)

I just double-checked the target triple. It passes with
powerpc-apple-darwin and aborts with powerpc-unknown-linux-gnu.
The abort looks like this:

Assertion failed: (DefMI->getOpcode() ==  
TargetInstrInfo::IMPLICIT_DEF), function TurnCopyIntoImpDef, file / 
Users/gohman/LLVM/llvm-orange/lib/CodeGen/ 
SimpleRegisterCoalescing.cpp, line 2239.

Dan



From clattner at apple.com  Tue Sep 23 18:51:38 2008
From: clattner at apple.com (Chris Lattner)
Date: Tue, 23 Sep 2008 16:51:38 -0700
Subject: [llvm-commits] [llvm] r56511 - in /llvm/trunk: include/llvm/
	lib/AsmParser/ lib/Bitcode/Reader/ lib/Bitcode/Writer/
	lib/Target/X86/AsmPrinter/	lib/Transforms/IPO/	lib/Transforms/Scalar/
	lib/Transforms/Utils/ lib/VMCore/
In-Reply-To: <C491355D-79B5-4741-8D79-9A1912614E8C@apple.com>
References: <200809232235.m8NMZJGn030760@zion.cs.uiuc.edu>
	<D7685178-B66C-4822-A33D-C27F4A93238A@apple.com>
	<C491355D-79B5-4741-8D79-9A1912614E8C@apple.com>
Message-ID: <65B5B7F8-8A6B-4ED0-8A7B-3DD3FB9731EF@apple.com>


On Sep 23, 2008, at 4:27 PM, Devang Patel wrote:

>>
>>
>> Is the syntax of notes in .ll files going to change to follow
>> attributes?
>
> No. We'll continue to use notes() syntax.

Why?

-Chris


From dpatel at apple.com  Tue Sep 23 18:52:04 2008
From: dpatel at apple.com (Devang Patel)
Date: Tue, 23 Sep 2008 23:52:04 -0000
Subject: [llvm-commits] [llvm] r56524 - in /llvm/trunk:
 include/llvm/Attributes.h include/llvm/Function.h
 lib/AsmParser/llvmAsmParser.cpp.cvs lib/AsmParser/llvmAsmParser.y
 lib/AsmParser/llvmAsmParser.y.cvs
 lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
 lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
 lib/Transforms/IPO/InlineAlways.cpp lib/Transforms/IPO/InlineSimple.cpp
 lib/Transforms/IPO/Inliner.cpp lib/Transforms/Scalar/LoopUnswitch.cpp
 lib/Transforms/Utils/InlineCost.cpp lib/VMCore/AsmWriter.cpp
Message-ID: <200809232352.m8NNq597000931@zion.cs.uiuc.edu>

Author: dpatel
Date: Tue Sep 23 18:52:03 2008
New Revision: 56524

URL: http://llvm.org/viewvc/llvm-project?rev=56524&view=rev
Log:
Move FN_NOTE_AlwaysInline and other out of ParamAttrs namespace.
Do not check isDeclaration() in hasNote(). It is clients' responsibility.

Modified:
    llvm/trunk/include/llvm/Attributes.h
    llvm/trunk/include/llvm/Function.h
    llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs
    llvm/trunk/lib/AsmParser/llvmAsmParser.y
    llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs
    llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
    llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
    llvm/trunk/lib/Transforms/IPO/InlineAlways.cpp
    llvm/trunk/lib/Transforms/IPO/InlineSimple.cpp
    llvm/trunk/lib/Transforms/IPO/Inliner.cpp
    llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp
    llvm/trunk/lib/Transforms/Utils/InlineCost.cpp
    llvm/trunk/lib/VMCore/AsmWriter.cpp

Modified: llvm/trunk/include/llvm/Attributes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Attributes.h?rev=56524&r1=56523&r2=56524&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Attributes.h (original)
+++ llvm/trunk/include/llvm/Attributes.h Tue Sep 23 18:52:03 2008
@@ -46,13 +46,6 @@
 const Attributes Alignment = 0xffff<<16; ///< Alignment of parameter (16 bits)
                                     // 0 = unknown, else in clear (not log)
                                     
-/// Function notes are implemented as attributes stored at index ~0 in 
-/// parameter attribute list.
-const Attributes FN_NOTE_None            = 0;    
-const Attributes FN_NOTE_NoInline        = 1<<0; // inline=never 
-const Attributes FN_NOTE_AlwaysInline    = 1<<1; // inline=always
-const Attributes FN_NOTE_OptimizeForSize = 1<<2; // opt_size
-
 /// @brief Attributes that only apply to function parameters.
 const Attributes ParameterOnly = ByVal | Nest | StructRet;
 
@@ -85,6 +78,12 @@
 std::string getAsString(Attributes Attrs);
 } // end namespace ParamAttr
 
+/// Function notes are implemented as attributes stored at index ~0 in 
+/// parameter attribute list.
+const Attributes FN_NOTE_None            = 0;    
+const Attributes FN_NOTE_NoInline        = 1<<0; // inline=never 
+const Attributes FN_NOTE_AlwaysInline    = 1<<1; // inline=always
+const Attributes FN_NOTE_OptimizeForSize = 1<<2; // opt_size
 
 /// This is just a pair of values to associate a set of parameter attributes
 /// with a parameter index. 

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

==============================================================================
--- llvm/trunk/include/llvm/Function.h (original)
+++ llvm/trunk/include/llvm/Function.h Tue Sep 23 18:52:03 2008
@@ -152,7 +152,7 @@
   /// hasNote - Return true if this function has given note.
   bool hasNote(Attributes N) const {
     // Notes are stored at ~0 index in parameter attribute list
-    return (!isDeclaration() && paramHasAttr(~0, N));
+    return (paramHasAttr(~0, N));
   }
 
   /// setNotes - Set notes for this function

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

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs Tue Sep 23 18:52:03 2008
@@ -4125,11 +4125,11 @@
 #line 1298 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { 
                 unsigned tmp = (yyvsp[(1) - (3)].ParamAttrs) | (yyvsp[(3) - (3)].ParamAttrs);
-                if ((yyvsp[(3) - (3)].ParamAttrs) == ParamAttr::FN_NOTE_NoInline 
-                    && ((yyvsp[(1) - (3)].ParamAttrs) & ParamAttr::FN_NOTE_AlwaysInline))
+                if ((yyvsp[(3) - (3)].ParamAttrs) == FN_NOTE_NoInline 
+                    && ((yyvsp[(1) - (3)].ParamAttrs) & FN_NOTE_AlwaysInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
-                    if ((yyvsp[(3) - (3)].ParamAttrs) == ParamAttr::FN_NOTE_AlwaysInline 
-                        && ((yyvsp[(1) - (3)].ParamAttrs) & ParamAttr::FN_NOTE_NoInline))
+                    if ((yyvsp[(3) - (3)].ParamAttrs) == FN_NOTE_AlwaysInline 
+                        && ((yyvsp[(1) - (3)].ParamAttrs) & FN_NOTE_NoInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
                 (yyval.ParamAttrs) = tmp;
                 CHECK_FOR_ERROR 
@@ -4138,22 +4138,22 @@
 
   case 131:
 #line 1311 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::FN_NOTE_NoInline; ;}
+    { (yyval.ParamAttrs) = FN_NOTE_NoInline; ;}
     break;
 
   case 132:
 #line 1312 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::FN_NOTE_AlwaysInline; ;}
+    { (yyval.ParamAttrs) = FN_NOTE_AlwaysInline; ;}
     break;
 
   case 133:
 #line 1313 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::FN_NOTE_OptimizeForSize; ;}
+    { (yyval.ParamAttrs) = FN_NOTE_OptimizeForSize; ;}
     break;
 
   case 134:
 #line 1316 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::FN_NOTE_None; ;}
+    { (yyval.ParamAttrs) = FN_NOTE_None; ;}
     break;
 
   case 135:

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

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.y (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.y Tue Sep 23 18:52:03 2008
@@ -1297,23 +1297,23 @@
 FuncNoteList  : FuncNote { $$ = $1; }
               | FuncNoteList ',' FuncNote { 
                 unsigned tmp = $1 | $3;
-                if ($3 == ParamAttr::FN_NOTE_NoInline 
-                    && ($1 & ParamAttr::FN_NOTE_AlwaysInline))
+                if ($3 == FN_NOTE_NoInline 
+                    && ($1 & FN_NOTE_AlwaysInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
-                    if ($3 == ParamAttr::FN_NOTE_AlwaysInline 
-                        && ($1 & ParamAttr::FN_NOTE_NoInline))
+                    if ($3 == FN_NOTE_AlwaysInline 
+                        && ($1 & FN_NOTE_NoInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
                 $$ = tmp;
                 CHECK_FOR_ERROR 
               }
               ;
 
-FuncNote      : INLINE '=' NEVER { $$ = ParamAttr::FN_NOTE_NoInline; }
-              | INLINE '=' ALWAYS { $$ = ParamAttr::FN_NOTE_AlwaysInline; }
-              | OPTIMIZEFORSIZE { $$ = ParamAttr::FN_NOTE_OptimizeForSize; }
+FuncNote      : INLINE '=' NEVER { $$ = FN_NOTE_NoInline; }
+              | INLINE '=' ALWAYS { $$ = FN_NOTE_AlwaysInline; }
+              | OPTIMIZEFORSIZE { $$ = FN_NOTE_OptimizeForSize; }
               ;
 
-OptFuncNotes  : /* empty */ { $$ = ParamAttr::FN_NOTE_None; }
+OptFuncNotes  : /* empty */ { $$ = FN_NOTE_None; }
               | FNNOTE '(' FuncNoteList  ')' {
                 $$ =  $3;
               }

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

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs Tue Sep 23 18:52:03 2008
@@ -1297,23 +1297,23 @@
 FuncNoteList  : FuncNote { $$ = $1; }
               | FuncNoteList ',' FuncNote { 
                 unsigned tmp = $1 | $3;
-                if ($3 == ParamAttr::FN_NOTE_NoInline 
-                    && ($1 & ParamAttr::FN_NOTE_AlwaysInline))
+                if ($3 == FN_NOTE_NoInline 
+                    && ($1 & FN_NOTE_AlwaysInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
-                    if ($3 == ParamAttr::FN_NOTE_AlwaysInline 
-                        && ($1 & ParamAttr::FN_NOTE_NoInline))
+                    if ($3 == FN_NOTE_AlwaysInline 
+                        && ($1 & FN_NOTE_NoInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
                 $$ = tmp;
                 CHECK_FOR_ERROR 
               }
               ;
 
-FuncNote      : INLINE '=' NEVER { $$ = ParamAttr::FN_NOTE_NoInline; }
-              | INLINE '=' ALWAYS { $$ = ParamAttr::FN_NOTE_AlwaysInline; }
-              | OPTIMIZEFORSIZE { $$ = ParamAttr::FN_NOTE_OptimizeForSize; }
+FuncNote      : INLINE '=' NEVER { $$ = FN_NOTE_NoInline; }
+              | INLINE '=' ALWAYS { $$ = FN_NOTE_AlwaysInline; }
+              | OPTIMIZEFORSIZE { $$ = FN_NOTE_OptimizeForSize; }
               ;
 
-OptFuncNotes  : /* empty */ { $$ = ParamAttr::FN_NOTE_None; }
+OptFuncNotes  : /* empty */ { $$ = FN_NOTE_None; }
               | FNNOTE '(' FuncNoteList  ')' {
                 $$ =  $3;
               }

Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp?rev=56524&r1=56523&r2=56524&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp Tue Sep 23 18:52:03 2008
@@ -160,7 +160,7 @@
   SwitchToTextSection(SectionName.c_str());
 
   unsigned FnAlign = OptimizeForSize ? 1 : 4;
-  if (F->hasNote(ParamAttr::FN_NOTE_OptimizeForSize))
+  if (!F->isDeclaration() && F->hasNote(FN_NOTE_OptimizeForSize))
     FnAlign = 1;
   switch (F->getLinkage()) {
   default: assert(0 && "Unknown linkage type!");

Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp?rev=56524&r1=56523&r2=56524&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp Tue Sep 23 18:52:03 2008
@@ -147,7 +147,7 @@
   SwitchToTextSection(getSectionForFunction(*F).c_str(), F);
 
   unsigned FnAlign = OptimizeForSize ? 1 : 4;
-  if (F->hasNote(ParamAttr::FN_NOTE_OptimizeForSize))
+  if (!F->isDeclaration() && F->hasNote(FN_NOTE_OptimizeForSize))
     FnAlign = 1;
   switch (F->getLinkage()) {
   default: assert(0 && "Unsupported linkage type!");

Modified: llvm/trunk/lib/Transforms/IPO/InlineAlways.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/InlineAlways.cpp?rev=56524&r1=56523&r2=56524&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/InlineAlways.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/InlineAlways.cpp Tue Sep 23 18:52:03 2008
@@ -63,7 +63,7 @@
   
   for (Module::iterator I = M.begin(), E = M.end();
        I != E; ++I)
-    if (!I->isDeclaration() && !I->hasNote(ParamAttr::FN_NOTE_AlwaysInline))
+    if (!I->isDeclaration() && !I->hasNote(FN_NOTE_AlwaysInline))
       NeverInline.insert(I);
 
   return false;

Modified: llvm/trunk/lib/Transforms/IPO/InlineSimple.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/InlineSimple.cpp?rev=56524&r1=56523&r2=56524&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/InlineSimple.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/InlineSimple.cpp Tue Sep 23 18:52:03 2008
@@ -65,7 +65,7 @@
   
   for (Module::iterator I = M.begin(), E = M.end();
        I != E; ++I)
-    if (I->hasNote(ParamAttr::FN_NOTE_NoInline))
+    if (!I->isDeclaration() && I->hasNote(FN_NOTE_NoInline))
       NeverInline.insert(I);
 
   // Get llvm.noinline

Modified: llvm/trunk/lib/Transforms/IPO/Inliner.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/Inliner.cpp?rev=56524&r1=56523&r2=56524&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/Inliner.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/Inliner.cpp Tue Sep 23 18:52:03 2008
@@ -141,7 +141,7 @@
         
         int CurrentThreshold = InlineThreshold;
         Function *Fn = CS.getCaller();
-        if (Fn && Fn->hasNote(ParamAttr::FN_NOTE_OptimizeForSize)
+        if (Fn && !Fn->isDeclaration() && Fn->hasNote(FN_NOTE_OptimizeForSize)
             && InlineThreshold != 50) {
           CurrentThreshold = 50;
         }

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

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp Tue Sep 23 18:52:03 2008
@@ -430,7 +430,7 @@
   Function *F = loopHeader->getParent();
 
   // Do not unswitch if the function is optimized for size.
-  if (F->hasNote(ParamAttr::FN_NOTE_OptimizeForSize))
+  if (!F->isDeclaration() && F->hasNote(FN_NOTE_OptimizeForSize))
     return false;
 
   // Check to see if it would be profitable to unswitch current loop.

Modified: llvm/trunk/lib/Transforms/Utils/InlineCost.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/InlineCost.cpp?rev=56524&r1=56523&r2=56524&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Utils/InlineCost.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/InlineCost.cpp Tue Sep 23 18:52:03 2008
@@ -222,7 +222,7 @@
   if (CalleeFI.NeverInline)
     return 2000000000;
 
-  if (Callee->hasNote(ParamAttr::FN_NOTE_AlwaysInline))
+  if (!Callee->isDeclaration() && Callee->hasNote(FN_NOTE_AlwaysInline))
     return -2000000000;
     
   // Add to the inline quality for properties that make the call valuable to

Modified: llvm/trunk/lib/VMCore/AsmWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/AsmWriter.cpp?rev=56524&r1=56523&r2=56524&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/AsmWriter.cpp (original)
+++ llvm/trunk/lib/VMCore/AsmWriter.cpp Tue Sep 23 18:52:03 2008
@@ -1412,12 +1412,12 @@
   } else {
 
     bool insideNotes = false;
-    if (F->hasNote(ParamAttr::FN_NOTE_AlwaysInline)) {
+    if (F->hasNote(FN_NOTE_AlwaysInline)) {
       Out << "notes(";
       insideNotes = true;
       Out << "inline=always";
     }
-    if (F->hasNote(ParamAttr::FN_NOTE_NoInline)) {
+    if (F->hasNote(FN_NOTE_NoInline)) {
       if (insideNotes) 
         Out << ",";
       else {
@@ -1426,7 +1426,7 @@
       }
       Out << "inline=never";
     }
-    if (F->hasNote(ParamAttr::FN_NOTE_OptimizeForSize)) {
+    if (F->hasNote(FN_NOTE_OptimizeForSize)) {
       if (insideNotes) 
         Out << ",";
       else {




From dpatel at apple.com  Tue Sep 23 18:52:58 2008
From: dpatel at apple.com (Devang Patel)
Date: Tue, 23 Sep 2008 23:52:58 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r56525 - in /llvm-gcc-4.2/trunk/gcc:
 llvm-backend.cpp llvm-convert.cpp
Message-ID: <200809232352.m8NNqwRg000966@zion.cs.uiuc.edu>

Author: dpatel
Date: Tue Sep 23 18:52:58 2008
New Revision: 56525

URL: http://llvm.org/viewvc/llvm-project?rev=56525&view=rev
Log:
Move FN_NOTE_AlwaysInline and other out of ParamAttrs namespace.


Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp
    llvm-gcc-4.2/trunk/gcc/llvm-convert.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=56525&r1=56524&r2=56525&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Tue Sep 23 18:52:58 2008
@@ -386,7 +386,7 @@
   // marked as always_inline.
   for (Module::iterator I = TheModule->begin(), E = TheModule->end();
        I != E; ++I)
-    if (I->hasNote(ParamAttr::FN_NOTE_AlwaysInline)) {
+    if (I->hasNote(FN_NOTE_AlwaysInline)) {
       NeedAlwaysInliner = true;
       break;
     }

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=56525&r1=56524&r2=56525&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Tue Sep 23 18:52:58 2008
@@ -652,7 +652,7 @@
   
   // Handle noinline Functions
   if (lookup_attribute ("noinline", DECL_ATTRIBUTES (FnDecl)))
-    Fn->setNotes(ParamAttr::FN_NOTE_NoInline);
+    Fn->setNotes(FN_NOTE_NoInline);
   /* FIXME: Remove llvm.noinline related code. 
   {
     const Type *SBP= PointerType::getUnqual(Type::Int8Ty);
@@ -663,10 +663,10 @@
 
   // Handle always_inline attribute
   if (lookup_attribute ("always_inline", DECL_ATTRIBUTES (FnDecl)))
-    Fn->setNotes(ParamAttr::FN_NOTE_AlwaysInline);
+    Fn->setNotes(FN_NOTE_AlwaysInline);
 
   if (optimize_size)
-    Fn->setNotes(ParamAttr::FN_NOTE_OptimizeForSize);
+    Fn->setNotes(FN_NOTE_OptimizeForSize);
 
   // Handle annotate attributes
   if (DECL_ATTRIBUTES(FnDecl))




From clattner at apple.com  Tue Sep 23 18:53:08 2008
From: clattner at apple.com (Chris Lattner)
Date: Tue, 23 Sep 2008 16:53:08 -0700
Subject: [llvm-commits] [llvm] r56524 - in /llvm/trunk:
	include/llvm/Attributes.h include/llvm/Function.h
	lib/AsmParser/llvmAsmParser.cpp.cvs lib/AsmParser/llvmAsmParser.y
	lib/AsmParser/llvmAsmParser.y.cvs
	lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
	lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
	lib/Transforms/IPO/InlineAlways.cpp
	lib/Transforms/IPO/InlineSimple.cpp lib/Transforms/IPO/Inliner.cpp
	lib/Transforms/Scalar/LoopUnswitch.cpp
	lib/Transforms/Utils/InlineCost.cpp lib/VMCore/AsmWriter.cpp
In-Reply-To: <200809232352.m8NNq597000931@zion.cs.uiuc.edu>
References: <200809232352.m8NNq597000931@zion.cs.uiuc.edu>
Message-ID: <1F87C4E7-3F93-4433-B789-2DDFEFA67BF8@apple.com>


On Sep 23, 2008, at 4:52 PM, Devang Patel wrote:

> Author: dpatel
> Date: Tue Sep 23 18:52:03 2008
> New Revision: 56524
>
> URL: http://llvm.org/viewvc/llvm-project?rev=56524&view=rev
> Log:
> Move FN_NOTE_AlwaysInline and other out of ParamAttrs namespace.
> Do not check isDeclaration() in hasNote(). It is clients'  
> responsibility.

Eww, please introduce a new namespace.  Like "FnAttr::NoInline".  I  
still don't understand how notes are different than attributes.  These  
are just function attributes, no?

-Chris

>
>
> Modified:
>    llvm/trunk/include/llvm/Attributes.h
>    llvm/trunk/include/llvm/Function.h
>    llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs
>    llvm/trunk/lib/AsmParser/llvmAsmParser.y
>    llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs
>    llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
>    llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
>    llvm/trunk/lib/Transforms/IPO/InlineAlways.cpp
>    llvm/trunk/lib/Transforms/IPO/InlineSimple.cpp
>    llvm/trunk/lib/Transforms/IPO/Inliner.cpp
>    llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp
>    llvm/trunk/lib/Transforms/Utils/InlineCost.cpp
>    llvm/trunk/lib/VMCore/AsmWriter.cpp
>
> Modified: llvm/trunk/include/llvm/Attributes.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Attributes.h?rev=56524&r1=56523&r2=56524&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/include/llvm/Attributes.h (original)
> +++ llvm/trunk/include/llvm/Attributes.h Tue Sep 23 18:52:03 2008
> @@ -46,13 +46,6 @@
> const Attributes Alignment = 0xffff<<16; ///< Alignment of parameter  
> (16 bits)
>                                     // 0 = unknown, else in clear  
> (not log)
>
> -/// Function notes are implemented as attributes stored at index ~0  
> in
> -/// parameter attribute list.
> -const Attributes FN_NOTE_None            = 0;
> -const Attributes FN_NOTE_NoInline        = 1<<0; // inline=never
> -const Attributes FN_NOTE_AlwaysInline    = 1<<1; // inline=always
> -const Attributes FN_NOTE_OptimizeForSize = 1<<2; // opt_size
> -
> /// @brief Attributes that only apply to function parameters.
> const Attributes ParameterOnly = ByVal | Nest | StructRet;
>
> @@ -85,6 +78,12 @@
> std::string getAsString(Attributes Attrs);
> } // end namespace ParamAttr
>
> +/// Function notes are implemented as attributes stored at index ~0  
> in
> +/// parameter attribute list.
> +const Attributes FN_NOTE_None            = 0;
> +const Attributes FN_NOTE_NoInline        = 1<<0; // inline=never
> +const Attributes FN_NOTE_AlwaysInline    = 1<<1; // inline=always
> +const Attributes FN_NOTE_OptimizeForSize = 1<<2; // opt_size
>
> /// This is just a pair of values to associate a set of parameter  
> attributes
> /// with a parameter index.
>
> Modified: llvm/trunk/include/llvm/Function.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Function.h?rev=56524&r1=56523&r2=56524&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/include/llvm/Function.h (original)
> +++ llvm/trunk/include/llvm/Function.h Tue Sep 23 18:52:03 2008
> @@ -152,7 +152,7 @@
>   /// hasNote - Return true if this function has given note.
>   bool hasNote(Attributes N) const {
>     // Notes are stored at ~0 index in parameter attribute list
> -    return (!isDeclaration() && paramHasAttr(~0, N));
> +    return (paramHasAttr(~0, N));
>   }
>
>   /// setNotes - Set notes for this function
>
> Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs?rev=56524&r1=56523&r2=56524&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs (original)
> +++ llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs Tue Sep 23  
> 18:52:03 2008
> @@ -4125,11 +4125,11 @@
> #line 1298 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/ 
> llvmAsmParser.y"
>     {
>                 unsigned tmp = (yyvsp[(1) - (3)].ParamAttrs) |  
> (yyvsp[(3) - (3)].ParamAttrs);
> -                if ((yyvsp[(3) - (3)].ParamAttrs) ==  
> ParamAttr::FN_NOTE_NoInline
> -                    && ((yyvsp[(1) - (3)].ParamAttrs) &  
> ParamAttr::FN_NOTE_AlwaysInline))
> +                if ((yyvsp[(3) - (3)].ParamAttrs) == FN_NOTE_NoInline
> +                    && ((yyvsp[(1) - (3)].ParamAttrs) &  
> FN_NOTE_AlwaysInline))
>                   GEN_ERROR("Function Notes may include only one  
> inline notes!")
> -                    if ((yyvsp[(3) - (3)].ParamAttrs) ==  
> ParamAttr::FN_NOTE_AlwaysInline
> -                        && ((yyvsp[(1) - (3)].ParamAttrs) &  
> ParamAttr::FN_NOTE_NoInline))
> +                    if ((yyvsp[(3) - (3)].ParamAttrs) ==  
> FN_NOTE_AlwaysInline
> +                        && ((yyvsp[(1) - (3)].ParamAttrs) &  
> FN_NOTE_NoInline))
>                   GEN_ERROR("Function Notes may include only one  
> inline notes!")
>                 (yyval.ParamAttrs) = tmp;
>                 CHECK_FOR_ERROR
> @@ -4138,22 +4138,22 @@
>
>   case 131:
> #line 1311 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/ 
> llvmAsmParser.y"
> -    { (yyval.ParamAttrs) = ParamAttr::FN_NOTE_NoInline; ;}
> +    { (yyval.ParamAttrs) = FN_NOTE_NoInline; ;}
>     break;
>
>   case 132:
> #line 1312 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/ 
> llvmAsmParser.y"
> -    { (yyval.ParamAttrs) = ParamAttr::FN_NOTE_AlwaysInline; ;}
> +    { (yyval.ParamAttrs) = FN_NOTE_AlwaysInline; ;}
>     break;
>
>   case 133:
> #line 1313 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/ 
> llvmAsmParser.y"
> -    { (yyval.ParamAttrs) = ParamAttr::FN_NOTE_OptimizeForSize; ;}
> +    { (yyval.ParamAttrs) = FN_NOTE_OptimizeForSize; ;}
>     break;
>
>   case 134:
> #line 1316 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/ 
> llvmAsmParser.y"
> -    { (yyval.ParamAttrs) = ParamAttr::FN_NOTE_None; ;}
> +    { (yyval.ParamAttrs) = FN_NOTE_None; ;}
>     break;
>
>   case 135:
>
> Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.y
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.y?rev=56524&r1=56523&r2=56524&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/AsmParser/llvmAsmParser.y (original)
> +++ llvm/trunk/lib/AsmParser/llvmAsmParser.y Tue Sep 23 18:52:03 2008
> @@ -1297,23 +1297,23 @@
> FuncNoteList  : FuncNote { $$ = $1; }
>               | FuncNoteList ',' FuncNote {
>                 unsigned tmp = $1 | $3;
> -                if ($3 == ParamAttr::FN_NOTE_NoInline
> -                    && ($1 & ParamAttr::FN_NOTE_AlwaysInline))
> +                if ($3 == FN_NOTE_NoInline
> +                    && ($1 & FN_NOTE_AlwaysInline))
>                   GEN_ERROR("Function Notes may include only one  
> inline notes!")
> -                    if ($3 == ParamAttr::FN_NOTE_AlwaysInline
> -                        && ($1 & ParamAttr::FN_NOTE_NoInline))
> +                    if ($3 == FN_NOTE_AlwaysInline
> +                        && ($1 & FN_NOTE_NoInline))
>                   GEN_ERROR("Function Notes may include only one  
> inline notes!")
>                 $$ = tmp;
>                 CHECK_FOR_ERROR
>               }
>               ;
>
> -FuncNote      : INLINE '=' NEVER { $$ =  
> ParamAttr::FN_NOTE_NoInline; }
> -              | INLINE '=' ALWAYS { $$ =  
> ParamAttr::FN_NOTE_AlwaysInline; }
> -              | OPTIMIZEFORSIZE { $$ =  
> ParamAttr::FN_NOTE_OptimizeForSize; }
> +FuncNote      : INLINE '=' NEVER { $$ = FN_NOTE_NoInline; }
> +              | INLINE '=' ALWAYS { $$ = FN_NOTE_AlwaysInline; }
> +              | OPTIMIZEFORSIZE { $$ = FN_NOTE_OptimizeForSize; }
>               ;
>
> -OptFuncNotes  : /* empty */ { $$ = ParamAttr::FN_NOTE_None; }
> +OptFuncNotes  : /* empty */ { $$ = FN_NOTE_None; }
>               | FNNOTE '(' FuncNoteList  ')' {
>                 $$ =  $3;
>               }
>
> Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs?rev=56524&r1=56523&r2=56524&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs (original)
> +++ llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs Tue Sep 23 18:52:03  
> 2008
> @@ -1297,23 +1297,23 @@
> FuncNoteList  : FuncNote { $$ = $1; }
>               | FuncNoteList ',' FuncNote {
>                 unsigned tmp = $1 | $3;
> -                if ($3 == ParamAttr::FN_NOTE_NoInline
> -                    && ($1 & ParamAttr::FN_NOTE_AlwaysInline))
> +                if ($3 == FN_NOTE_NoInline
> +                    && ($1 & FN_NOTE_AlwaysInline))
>                   GEN_ERROR("Function Notes may include only one  
> inline notes!")
> -                    if ($3 == ParamAttr::FN_NOTE_AlwaysInline
> -                        && ($1 & ParamAttr::FN_NOTE_NoInline))
> +                    if ($3 == FN_NOTE_AlwaysInline
> +                        && ($1 & FN_NOTE_NoInline))
>                   GEN_ERROR("Function Notes may include only one  
> inline notes!")
>                 $$ = tmp;
>                 CHECK_FOR_ERROR
>               }
>               ;
>
> -FuncNote      : INLINE '=' NEVER { $$ =  
> ParamAttr::FN_NOTE_NoInline; }
> -              | INLINE '=' ALWAYS { $$ =  
> ParamAttr::FN_NOTE_AlwaysInline; }
> -              | OPTIMIZEFORSIZE { $$ =  
> ParamAttr::FN_NOTE_OptimizeForSize; }
> +FuncNote      : INLINE '=' NEVER { $$ = FN_NOTE_NoInline; }
> +              | INLINE '=' ALWAYS { $$ = FN_NOTE_AlwaysInline; }
> +              | OPTIMIZEFORSIZE { $$ = FN_NOTE_OptimizeForSize; }
>               ;
>
> -OptFuncNotes  : /* empty */ { $$ = ParamAttr::FN_NOTE_None; }
> +OptFuncNotes  : /* empty */ { $$ = FN_NOTE_None; }
>               | FNNOTE '(' FuncNoteList  ')' {
>                 $$ =  $3;
>               }
>
> Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp?rev=56524&r1=56523&r2=56524&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp  
> (original)
> +++ llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp Tue  
> Sep 23 18:52:03 2008
> @@ -160,7 +160,7 @@
>   SwitchToTextSection(SectionName.c_str());
>
>   unsigned FnAlign = OptimizeForSize ? 1 : 4;
> -  if (F->hasNote(ParamAttr::FN_NOTE_OptimizeForSize))
> +  if (!F->isDeclaration() && F->hasNote(FN_NOTE_OptimizeForSize))
>     FnAlign = 1;
>   switch (F->getLinkage()) {
>   default: assert(0 && "Unknown linkage type!");
>
> Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp?rev=56524&r1=56523&r2=56524&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp  
> (original)
> +++ llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp Tue  
> Sep 23 18:52:03 2008
> @@ -147,7 +147,7 @@
>   SwitchToTextSection(getSectionForFunction(*F).c_str(), F);
>
>   unsigned FnAlign = OptimizeForSize ? 1 : 4;
> -  if (F->hasNote(ParamAttr::FN_NOTE_OptimizeForSize))
> +  if (!F->isDeclaration() && F->hasNote(FN_NOTE_OptimizeForSize))
>     FnAlign = 1;
>   switch (F->getLinkage()) {
>   default: assert(0 && "Unsupported linkage type!");
>
> Modified: llvm/trunk/lib/Transforms/IPO/InlineAlways.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/InlineAlways.cpp?rev=56524&r1=56523&r2=56524&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Transforms/IPO/InlineAlways.cpp (original)
> +++ llvm/trunk/lib/Transforms/IPO/InlineAlways.cpp Tue Sep 23  
> 18:52:03 2008
> @@ -63,7 +63,7 @@
>
>   for (Module::iterator I = M.begin(), E = M.end();
>        I != E; ++I)
> -    if (!I->isDeclaration() && !I- 
> >hasNote(ParamAttr::FN_NOTE_AlwaysInline))
> +    if (!I->isDeclaration() && !I->hasNote(FN_NOTE_AlwaysInline))
>       NeverInline.insert(I);
>
>   return false;
>
> Modified: llvm/trunk/lib/Transforms/IPO/InlineSimple.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/InlineSimple.cpp?rev=56524&r1=56523&r2=56524&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Transforms/IPO/InlineSimple.cpp (original)
> +++ llvm/trunk/lib/Transforms/IPO/InlineSimple.cpp Tue Sep 23  
> 18:52:03 2008
> @@ -65,7 +65,7 @@
>
>   for (Module::iterator I = M.begin(), E = M.end();
>        I != E; ++I)
> -    if (I->hasNote(ParamAttr::FN_NOTE_NoInline))
> +    if (!I->isDeclaration() && I->hasNote(FN_NOTE_NoInline))
>       NeverInline.insert(I);
>
>   // Get llvm.noinline
>
> Modified: llvm/trunk/lib/Transforms/IPO/Inliner.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/Inliner.cpp?rev=56524&r1=56523&r2=56524&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Transforms/IPO/Inliner.cpp (original)
> +++ llvm/trunk/lib/Transforms/IPO/Inliner.cpp Tue Sep 23 18:52:03 2008
> @@ -141,7 +141,7 @@
>
>         int CurrentThreshold = InlineThreshold;
>         Function *Fn = CS.getCaller();
> -        if (Fn && Fn->hasNote(ParamAttr::FN_NOTE_OptimizeForSize)
> +        if (Fn && !Fn->isDeclaration() && Fn- 
> >hasNote(FN_NOTE_OptimizeForSize)
>             && InlineThreshold != 50) {
>           CurrentThreshold = 50;
>         }
>
> Modified: llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp?rev=56524&r1=56523&r2=56524&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp (original)
> +++ llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp Tue Sep 23  
> 18:52:03 2008
> @@ -430,7 +430,7 @@
>   Function *F = loopHeader->getParent();
>
>   // Do not unswitch if the function is optimized for size.
> -  if (F->hasNote(ParamAttr::FN_NOTE_OptimizeForSize))
> +  if (!F->isDeclaration() && F->hasNote(FN_NOTE_OptimizeForSize))
>     return false;
>
>   // Check to see if it would be profitable to unswitch current loop.
>
> Modified: llvm/trunk/lib/Transforms/Utils/InlineCost.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/InlineCost.cpp?rev=56524&r1=56523&r2=56524&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Transforms/Utils/InlineCost.cpp (original)
> +++ llvm/trunk/lib/Transforms/Utils/InlineCost.cpp Tue Sep 23  
> 18:52:03 2008
> @@ -222,7 +222,7 @@
>   if (CalleeFI.NeverInline)
>     return 2000000000;
>
> -  if (Callee->hasNote(ParamAttr::FN_NOTE_AlwaysInline))
> +  if (!Callee->isDeclaration() && Callee- 
> >hasNote(FN_NOTE_AlwaysInline))
>     return -2000000000;
>
>   // Add to the inline quality for properties that make the call  
> valuable to
>
> Modified: llvm/trunk/lib/VMCore/AsmWriter.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/AsmWriter.cpp?rev=56524&r1=56523&r2=56524&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/VMCore/AsmWriter.cpp (original)
> +++ llvm/trunk/lib/VMCore/AsmWriter.cpp Tue Sep 23 18:52:03 2008
> @@ -1412,12 +1412,12 @@
>   } else {
>
>     bool insideNotes = false;
> -    if (F->hasNote(ParamAttr::FN_NOTE_AlwaysInline)) {
> +    if (F->hasNote(FN_NOTE_AlwaysInline)) {
>       Out << "notes(";
>       insideNotes = true;
>       Out << "inline=always";
>     }
> -    if (F->hasNote(ParamAttr::FN_NOTE_NoInline)) {
> +    if (F->hasNote(FN_NOTE_NoInline)) {
>       if (insideNotes)
>         Out << ",";
>       else {
> @@ -1426,7 +1426,7 @@
>       }
>       Out << "inline=never";
>     }
> -    if (F->hasNote(ParamAttr::FN_NOTE_OptimizeForSize)) {
> +    if (F->hasNote(FN_NOTE_OptimizeForSize)) {
>       if (insideNotes)
>         Out << ",";
>       else {
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From dpatel at apple.com  Tue Sep 23 18:53:28 2008
From: dpatel at apple.com (Devang Patel)
Date: Tue, 23 Sep 2008 16:53:28 -0700
Subject: [llvm-commits] [llvm] r56511 - in /llvm/trunk: include/llvm/
	lib/AsmParser/ lib/Bitcode/Reader/ lib/Bitcode/Writer/
	lib/Target/X86/AsmPrinter/	lib/Transforms/IPO/	lib/Transforms/Scalar/
	lib/Transforms/Utils/ lib/VMCore/
In-Reply-To: <65B5B7F8-8A6B-4ED0-8A7B-3DD3FB9731EF@apple.com>
References: <200809232235.m8NMZJGn030760@zion.cs.uiuc.edu>
	<D7685178-B66C-4822-A33D-C27F4A93238A@apple.com>
	<C491355D-79B5-4741-8D79-9A1912614E8C@apple.com>
	<65B5B7F8-8A6B-4ED0-8A7B-3DD3FB9731EF@apple.com>
Message-ID: <38E503F0-1979-4D7A-A10E-217D0EEEFC3C@apple.com>


On Sep 23, 2008, at 4:51 PM, Chris Lattner wrote:

> On Sep 23, 2008, at 4:27 PM, Devang Patel wrote:
>
>>> Is the syntax of notes in .ll files going to change to follow
>>> attributes?
>>
>> No. We'll continue to use notes() syntax.
>
> Why?


I am confused. What are you proposing ?
-
Devang





From dalej at apple.com  Tue Sep 23 18:55:44 2008
From: dalej at apple.com (Dale Johannesen)
Date: Tue, 23 Sep 2008 16:55:44 -0700
Subject: [llvm-commits] [llvm] r56326 - in /llvm/trunk:
	include/llvm/CodeGen/LiveInterval.h
	include/llvm/CodeGen/LiveIntervalAnalysis.h	lib/CodeGen/LiveInterval.cpp
	lib/CodeGen/LiveIntervalAnalysis.cpp	lib/CodeGen/RegAllocLinearScan.cpp
In-Reply-To: <2293D48E-E941-42E8-8F31-84242CEF8382@apple.com>
References: <200809190102.m8J12ZW2019167@zion.cs.uiuc.edu>
	<7568A867-12B5-4B05-B7CB-A4C647B86313@apple.com>
	<94295C3A-12E4-4316-90E4-65AA19D104A3@apple.com>
	<2293D48E-E941-42E8-8F31-84242CEF8382@apple.com>
Message-ID: <F9423631-5C31-4D24-8D9C-129BD31827A1@apple.com>


On Sep 23, 2008, at 4:46 PMPDT, Dan Gohman wrote:
> On Sep 23, 2008, at 4:37 PM, Dale Johannesen wrote:
>> On Sep 23, 2008, at 4:11 PMPDT, Dan Gohman wrote:
>>
>>> Hi Dale,
>>>
>>> This commit caused a regression in
>>> test/CodeGen/PowerPC/2007-09-11-RegCoalescerAssert.ll
>>> in the "martini x86_64" nightly tester.
>>>
>>> It's an llc abort, and it's reproducible by running
>>> llc with the following explicit triple:
>>> -march=ppc64 -mtriple=powerpc-unknown-linux-gnu
>>>
>>> Can you investigate?
>>
>> It works correctly in my local llc, with the latest rewrite of this
>> stuff.
>> So I think the thing to do is finish that and check it in.
>> (Odd that it didn't crash when I ran this before checkin, though,  
>> only
>> obvious difference between linux & darwin is the output register
>> syntax,
>> and I don't see that causing a crash.  What does the crash look  
>> like?)
>
> I just double-checked the target triple. It passes with
> powerpc-apple-darwin and aborts with powerpc-unknown-linux-gnu.
> The abort looks like this:
>
> Assertion failed: (DefMI->getOpcode() ==
> TargetInstrInfo::IMPLICIT_DEF), function TurnCopyIntoImpDef, file /
> Users/gohman/LLVM/llvm-orange/lib/CodeGen/
> SimpleRegisterCoalescing.cpp, line 2239.

OK.  Weird.  Anyway, my next round of changes should fix it.
Thanks for pointing this out.



From clattner at apple.com  Tue Sep 23 19:04:34 2008
From: clattner at apple.com (Chris Lattner)
Date: Tue, 23 Sep 2008 17:04:34 -0700
Subject: [llvm-commits] [llvm] r56511 - in /llvm/trunk: include/llvm/
	lib/AsmParser/ lib/Bitcode/Reader/ lib/Bitcode/Writer/
	lib/Target/X86/AsmPrinter/	lib/Transforms/IPO/	lib/Transforms/Scalar/
	lib/Transforms/Utils/ lib/VMCore/
In-Reply-To: <38E503F0-1979-4D7A-A10E-217D0EEEFC3C@apple.com>
References: <200809232235.m8NMZJGn030760@zion.cs.uiuc.edu>
	<D7685178-B66C-4822-A33D-C27F4A93238A@apple.com>
	<C491355D-79B5-4741-8D79-9A1912614E8C@apple.com>
	<65B5B7F8-8A6B-4ED0-8A7B-3DD3FB9731EF@apple.com>
	<38E503F0-1979-4D7A-A10E-217D0EEEFC3C@apple.com>
Message-ID: <181FE521-E40E-44CB-9474-07AADD3B5D05@apple.com>


On Sep 23, 2008, at 4:53 PM, Devang Patel wrote:

>
> On Sep 23, 2008, at 4:51 PM, Chris Lattner wrote:
>
>> On Sep 23, 2008, at 4:27 PM, Devang Patel wrote:
>>
>>>> Is the syntax of notes in .ll files going to change to follow
>>>> attributes?
>>>
>>> No. We'll continue to use notes() syntax.
>>
>> Why?
>
> I am confused. What are you proposing?

Currently we have:

declare i32 @foo( ... param attrs ...) nounwind ...fnattrs...  
notes(...notes...) {


I think we really want:

declare ...result attrs... i32 @foo( ... param attrs ...)  
nounwind ...fnattrs... {

I don't think we need the notes syntax at all, do you agree?

-Chris


From evan.cheng at apple.com  Tue Sep 23 19:05:33 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Wed, 24 Sep 2008 00:05:33 -0000
Subject: [llvm-commits] [llvm] r56526 - in /llvm/trunk:
 include/llvm/Target/TargetLowering.h
 lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
 lib/CodeGen/SelectionDAG/TargetLowering.cpp
 lib/Target/CellSPU/SPUISelLowering.cpp lib/Target/CellSPU/SPUISelLowering.h
 lib/Target/PowerPC/PPCISelLowering.cpp lib/Target/PowerPC/PPCISelLowering.h
 lib/Target/X86/X86ISelDAGToDAG.cpp lib/Target/X86/X86ISelLowering.cpp
 lib/Target/X86/X86ISelLowering.h test/CodeGen/X86/inline-asm-pic.ll
Message-ID: <200809240005.m8O05XRU001380@zion.cs.uiuc.edu>

Author: evancheng
Date: Tue Sep 23 19:05:32 2008
New Revision: 56526

URL: http://llvm.org/viewvc/llvm-project?rev=56526&view=rev
Log:
Properly handle 'm' inline asm constraints. If a GV is being selected for the addressing mode, it requires the same logic for PIC relative addressing, etc.

Added:
    llvm/trunk/test/CodeGen/X86/inline-asm-pic.ll
Modified:
    llvm/trunk/include/llvm/Target/TargetLowering.h
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp
    llvm/trunk/lib/Target/CellSPU/SPUISelLowering.cpp
    llvm/trunk/lib/Target/CellSPU/SPUISelLowering.h
    llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp
    llvm/trunk/lib/Target/PowerPC/PPCISelLowering.h
    llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp
    llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
    llvm/trunk/lib/Target/X86/X86ISelLowering.h

Modified: llvm/trunk/include/llvm/Target/TargetLowering.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetLowering.h?rev=56526&r1=56525&r2=56526&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/TargetLowering.h (original)
+++ llvm/trunk/include/llvm/Target/TargetLowering.h Tue Sep 23 19:05:32 2008
@@ -1169,9 +1169,11 @@
   /// type to use for the specific AsmOperandInfo, setting
   /// OpInfo.ConstraintCode and OpInfo.ConstraintType.  If the actual operand
   /// being passed in is available, it can be passed in as Op, otherwise an
-  /// empty SDValue can be passed.
+  /// empty SDValue can be passed. If hasMemory is true it means one of the asm
+  /// constraint of the inline asm instruction being processed is 'm'.
   virtual void ComputeConstraintToUse(AsmOperandInfo &OpInfo,
                                       SDValue Op,
+                                      bool hasMemory,
                                       SelectionDAG *DAG = 0) const;
   
   /// getConstraintType - Given a constraint, return the type of constraint it
@@ -1206,8 +1208,11 @@
   virtual const char *LowerXConstraint(MVT ConstraintVT) const;
   
   /// LowerAsmOperandForConstraint - Lower the specified operand into the Ops
-  /// vector.  If it is invalid, don't add anything to Ops.
+  /// vector.  If it is invalid, don't add anything to Ops. If hasMemory is true
+  /// it means one of the asm constraint of the inline asm instruction being
+  /// processed is 'm'.
   virtual void LowerAsmOperandForConstraint(SDValue Op, char ConstraintLetter,
+                                            bool hasMemory,
                                             std::vector<SDValue> &Ops,
                                             SelectionDAG &DAG) const;
   

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Tue Sep 23 19:05:32 2008
@@ -4629,6 +4629,22 @@
   // Otherwise, we couldn't allocate enough registers for this.
 }
 
+/// hasInlineAsmMemConstraint - Return true if the inline asm instruction being
+/// processed uses a memory 'm' constraint.
+static bool
+hasInlineAsmMemConstraint(std::vector<InlineAsm::ConstraintInfo> &CInfos,
+                          TargetLowering &TLI) {
+  for (unsigned i = 0, e = CInfos.size(); i != e; ++i) {
+    InlineAsm::ConstraintInfo &CI = CInfos[i];
+    for (unsigned j = 0, ee = CI.Codes.size(); j != ee; ++j) {
+      TargetLowering::ConstraintType CType = TLI.getConstraintType(CI.Codes[j]);
+      if (CType == TargetLowering::C_Memory)
+        return true;
+    }
+  }
+
+  return false;
+}
 
 /// visitInlineAsm - Handle a call to an InlineAsm object.
 ///
@@ -4652,6 +4668,8 @@
   // constraint.  If so, we can't let the register allocator allocate any input
   // registers, because it will not know to avoid the earlyclobbered output reg.
   bool SawEarlyClobber = false;
+
+  bool hasMemory = hasInlineAsmMemConstraint(ConstraintInfos, TLI);
   
   unsigned ArgNo = 0;   // ArgNo - The argument of the CallInst.
   unsigned ResNo = 0;   // ResNo - The result number of the next output.
@@ -4724,7 +4742,7 @@
     OpInfo.ConstraintVT = OpVT;
     
     // Compute the constraint code and ConstraintType to use.
-    TLI.ComputeConstraintToUse(OpInfo, OpInfo.CallOperand, &DAG);
+    TLI.ComputeConstraintToUse(OpInfo, OpInfo.CallOperand, hasMemory, &DAG);
 
     // Keep track of whether we see an earlyclobber.
     SawEarlyClobber |= OpInfo.isEarlyClobber;
@@ -4927,7 +4945,7 @@
         
         std::vector<SDValue> Ops;
         TLI.LowerAsmOperandForConstraint(InOperandVal, OpInfo.ConstraintCode[0],
-                                         Ops, DAG);
+                                         hasMemory, Ops, DAG);
         if (Ops.empty()) {
           cerr << "Invalid operand for inline asm constraint '"
                << OpInfo.ConstraintCode << "'!\n";

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp Tue Sep 23 19:05:32 2008
@@ -1855,6 +1855,7 @@
 /// vector.  If it is invalid, don't add anything to Ops.
 void TargetLowering::LowerAsmOperandForConstraint(SDValue Op,
                                                   char ConstraintLetter,
+                                                  bool hasMemory,
                                                   std::vector<SDValue> &Ops,
                                                   SelectionDAG &DAG) const {
   switch (ConstraintLetter) {
@@ -1997,7 +1998,7 @@
 ///     'm' over 'r', for example.
 ///
 static void ChooseConstraint(TargetLowering::AsmOperandInfo &OpInfo,
-                             const TargetLowering &TLI,
+                             bool hasMemory,  const TargetLowering &TLI,
                              SDValue Op, SelectionDAG *DAG) {
   assert(OpInfo.Codes.size() > 1 && "Doesn't have multiple constraint options");
   unsigned BestIdx = 0;
@@ -2017,7 +2018,7 @@
       assert(OpInfo.Codes[i].size() == 1 &&
              "Unhandled multi-letter 'other' constraint");
       std::vector<SDValue> ResultOps;
-      TLI.LowerAsmOperandForConstraint(Op, OpInfo.Codes[i][0],
+      TLI.LowerAsmOperandForConstraint(Op, OpInfo.Codes[i][0], hasMemory,
                                        ResultOps, *DAG);
       if (!ResultOps.empty()) {
         BestType = CType;
@@ -2044,6 +2045,7 @@
 /// OpInfo.ConstraintCode and OpInfo.ConstraintType.
 void TargetLowering::ComputeConstraintToUse(AsmOperandInfo &OpInfo,
                                             SDValue Op, 
+                                            bool hasMemory,
                                             SelectionDAG *DAG) const {
   assert(!OpInfo.Codes.empty() && "Must have at least one constraint");
   
@@ -2052,7 +2054,7 @@
     OpInfo.ConstraintCode = OpInfo.Codes[0];
     OpInfo.ConstraintType = getConstraintType(OpInfo.ConstraintCode);
   } else {
-    ChooseConstraint(OpInfo, *this, Op, DAG);
+    ChooseConstraint(OpInfo, hasMemory, *this, Op, DAG);
   }
   
   // 'X' matches anything.

Modified: llvm/trunk/lib/Target/CellSPU/SPUISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CellSPU/SPUISelLowering.cpp?rev=56526&r1=56525&r2=56526&view=diff

==============================================================================
--- llvm/trunk/lib/Target/CellSPU/SPUISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/CellSPU/SPUISelLowering.cpp Tue Sep 23 19:05:32 2008
@@ -3040,10 +3040,12 @@
 void
 SPUTargetLowering::LowerAsmOperandForConstraint(SDValue Op,
                                                 char ConstraintLetter,
+                                                bool hasMemory,
                                                 std::vector<SDValue> &Ops,
                                                 SelectionDAG &DAG) const {
   // Default, for the time being, to the base class handler
-  TargetLowering::LowerAsmOperandForConstraint(Op, ConstraintLetter, Ops, DAG);
+  TargetLowering::LowerAsmOperandForConstraint(Op, ConstraintLetter, hasMemory,
+                                               Ops, DAG);
 }
 
 /// isLegalAddressImmediate - Return true if the integer value can be used

Modified: llvm/trunk/lib/Target/CellSPU/SPUISelLowering.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CellSPU/SPUISelLowering.h?rev=56526&r1=56525&r2=56526&view=diff

==============================================================================
--- llvm/trunk/lib/Target/CellSPU/SPUISelLowering.h (original)
+++ llvm/trunk/lib/Target/CellSPU/SPUISelLowering.h Tue Sep 23 19:05:32 2008
@@ -131,6 +131,7 @@
                                    MVT VT) const;
 
     void LowerAsmOperandForConstraint(SDValue Op, char ConstraintLetter,
+                                      bool hasMemory, 
                                       std::vector<SDValue> &Ops,
                                       SelectionDAG &DAG) const;
 

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

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp Tue Sep 23 19:05:32 2008
@@ -4763,8 +4763,11 @@
 
 
 /// LowerAsmOperandForConstraint - Lower the specified operand into the Ops
-/// vector.  If it is invalid, don't add anything to Ops.
+/// vector.  If it is invalid, don't add anything to Ops. If hasMemory is true
+/// it means one of the asm constraint of the inline asm instruction being
+/// processed is 'm'.
 void PPCTargetLowering::LowerAsmOperandForConstraint(SDValue Op, char Letter,
+                                                     bool hasMemory,
                                                      std::vector<SDValue>&Ops,
                                                      SelectionDAG &DAG) const {
   SDValue Result(0,0);
@@ -4823,7 +4826,7 @@
   }
   
   // Handle standard constraint letters.
-  TargetLowering::LowerAsmOperandForConstraint(Op, Letter, Ops, DAG);
+  TargetLowering::LowerAsmOperandForConstraint(Op, Letter, hasMemory, Ops, DAG);
 }
 
 // isLegalAddressingMode - Return true if the addressing mode represented

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

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCISelLowering.h (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCISelLowering.h Tue Sep 23 19:05:32 2008
@@ -300,9 +300,12 @@
     unsigned getByValTypeAlignment(const Type *Ty) const;
 
     /// LowerAsmOperandForConstraint - Lower the specified operand into the Ops
-    /// vector.  If it is invalid, don't add anything to Ops.
+    /// vector.  If it is invalid, don't add anything to Ops. If hasMemory is
+    /// true it means one of the asm constraint of the inline asm instruction
+    /// being processed is 'm'.
     virtual void LowerAsmOperandForConstraint(SDValue Op,
                                               char ConstraintLetter,
+                                              bool hasMemory,
                                               std::vector<SDValue> &Ops,
                                               SelectionDAG &DAG) const;
     

Modified: llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp?rev=56526&r1=56525&r2=56526&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp Tue Sep 23 19:05:32 2008
@@ -767,7 +767,7 @@
 /// addressing mode.
 bool X86DAGToDAGISel::MatchAddress(SDValue N, X86ISelAddressMode &AM,
                                    bool isRoot, unsigned Depth) {
-DOUT << "MatchAddress: "; DEBUG(AM.dump());
+  DOUT << "MatchAddress: "; DEBUG(AM.dump());
   // Limit recursion.
   if (Depth > 5)
     return MatchAddressBase(N, AM, isRoot, Depth);

Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=56526&r1=56525&r2=56526&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Tue Sep 23 19:05:32 2008
@@ -1593,7 +1593,7 @@
   if (CallRequiresFnAddressInReg(Is64Bit, IsTailCall)) {
     // Note: The actual moving to ecx is done further down.
     GlobalAddressSDNode *G = dyn_cast<GlobalAddressSDNode>(Callee);
-    if (G &&  !G->getGlobal()->hasHiddenVisibility() &&
+    if (G && !G->getGlobal()->hasHiddenVisibility() &&
         !G->getGlobal()->hasProtectedVisibility())
       Callee =  LowerGlobalAddress(Callee, DAG);
     else if (isa<ExternalSymbolSDNode>(Callee))
@@ -4300,8 +4300,8 @@
 }
 
 SDValue
-X86TargetLowering::LowerGlobalAddress(SDValue Op, SelectionDAG &DAG) {
-  GlobalValue *GV = cast<GlobalAddressSDNode>(Op)->getGlobal();
+X86TargetLowering::LowerGlobalAddress(const GlobalValue *GV,
+                                      SelectionDAG &DAG) const {
   SDValue Result = DAG.getTargetGlobalAddress(GV, getPointerTy());
   Result = DAG.getNode(X86ISD::Wrapper, getPointerTy(), Result);
   // With PIC, the address is actually $g + Offset.
@@ -4324,6 +4324,12 @@
   return Result;
 }
 
+SDValue
+X86TargetLowering::LowerGlobalAddress(SDValue Op, SelectionDAG &DAG) {
+  const GlobalValue *GV = cast<GlobalAddressSDNode>(Op)->getGlobal();
+  return LowerGlobalAddress(GV, DAG);
+}
+
 // Lower ISD::GlobalTLSAddress using the "general dynamic" model, 32 bit
 static SDValue
 LowerToTLSGeneralDynamicModel32(GlobalAddressSDNode *GA, SelectionDAG &DAG,
@@ -7067,6 +7073,7 @@
 /// vector.  If it is invalid, don't add anything to Ops.
 void X86TargetLowering::LowerAsmOperandForConstraint(SDValue Op,
                                                      char Constraint,
+                                                     bool hasMemory,
                                                      std::vector<SDValue>&Ops,
                                                      SelectionDAG &DAG) const {
   SDValue Result(0, 0);
@@ -7128,14 +7135,11 @@
     }
     
     if (GA) {
-      // If addressing this global requires a load (e.g. in PIC mode), we can't
-      // match.
-      if (Subtarget->GVRequiresExtraLoad(GA->getGlobal(), getTargetMachine(),
-                                         false))
-        return;
-
-      Op = DAG.getTargetGlobalAddress(GA->getGlobal(), GA->getValueType(0),
-                                      Offset);
+      if (hasMemory) 
+        Op = LowerGlobalAddress(GA->getGlobal(), DAG);
+      else
+        Op = DAG.getTargetGlobalAddress(GA->getGlobal(), GA->getValueType(0),
+                                        Offset);
       Result = Op;
       break;
     }
@@ -7149,7 +7153,8 @@
     Ops.push_back(Result);
     return;
   }
-  return TargetLowering::LowerAsmOperandForConstraint(Op, Constraint, Ops, DAG);
+  return TargetLowering::LowerAsmOperandForConstraint(Op, Constraint, hasMemory,
+                                                      Ops, DAG);
 }
 
 std::vector<unsigned> X86TargetLowering::

Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.h?rev=56526&r1=56525&r2=56526&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelLowering.h (original)
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.h Tue Sep 23 19:05:32 2008
@@ -403,9 +403,12 @@
     virtual const char *LowerXConstraint(MVT ConstraintVT) const;
 
     /// LowerAsmOperandForConstraint - Lower the specified operand into the Ops
-    /// vector.  If it is invalid, don't add anything to Ops.
+    /// vector.  If it is invalid, don't add anything to Ops. If hasMemory is
+    /// true it means one of the asm constraint of the inline asm instruction
+    /// being processed is 'm'.
     virtual void LowerAsmOperandForConstraint(SDValue Op,
                                               char ConstraintLetter,
+                                              bool hasMemory,
                                               std::vector<SDValue> &Ops,
                                               SelectionDAG &DAG) const;
     
@@ -529,6 +532,7 @@
     SDValue LowerINSERT_VECTOR_ELT_SSE4(SDValue Op, SelectionDAG &DAG);
     SDValue LowerSCALAR_TO_VECTOR(SDValue Op, SelectionDAG &DAG);
     SDValue LowerConstantPool(SDValue Op, SelectionDAG &DAG);
+    SDValue LowerGlobalAddress(const GlobalValue *GV, SelectionDAG &DAG) const;
     SDValue LowerGlobalAddress(SDValue Op, SelectionDAG &DAG);
     SDValue LowerGlobalTLSAddress(SDValue Op, SelectionDAG &DAG);
     SDValue LowerExternalSymbol(SDValue Op, SelectionDAG &DAG);

Added: llvm/trunk/test/CodeGen/X86/inline-asm-pic.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/inline-asm-pic.ll?rev=56526&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/inline-asm-pic.ll (added)
+++ llvm/trunk/test/CodeGen/X86/inline-asm-pic.ll Tue Sep 23 19:05:32 2008
@@ -0,0 +1,10 @@
+; RUN: llvm-as < %s | llc -mtriple=i386-apple-darwin -relocation-model=pic | grep lea
+; RUN: llvm-as < %s | llc -mtriple=i386-apple-darwin -relocation-model=pic | grep call
+
+ at main_q = internal global i8* null		; <i8**> [#uses=1]
+
+define void @func2() nounwind {
+entry:
+	tail call void asm "mov $1,%gs:$0", "=*m,ri,~{dirflag},~{fpsr},~{flags}"(i8** inttoptr (i32 152 to i8**), i8* bitcast (i8** @main_q to i8*)) nounwind
+	ret void
+}




From dpatel at apple.com  Tue Sep 23 19:06:15 2008
From: dpatel at apple.com (Devang Patel)
Date: Wed, 24 Sep 2008 00:06:15 -0000
Subject: [llvm-commits] [llvm] r56527 - in /llvm/trunk:
 include/llvm/Attributes.h lib/AsmParser/llvmAsmParser.cpp.cvs
 lib/AsmParser/llvmAsmParser.y lib/AsmParser/llvmAsmParser.y.cvs
 lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
 lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
 lib/Transforms/IPO/InlineAlways.cpp lib/Transforms/IPO/InlineSimple.cpp
 lib/Transforms/IPO/Inliner.cpp lib/Transforms/Scalar/LoopUnswitch.cpp
 lib/Transforms/Utils/InlineCost.cpp lib/VMCore/AsmWriter.cpp
Message-ID: <200809240006.m8O06FHt001448@zion.cs.uiuc.edu>

Author: dpatel
Date: Tue Sep 23 19:06:15 2008
New Revision: 56527

URL: http://llvm.org/viewvc/llvm-project?rev=56527&view=rev
Log:
Put FN_NOTE_AlwaysInline and others in FnAttr namespace.

Modified:
    llvm/trunk/include/llvm/Attributes.h
    llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs
    llvm/trunk/lib/AsmParser/llvmAsmParser.y
    llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs
    llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
    llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
    llvm/trunk/lib/Transforms/IPO/InlineAlways.cpp
    llvm/trunk/lib/Transforms/IPO/InlineSimple.cpp
    llvm/trunk/lib/Transforms/IPO/Inliner.cpp
    llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp
    llvm/trunk/lib/Transforms/Utils/InlineCost.cpp
    llvm/trunk/lib/VMCore/AsmWriter.cpp

Modified: llvm/trunk/include/llvm/Attributes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Attributes.h?rev=56527&r1=56526&r2=56527&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Attributes.h (original)
+++ llvm/trunk/include/llvm/Attributes.h Tue Sep 23 19:06:15 2008
@@ -78,12 +78,14 @@
 std::string getAsString(Attributes Attrs);
 } // end namespace ParamAttr
 
+namespace FnAttr {
 /// Function notes are implemented as attributes stored at index ~0 in 
 /// parameter attribute list.
-const Attributes FN_NOTE_None            = 0;    
-const Attributes FN_NOTE_NoInline        = 1<<0; // inline=never 
-const Attributes FN_NOTE_AlwaysInline    = 1<<1; // inline=always
-const Attributes FN_NOTE_OptimizeForSize = 1<<2; // opt_size
+const Attributes None            = 0;    
+const Attributes NoInline        = 1<<0; // inline=never 
+const Attributes AlwaysInline    = 1<<1; // inline=always
+const Attributes OptimizeForSize = 1<<2; // opt_size
+} // end namespace FnAttr
 
 /// This is just a pair of values to associate a set of parameter attributes
 /// with a parameter index. 

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

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs Tue Sep 23 19:06:15 2008
@@ -4125,11 +4125,11 @@
 #line 1298 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { 
                 unsigned tmp = (yyvsp[(1) - (3)].ParamAttrs) | (yyvsp[(3) - (3)].ParamAttrs);
-                if ((yyvsp[(3) - (3)].ParamAttrs) == FN_NOTE_NoInline 
-                    && ((yyvsp[(1) - (3)].ParamAttrs) & FN_NOTE_AlwaysInline))
+                if ((yyvsp[(3) - (3)].ParamAttrs) == FnAttr::NoInline 
+                    && ((yyvsp[(1) - (3)].ParamAttrs) & FnAttr::AlwaysInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
-                    if ((yyvsp[(3) - (3)].ParamAttrs) == FN_NOTE_AlwaysInline 
-                        && ((yyvsp[(1) - (3)].ParamAttrs) & FN_NOTE_NoInline))
+                    if ((yyvsp[(3) - (3)].ParamAttrs) == FnAttr::AlwaysInline 
+                        && ((yyvsp[(1) - (3)].ParamAttrs) & FnAttr::NoInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
                 (yyval.ParamAttrs) = tmp;
                 CHECK_FOR_ERROR 
@@ -4138,22 +4138,22 @@
 
   case 131:
 #line 1311 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = FN_NOTE_NoInline; ;}
+    { (yyval.ParamAttrs) = FnAttr::NoInline; ;}
     break;
 
   case 132:
 #line 1312 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = FN_NOTE_AlwaysInline; ;}
+    { (yyval.ParamAttrs) = FnAttr::AlwaysInline; ;}
     break;
 
   case 133:
 #line 1313 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = FN_NOTE_OptimizeForSize; ;}
+    { (yyval.ParamAttrs) = FnAttr::OptimizeForSize; ;}
     break;
 
   case 134:
 #line 1316 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = FN_NOTE_None; ;}
+    { (yyval.ParamAttrs) = FnAttr::None; ;}
     break;
 
   case 135:

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

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.y (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.y Tue Sep 23 19:06:15 2008
@@ -1297,23 +1297,23 @@
 FuncNoteList  : FuncNote { $$ = $1; }
               | FuncNoteList ',' FuncNote { 
                 unsigned tmp = $1 | $3;
-                if ($3 == FN_NOTE_NoInline 
-                    && ($1 & FN_NOTE_AlwaysInline))
+                if ($3 == FnAttr::NoInline 
+                    && ($1 & FnAttr::AlwaysInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
-                    if ($3 == FN_NOTE_AlwaysInline 
-                        && ($1 & FN_NOTE_NoInline))
+                    if ($3 == FnAttr::AlwaysInline 
+                        && ($1 & FnAttr::NoInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
                 $$ = tmp;
                 CHECK_FOR_ERROR 
               }
               ;
 
-FuncNote      : INLINE '=' NEVER { $$ = FN_NOTE_NoInline; }
-              | INLINE '=' ALWAYS { $$ = FN_NOTE_AlwaysInline; }
-              | OPTIMIZEFORSIZE { $$ = FN_NOTE_OptimizeForSize; }
+FuncNote      : INLINE '=' NEVER { $$ = FnAttr::NoInline; }
+              | INLINE '=' ALWAYS { $$ = FnAttr::AlwaysInline; }
+              | OPTIMIZEFORSIZE { $$ = FnAttr::OptimizeForSize; }
               ;
 
-OptFuncNotes  : /* empty */ { $$ = FN_NOTE_None; }
+OptFuncNotes  : /* empty */ { $$ = FnAttr::None; }
               | FNNOTE '(' FuncNoteList  ')' {
                 $$ =  $3;
               }

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

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs Tue Sep 23 19:06:15 2008
@@ -1297,23 +1297,23 @@
 FuncNoteList  : FuncNote { $$ = $1; }
               | FuncNoteList ',' FuncNote { 
                 unsigned tmp = $1 | $3;
-                if ($3 == FN_NOTE_NoInline 
-                    && ($1 & FN_NOTE_AlwaysInline))
+                if ($3 == FnAttr::NoInline 
+                    && ($1 & FnAttr::AlwaysInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
-                    if ($3 == FN_NOTE_AlwaysInline 
-                        && ($1 & FN_NOTE_NoInline))
+                    if ($3 == FnAttr::AlwaysInline 
+                        && ($1 & FnAttr::NoInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
                 $$ = tmp;
                 CHECK_FOR_ERROR 
               }
               ;
 
-FuncNote      : INLINE '=' NEVER { $$ = FN_NOTE_NoInline; }
-              | INLINE '=' ALWAYS { $$ = FN_NOTE_AlwaysInline; }
-              | OPTIMIZEFORSIZE { $$ = FN_NOTE_OptimizeForSize; }
+FuncNote      : INLINE '=' NEVER { $$ = FnAttr::NoInline; }
+              | INLINE '=' ALWAYS { $$ = FnAttr::AlwaysInline; }
+              | OPTIMIZEFORSIZE { $$ = FnAttr::OptimizeForSize; }
               ;
 
-OptFuncNotes  : /* empty */ { $$ = FN_NOTE_None; }
+OptFuncNotes  : /* empty */ { $$ = FnAttr::None; }
               | FNNOTE '(' FuncNoteList  ')' {
                 $$ =  $3;
               }

Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp?rev=56527&r1=56526&r2=56527&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp Tue Sep 23 19:06:15 2008
@@ -160,7 +160,7 @@
   SwitchToTextSection(SectionName.c_str());
 
   unsigned FnAlign = OptimizeForSize ? 1 : 4;
-  if (!F->isDeclaration() && F->hasNote(FN_NOTE_OptimizeForSize))
+  if (!F->isDeclaration() && F->hasNote(FnAttr::OptimizeForSize))
     FnAlign = 1;
   switch (F->getLinkage()) {
   default: assert(0 && "Unknown linkage type!");

Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp?rev=56527&r1=56526&r2=56527&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp Tue Sep 23 19:06:15 2008
@@ -147,7 +147,7 @@
   SwitchToTextSection(getSectionForFunction(*F).c_str(), F);
 
   unsigned FnAlign = OptimizeForSize ? 1 : 4;
-  if (!F->isDeclaration() && F->hasNote(FN_NOTE_OptimizeForSize))
+  if (!F->isDeclaration() && F->hasNote(FnAttr::OptimizeForSize))
     FnAlign = 1;
   switch (F->getLinkage()) {
   default: assert(0 && "Unsupported linkage type!");

Modified: llvm/trunk/lib/Transforms/IPO/InlineAlways.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/InlineAlways.cpp?rev=56527&r1=56526&r2=56527&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/InlineAlways.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/InlineAlways.cpp Tue Sep 23 19:06:15 2008
@@ -63,7 +63,7 @@
   
   for (Module::iterator I = M.begin(), E = M.end();
        I != E; ++I)
-    if (!I->isDeclaration() && !I->hasNote(FN_NOTE_AlwaysInline))
+    if (!I->isDeclaration() && !I->hasNote(FnAttr::AlwaysInline))
       NeverInline.insert(I);
 
   return false;

Modified: llvm/trunk/lib/Transforms/IPO/InlineSimple.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/InlineSimple.cpp?rev=56527&r1=56526&r2=56527&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/InlineSimple.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/InlineSimple.cpp Tue Sep 23 19:06:15 2008
@@ -65,7 +65,7 @@
   
   for (Module::iterator I = M.begin(), E = M.end();
        I != E; ++I)
-    if (!I->isDeclaration() && I->hasNote(FN_NOTE_NoInline))
+    if (!I->isDeclaration() && I->hasNote(FnAttr::NoInline))
       NeverInline.insert(I);
 
   // Get llvm.noinline

Modified: llvm/trunk/lib/Transforms/IPO/Inliner.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/Inliner.cpp?rev=56527&r1=56526&r2=56527&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/Inliner.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/Inliner.cpp Tue Sep 23 19:06:15 2008
@@ -141,7 +141,7 @@
         
         int CurrentThreshold = InlineThreshold;
         Function *Fn = CS.getCaller();
-        if (Fn && !Fn->isDeclaration() && Fn->hasNote(FN_NOTE_OptimizeForSize)
+        if (Fn && !Fn->isDeclaration() && Fn->hasNote(FnAttr::OptimizeForSize)
             && InlineThreshold != 50) {
           CurrentThreshold = 50;
         }

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

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp Tue Sep 23 19:06:15 2008
@@ -430,7 +430,7 @@
   Function *F = loopHeader->getParent();
 
   // Do not unswitch if the function is optimized for size.
-  if (!F->isDeclaration() && F->hasNote(FN_NOTE_OptimizeForSize))
+  if (!F->isDeclaration() && F->hasNote(FnAttr::OptimizeForSize))
     return false;
 
   // Check to see if it would be profitable to unswitch current loop.

Modified: llvm/trunk/lib/Transforms/Utils/InlineCost.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/InlineCost.cpp?rev=56527&r1=56526&r2=56527&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Utils/InlineCost.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/InlineCost.cpp Tue Sep 23 19:06:15 2008
@@ -222,7 +222,7 @@
   if (CalleeFI.NeverInline)
     return 2000000000;
 
-  if (!Callee->isDeclaration() && Callee->hasNote(FN_NOTE_AlwaysInline))
+  if (!Callee->isDeclaration() && Callee->hasNote(FnAttr::AlwaysInline))
     return -2000000000;
     
   // Add to the inline quality for properties that make the call valuable to

Modified: llvm/trunk/lib/VMCore/AsmWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/AsmWriter.cpp?rev=56527&r1=56526&r2=56527&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/AsmWriter.cpp (original)
+++ llvm/trunk/lib/VMCore/AsmWriter.cpp Tue Sep 23 19:06:15 2008
@@ -1412,12 +1412,12 @@
   } else {
 
     bool insideNotes = false;
-    if (F->hasNote(FN_NOTE_AlwaysInline)) {
+    if (F->hasNote(FnAttr::AlwaysInline)) {
       Out << "notes(";
       insideNotes = true;
       Out << "inline=always";
     }
-    if (F->hasNote(FN_NOTE_NoInline)) {
+    if (F->hasNote(FnAttr::NoInline)) {
       if (insideNotes) 
         Out << ",";
       else {
@@ -1426,7 +1426,7 @@
       }
       Out << "inline=never";
     }
-    if (F->hasNote(FN_NOTE_OptimizeForSize)) {
+    if (F->hasNote(FnAttr::OptimizeForSize)) {
       if (insideNotes) 
         Out << ",";
       else {




From gohman at apple.com  Tue Sep 23 19:06:16 2008
From: gohman at apple.com (Dan Gohman)
Date: Wed, 24 Sep 2008 00:06:16 -0000
Subject: [llvm-commits] [llvm] r56528 - in /llvm/trunk:
 include/llvm/CodeGen/MachineInstr.h lib/CodeGen/MachineInstr.cpp
Message-ID: <200809240006.m8O06GTt001454@zion.cs.uiuc.edu>

Author: djg
Date: Tue Sep 23 19:06:15 2008
New Revision: 56528

URL: http://llvm.org/viewvc/llvm-project?rev=56528&view=rev
Log:
Add a method to MachineInstr for testing whether it makes
any volatile memory references.

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

Modified: llvm/trunk/include/llvm/CodeGen/MachineInstr.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineInstr.h?rev=56528&r1=56527&r2=56528&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/MachineInstr.h (original)
+++ llvm/trunk/include/llvm/CodeGen/MachineInstr.h Tue Sep 23 19:06:15 2008
@@ -250,8 +250,16 @@
   /// the instruction's location and its intended destination.
   bool isSafeToMove(const TargetInstrInfo *TII, bool &SawStore);
 
+  /// isSafeToReMat - Return true if it's safe to rematerialize the specified
+  /// instruction which defined the specified register instead of copying it.
   bool isSafeToReMat(const TargetInstrInfo *TII, unsigned DstReg);
 
+  /// hasVolatileMemoryRef - Return true if this instruction may have a
+  /// volatile memory reference, or if the information describing the
+  /// memory reference is not available. Return false if it is known to
+  /// have no volatile memory references.
+  bool hasVolatileMemoryRef() const;
+
   //
   // Debugging support
   //

Modified: llvm/trunk/lib/CodeGen/MachineInstr.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineInstr.cpp?rev=56528&r1=56527&r2=56528&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/MachineInstr.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachineInstr.cpp Tue Sep 23 19:06:15 2008
@@ -711,16 +711,11 @@
   // destination. The check for isInvariantLoad gives the targe the chance to
   // classify the load as always returning a constant, e.g. a constant pool
   // load.
-  if (TID->mayLoad() && !TII->isInvariantLoad(this)) {
+  if (TID->mayLoad() && !TII->isInvariantLoad(this))
     // Otherwise, this is a real load.  If there is a store between the load and
-    // end of block, we can't sink the load.
-    //
-    // FIXME: we can't do this transformation until we know that the load is
-    // not volatile, and machineinstrs don't keep this info. :(
-    //
-    //if (SawStore) 
-    return false;
-  }
+    // end of block, or if the laod is volatile, we can't move it.
+    return SawStore || hasVolatileMemoryRef();
+
   return true;
 }
 
@@ -749,6 +744,32 @@
   return true;
 }
 
+/// hasVolatileMemoryRef - Return true if this instruction may have a
+/// volatile memory reference, or if the information describing the
+/// memory reference is not available. Return false if it is known to
+/// have no volatile memory references.
+bool MachineInstr::hasVolatileMemoryRef() const {
+  // An instruction known never to access memory won't have a volatile access.
+  if (!TID->mayStore() &&
+      !TID->mayLoad() &&
+      !TID->isCall() &&
+      !TID->hasUnmodeledSideEffects())
+    return false;
+
+  // Otherwise, if the instruction has no memory reference information,
+  // conservatively assume it wasn't preserved.
+  if (memoperands_empty())
+    return true;
+  
+  // Check the memory reference information for volatile references.
+  for (std::list<MachineMemOperand>::const_iterator I = memoperands_begin(),
+       E = memoperands_end(); I != E; ++I)
+    if (I->isVolatile())
+      return true;
+
+  return false;
+}
+
 void MachineInstr::dump() const {
   cerr << "  " << *this;
 }




From evan.cheng at apple.com  Tue Sep 23 19:06:17 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Tue, 23 Sep 2008 17:06:17 -0700
Subject: [llvm-commits] [llvm] r56384 - in /llvm/trunk/lib/CodeGen:
	RegAllocLinearScan.cpp SimpleRegisterCoalescing.cpp
In-Reply-To: <F8333ED3-A96A-435F-8DFD-976A8F13733C@apple.com>
References: <200809200203.m8K234YA013252@zion.cs.uiuc.edu>
	<4F71A860-E342-4A07-8211-0A59A1AA154D@apple.com>
	<F80F5034-326C-4AF5-A7A6-84F8C1C3AF23@apple.com>
	<8D81D6DA-8289-49E2-B352-53C6C313FDA8@apple.com>
	<33791BFC-A09D-43EB-B4D0-6582A9243EED@apple.com>
	<ADDCBC77-DB9F-46BB-A73D-FADC943C29D7@apple.com>
	<6AABEF56-39B2-4D47-8928-7FC4AC7AB61B@apple.com>
	<73CDDC9A-1C75-4A15-9931-12DDC51EABCB@apple.com>
	<C661BBE3-98E2-461C-BD90-5CA12268A65C@apple.com>
	<AAA125E9-8897-4B47-A405-CDFA1C83E8DA@apple.com>
	<99141E76-1A5C-4852-B1B5-7053DA9B02D5@apple.com>
	<787EC48F-5ED1-4529-A821-021FC97B069F@apple.com>
	<E6EE2B40-6E5D-43D8-AFFA-FBEC61B72ED2@apple.com>
	<F8333ED3-A96A-435F-8DFD-976A8F13733C@apple.com>
Message-ID: <ABE0E5D5-4428-416D-8595-6ACA4229EC75@apple.com>


On Sep 23, 2008, at 4:31 PM, Dale Johannesen wrote:

>
> On Sep 23, 2008, at 4:27 PMPDT, Evan Cheng wrote:
>
>>
>> On Sep 23, 2008, at 3:17 PM, Dale Johannesen wrote:
>>>>
>>>
>>> This did basically Just Work (I haven't run the gcc testsuite yet,
>>> but
>>> it doesn't break anything in
>>> the llvm testsuite and fixes all the examples in our bug reports.)
>>> Unfortunately, this approach
>>> only works in the linear scan RA, while we use a different RA with -
>>> O0.... I guess I need to fix
>>> that before turning it on.
>>
>> Yay. Good thing I was wrong. :-) Would you like to add the support
>> that allows us to model it as operand constraint so we can test it on
>> more things?
>
> Are you talking about the "minor tblgen and TargetInstrDesc changes"
> described below?   Not sure I understand how that would work, and I
> don't really want to wait for it before checking in.

You don't have to wait for it. I'll take care of it some time this week.

Evan

>
>
>> Evan
>>
>>>
>>>
>>>> Owen, can your liveintervals renumbering work be impacted?
>>>> i.e. Does it assume def must be one cycle before use?
>>>>
>>>>>
>>>>>
>>>>>>> Can earlyclobber operands be used to model the armv4 "mul"
>>>>>>> register
>>>>>>> weirdness where the input and output regs can't be the same?
>>>>>>
>>>>>> We could, but the correct way to model it is to push the use down
>>>>>> one
>>>>>> cycle, not def up one cycle. The problem with early clobber is  
>>>>>> the
>>>>>> def
>>>>>> cannot overlap any of the uses (both Rm and Rs). In the ARM mul
>>>>>> case,
>>>>>> the def cannot overlap Rm only.
>>>>>
>>>>> Sure, I agree with that.  This is also true of most inline asms
>>>>> with
>>>>> multiple instructions (like the example I gave).  Using
>>>>> earlyclobber
>>>>> should be a conservative but correct solution (and much better  
>>>>> than
>>>>> using the 'multiply fixer' pass that used to exist).
>>>>>
>>>>> This would also make it easier to test that earlyclobber is  
>>>>> working
>>>>> right (multiplies are more frequent than & in asms), which is  
>>>>> why I
>>>>> brought it up. :)
>>>>
>>>> That will require some minor tblgen and TargetInstrDesc changes. If
>>>> someone want to do that, sure.
>>>>
>>>> Evan
>>>>
>>>>>
>>>>>
>>>>> -Chris
>>>>>
>>>>> _______________________________________________
>>>>> 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
>>>
>>> _______________________________________________
>>> 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
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From dpatel at apple.com  Tue Sep 23 19:06:31 2008
From: dpatel at apple.com (Devang Patel)
Date: Tue, 23 Sep 2008 17:06:31 -0700
Subject: [llvm-commits] [llvm] r56524 - in /llvm/trunk:
	include/llvm/Attributes.h include/llvm/Function.h
	lib/AsmParser/llvmAsmParser.cpp.cvs lib/AsmParser/llvmAsmParser.y
	lib/AsmParser/llvmAsmParser.y.cvs
	lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
	lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
	lib/Transforms/IPO/InlineAlways.cpp	lib/Transforms/IPO/InlineSimple.cpp
	lib/Transforms/IPO/Inliner.cpp	lib/Transforms/Scalar/LoopUnswitch.cpp
	lib/Transforms/Utils/InlineCost.cpp lib/VMCore/AsmWriter.cpp
In-Reply-To: <1F87C4E7-3F93-4433-B789-2DDFEFA67BF8@apple.com>
References: <200809232352.m8NNq597000931@zion.cs.uiuc.edu>
	<1F87C4E7-3F93-4433-B789-2DDFEFA67BF8@apple.com>
Message-ID: <22F4001F-AD46-4566-A4A5-5D4248CDF9E9@apple.com>


On Sep 23, 2008, at 4:53 PM, Chris Lattner wrote:

>
> On Sep 23, 2008, at 4:52 PM, Devang Patel wrote:
>
>> Author: dpatel
>> Date: Tue Sep 23 18:52:03 2008
>> New Revision: 56524
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=56524&view=rev
>> Log:
>> Move FN_NOTE_AlwaysInline and other out of ParamAttrs namespace.
>> Do not check isDeclaration() in hasNote(). It is clients'
>> responsibility.
>
> Eww, please introduce a new namespace.  Like "FnAttr::NoInline".

okay, done :)
-
Devang


From gohman at apple.com  Tue Sep 23 19:07:08 2008
From: gohman at apple.com (Dan Gohman)
Date: Wed, 24 Sep 2008 00:07:08 -0000
Subject: [llvm-commits] [llvm] r56529 -
	/llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp
Message-ID: <200809240007.m8O078kX001513@zion.cs.uiuc.edu>

Author: djg
Date: Tue Sep 23 19:07:08 2008
New Revision: 56529

URL: http://llvm.org/viewvc/llvm-project?rev=56529&view=rev
Log:
Set SetStore to false, to allow this pass to delete
dead loads.

Modified:
    llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp

Modified: llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp?rev=56529&r1=56528&r2=56529&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp (original)
+++ llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp Tue Sep 23 19:07:08 2008
@@ -46,7 +46,7 @@
   const MachineRegisterInfo &MRI = MF.getRegInfo();
   const TargetInstrInfo &TII = *MF.getTarget().getInstrInfo();
   BitVector LivePhysRegs;
-  bool SawStore = true;
+  bool SawStore;
 
   // Compute a bitvector to represent all non-allocatable physregs.
   BitVector NonAllocatableRegs = TRI.getAllocatableSet(MF);
@@ -79,6 +79,7 @@
       MachineInstr *MI = &*MII;
 
       // Don't delete instructions with side effects.
+      SawStore = false;
       if (MI->isSafeToMove(&TII, SawStore)) {
         // Examine each operand.
         bool AllDefsDead = true;




From dpatel at apple.com  Tue Sep 23 19:08:15 2008
From: dpatel at apple.com (Devang Patel)
Date: Wed, 24 Sep 2008 00:08:15 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r56530 - in /llvm-gcc-4.2/trunk/gcc:
 llvm-backend.cpp llvm-convert.cpp
Message-ID: <200809240008.m8O08GM7001551@zion.cs.uiuc.edu>

Author: dpatel
Date: Tue Sep 23 19:08:15 2008
New Revision: 56530

URL: http://llvm.org/viewvc/llvm-project?rev=56530&view=rev
Log:
Put FN_NOTE_AlwaysInline and others in FnAttr namespace.


Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp
    llvm-gcc-4.2/trunk/gcc/llvm-convert.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=56530&r1=56529&r2=56530&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Tue Sep 23 19:08:15 2008
@@ -386,7 +386,7 @@
   // marked as always_inline.
   for (Module::iterator I = TheModule->begin(), E = TheModule->end();
        I != E; ++I)
-    if (I->hasNote(FN_NOTE_AlwaysInline)) {
+    if (I->hasNote(FnAttr::AlwaysInline)) {
       NeedAlwaysInliner = true;
       break;
     }

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=56530&r1=56529&r2=56530&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Tue Sep 23 19:08:15 2008
@@ -652,7 +652,7 @@
   
   // Handle noinline Functions
   if (lookup_attribute ("noinline", DECL_ATTRIBUTES (FnDecl)))
-    Fn->setNotes(FN_NOTE_NoInline);
+    Fn->setNotes(FnAttr::NoInline);
   /* FIXME: Remove llvm.noinline related code. 
   {
     const Type *SBP= PointerType::getUnqual(Type::Int8Ty);
@@ -663,10 +663,10 @@
 
   // Handle always_inline attribute
   if (lookup_attribute ("always_inline", DECL_ATTRIBUTES (FnDecl)))
-    Fn->setNotes(FN_NOTE_AlwaysInline);
+    Fn->setNotes(FnAttr::AlwaysInline);
 
   if (optimize_size)
-    Fn->setNotes(FN_NOTE_OptimizeForSize);
+    Fn->setNotes(FnAttr::OptimizeForSize);
 
   // Handle annotate attributes
   if (DECL_ATTRIBUTES(FnDecl))




From dpatel at apple.com  Tue Sep 23 19:14:41 2008
From: dpatel at apple.com (Devang Patel)
Date: Tue, 23 Sep 2008 17:14:41 -0700
Subject: [llvm-commits] [llvm] r56511 - in /llvm/trunk: include/llvm/
	lib/AsmParser/ lib/Bitcode/Reader/ lib/Bitcode/Writer/
	lib/Target/X86/AsmPrinter/	lib/Transforms/IPO/	lib/Transforms/Scalar/
	lib/Transforms/Utils/ lib/VMCore/
In-Reply-To: <181FE521-E40E-44CB-9474-07AADD3B5D05@apple.com>
References: <200809232235.m8NMZJGn030760@zion.cs.uiuc.edu>
	<D7685178-B66C-4822-A33D-C27F4A93238A@apple.com>
	<C491355D-79B5-4741-8D79-9A1912614E8C@apple.com>
	<65B5B7F8-8A6B-4ED0-8A7B-3DD3FB9731EF@apple.com>
	<38E503F0-1979-4D7A-A10E-217D0EEEFC3C@apple.com>
	<181FE521-E40E-44CB-9474-07AADD3B5D05@apple.com>
Message-ID: <F58F62D0-7FCC-401B-9EE9-BDFA777EB125@apple.com>


On Sep 23, 2008, at 5:04 PM, Chris Lattner wrote:

>
> On Sep 23, 2008, at 4:53 PM, Devang Patel wrote:
>
>>
>> On Sep 23, 2008, at 4:51 PM, Chris Lattner wrote:
>>
>>> On Sep 23, 2008, at 4:27 PM, Devang Patel wrote:
>>>
>>>>> Is the syntax of notes in .ll files going to change to follow
>>>>> attributes?
>>>>
>>>> No. We'll continue to use notes() syntax.
>>>
>>> Why?
>>
>> I am confused. What are you proposing?
>
> Currently we have:
>
> declare i32 @foo( ... param attrs ...) nounwind ...fnattrs...
> notes(...notes...) {
>
>
> I think we really want:
>
> declare ...result attrs... i32 @foo( ... param attrs ...)
> nounwind ...fnattrs... {
>
> I don't think we need the notes syntax at all, do you agree?

I like result attributes!
Are fnattrs allowed  anywhere before { ?
-
Devang





From clattner at apple.com  Tue Sep 23 19:18:29 2008
From: clattner at apple.com (Chris Lattner)
Date: Tue, 23 Sep 2008 17:18:29 -0700
Subject: [llvm-commits] [llvm] r56511 - in /llvm/trunk: include/llvm/
	lib/AsmParser/ lib/Bitcode/Reader/ lib/Bitcode/Writer/
	lib/Target/X86/AsmPrinter/	lib/Transforms/IPO/	lib/Transforms/Scalar/
	lib/Transforms/Utils/ lib/VMCore/
In-Reply-To: <F58F62D0-7FCC-401B-9EE9-BDFA777EB125@apple.com>
References: <200809232235.m8NMZJGn030760@zion.cs.uiuc.edu>
	<D7685178-B66C-4822-A33D-C27F4A93238A@apple.com>
	<C491355D-79B5-4741-8D79-9A1912614E8C@apple.com>
	<65B5B7F8-8A6B-4ED0-8A7B-3DD3FB9731EF@apple.com>
	<38E503F0-1979-4D7A-A10E-217D0EEEFC3C@apple.com>
	<181FE521-E40E-44CB-9474-07AADD3B5D05@apple.com>
	<F58F62D0-7FCC-401B-9EE9-BDFA777EB125@apple.com>
Message-ID: <09B40D7B-B6DE-4004-BE53-E15E1DF7028A@apple.com>


On Sep 23, 2008, at 5:14 PM, Devang Patel wrote:

>> I think we really want:
>>
>> declare ...result attrs... i32 @foo( ... param attrs ...)
>> nounwind ...fnattrs... {
>>
>> I don't think we need the notes syntax at all, do you agree?
>
> I like result attributes!
> Are fnattrs allowed  anywhere before { ?

Yep, I think we should migrate things like 'nounwind' to be function  
attrs (index ~0U) instead of result attrs (index 0).  We need to stay  
backwards compatible though.

-Chris


From gohman at apple.com  Tue Sep 23 19:27:38 2008
From: gohman at apple.com (Dan Gohman)
Date: Wed, 24 Sep 2008 00:27:38 -0000
Subject: [llvm-commits] [llvm] r56531 -
	/llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp
Message-ID: <200809240027.m8O0RcsY002240@zion.cs.uiuc.edu>

Author: djg
Date: Tue Sep 23 19:27:38 2008
New Revision: 56531

URL: http://llvm.org/viewvc/llvm-project?rev=56531&view=rev
Log:
Refactor the logic for testing if an instruction is dead into a
separate method.

Modified:
    llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp

Modified: llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp?rev=56531&r1=56530&r2=56531&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp (original)
+++ llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp Tue Sep 23 19:27:38 2008
@@ -25,9 +25,17 @@
         public MachineFunctionPass {
     virtual bool runOnMachineFunction(MachineFunction &MF);
     
+    const TargetRegisterInfo *TRI;
+    const MachineRegisterInfo *MRI;
+    const TargetInstrInfo *TII;
+    BitVector LivePhysRegs;
+
   public:
     static char ID; // Pass identification, replacement for typeid
     DeadMachineInstructionElim() : MachineFunctionPass(&ID) {}
+
+  private:
+    bool isDead(MachineInstr *MI) const;
   };
 }
 char DeadMachineInstructionElim::ID = 0;
@@ -40,16 +48,37 @@
   return new DeadMachineInstructionElim();
 }
 
+bool DeadMachineInstructionElim::isDead(MachineInstr *MI) const {
+  // Don't delete instructions with side effects.
+  bool SawStore = false;
+  if (!MI->isSafeToMove(TII, SawStore))
+    return false;
+
+  // Examine each operand.
+  for (unsigned i = 0, e = MI->getNumOperands(); i != e; ++i) {
+    const MachineOperand &MO = MI->getOperand(i);
+    if (MO.isRegister() && MO.isDef()) {
+      unsigned Reg = MO.getReg();
+      if (TargetRegisterInfo::isPhysicalRegister(Reg) ?
+          LivePhysRegs[Reg] : !MRI->use_empty(Reg)) {
+        // This def has a use. Don't delete the instruction!
+        return false;
+      }
+    }
+  }
+
+  // If there are no defs with uses, the instruction is dead.
+  return true;
+}
+
 bool DeadMachineInstructionElim::runOnMachineFunction(MachineFunction &MF) {
   bool AnyChanges = false;
-  const TargetRegisterInfo &TRI = *MF.getTarget().getRegisterInfo();
-  const MachineRegisterInfo &MRI = MF.getRegInfo();
-  const TargetInstrInfo &TII = *MF.getTarget().getInstrInfo();
-  BitVector LivePhysRegs;
-  bool SawStore;
+  MRI = &MF.getRegInfo();
+  TRI = MF.getTarget().getRegisterInfo();
+  TII = MF.getTarget().getInstrInfo();
 
   // Compute a bitvector to represent all non-allocatable physregs.
-  BitVector NonAllocatableRegs = TRI.getAllocatableSet(MF);
+  BitVector NonAllocatableRegs = TRI->getAllocatableSet(MF);
   NonAllocatableRegs.flip();
 
   // Loop over all instructions in all blocks, from bottom to top, so that it's
@@ -65,8 +94,8 @@
 
     // Also add any explicit live-out physregs for this block.
     if (!MBB->empty() && MBB->back().getDesc().isReturn())
-      for (MachineRegisterInfo::liveout_iterator LOI = MRI.liveout_begin(),
-           LOE = MRI.liveout_end(); LOI != LOE; ++LOI) {
+      for (MachineRegisterInfo::liveout_iterator LOI = MRI->liveout_begin(),
+           LOE = MRI->liveout_end(); LOI != LOE; ++LOI) {
         unsigned Reg = *LOI;
         if (TargetRegisterInfo::isPhysicalRegister(Reg))
           LivePhysRegs.set(Reg);
@@ -78,33 +107,14 @@
          MIE = MBB->rend(); MII != MIE; ) {
       MachineInstr *MI = &*MII;
 
-      // Don't delete instructions with side effects.
-      SawStore = false;
-      if (MI->isSafeToMove(&TII, SawStore)) {
-        // Examine each operand.
-        bool AllDefsDead = true;
-        for (unsigned i = 0, e = MI->getNumOperands(); i != e; ++i) {
-          const MachineOperand &MO = MI->getOperand(i);
-          if (MO.isRegister() && MO.isDef()) {
-            unsigned Reg = MO.getReg();
-            if (TargetRegisterInfo::isPhysicalRegister(Reg) ?
-                LivePhysRegs[Reg] : !MRI.use_empty(Reg)) {
-              // This def has a use. Don't delete the instruction!
-              AllDefsDead = false;
-              break;
-            }
-          }
-        }
-
-        // If there are no defs with uses, the instruction is dead.
-        if (AllDefsDead) {
-          AnyChanges = true;
-          MI->eraseFromParent();
-          MIE = MBB->rend();
-          // MII is now pointing to the next instruction to process,
-          // so don't increment it.
-          continue;
-        }
+      // If the instruction is dead, delete it!
+      if (isDead(MI)) {
+        AnyChanges = true;
+        MI->eraseFromParent();
+        MIE = MBB->rend();
+        // MII is now pointing to the next instruction to process,
+        // so don't increment it.
+        continue;
       }
 
       // Record the physreg defs.
@@ -114,7 +124,7 @@
           unsigned Reg = MO.getReg();
           if (Reg != 0 && TargetRegisterInfo::isPhysicalRegister(Reg)) {
             LivePhysRegs.reset(Reg);
-            for (const unsigned *AliasSet = TRI.getAliasSet(Reg);
+            for (const unsigned *AliasSet = TRI->getAliasSet(Reg);
                  *AliasSet; ++AliasSet)
               LivePhysRegs.reset(*AliasSet);
           }
@@ -128,7 +138,7 @@
           unsigned Reg = MO.getReg();
           if (Reg != 0 && TargetRegisterInfo::isPhysicalRegister(Reg)) {
             LivePhysRegs.set(Reg);
-            for (const unsigned *AliasSet = TRI.getAliasSet(Reg);
+            for (const unsigned *AliasSet = TRI->getAliasSet(Reg);
                  *AliasSet; ++AliasSet)
               LivePhysRegs.set(*AliasSet);
           }
@@ -141,5 +151,6 @@
     }
   }
 
+  LivePhysRegs.clear();
   return AnyChanges;
 }




From dpatel at apple.com  Tue Sep 23 19:29:50 2008
From: dpatel at apple.com (Devang Patel)
Date: Wed, 24 Sep 2008 00:29:50 -0000
Subject: [llvm-commits] [llvm] r56532 - in /llvm/trunk:
 include/llvm/Attributes.h lib/VMCore/Attributes.cpp
Message-ID: <200809240029.m8O0ToMb002401@zion.cs.uiuc.edu>

Author: dpatel
Date: Tue Sep 23 19:29:49 2008
New Revision: 56532

URL: http://llvm.org/viewvc/llvm-project?rev=56532&view=rev
Log:
s/ParamAttributeListImpl/AttributeListImpl/g

Modified:
    llvm/trunk/include/llvm/Attributes.h
    llvm/trunk/lib/VMCore/Attributes.cpp

Modified: llvm/trunk/include/llvm/Attributes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Attributes.h?rev=56532&r1=56531&r2=56532&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Attributes.h (original)
+++ llvm/trunk/include/llvm/Attributes.h Tue Sep 23 19:29:49 2008
@@ -105,14 +105,14 @@
 // PAListPtr Smart Pointer
 //===----------------------------------------------------------------------===//
 
-class ParamAttributeListImpl;
+class AttributeListImpl;
   
 /// PAListPtr - This class manages the ref count for the opaque 
-/// ParamAttributeListImpl object and provides accessors for it.
+/// AttributeListImpl object and provides accessors for it.
 class PAListPtr {
   /// PAList - The parameter attributes that we are managing.  This can be null
   /// to represent the empty parameter attributes list.
-  ParamAttributeListImpl *PAList;
+  AttributeListImpl *PAList;
 public:
   PAListPtr() : PAList(0) {}
   PAListPtr(const PAListPtr &P);
@@ -204,7 +204,7 @@
   const ParamAttrsWithIndex &getSlot(unsigned Slot) const;
   
 private:
-  explicit PAListPtr(ParamAttributeListImpl *L);
+  explicit PAListPtr(AttributeListImpl *L);
 };
 
 } // End llvm namespace

Modified: llvm/trunk/lib/VMCore/Attributes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Attributes.cpp?rev=56532&r1=56531&r2=56532&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/Attributes.cpp (original)
+++ llvm/trunk/lib/VMCore/Attributes.cpp Tue Sep 23 19:29:49 2008
@@ -72,21 +72,21 @@
 }
 
 //===----------------------------------------------------------------------===//
-// ParamAttributeListImpl Definition
+// AttributeListImpl Definition
 //===----------------------------------------------------------------------===//
 
 namespace llvm {
-class ParamAttributeListImpl : public FoldingSetNode {
+class AttributeListImpl : public FoldingSetNode {
   unsigned RefCount;
   
   // ParamAttrsList is uniqued, these should not be publicly available.
-  void operator=(const ParamAttributeListImpl &); // Do not implement
-  ParamAttributeListImpl(const ParamAttributeListImpl &); // Do not implement
-  ~ParamAttributeListImpl();                        // Private implementation
+  void operator=(const AttributeListImpl &); // Do not implement
+  AttributeListImpl(const AttributeListImpl &); // Do not implement
+  ~AttributeListImpl();                        // Private implementation
 public:
   SmallVector<ParamAttrsWithIndex, 4> Attrs;
   
-  ParamAttributeListImpl(const ParamAttrsWithIndex *Attr, unsigned NumAttrs)
+  AttributeListImpl(const ParamAttrsWithIndex *Attr, unsigned NumAttrs)
     : Attrs(Attr, Attr+NumAttrs) {
     RefCount = 0;
   }
@@ -105,9 +105,9 @@
 };
 }
 
-static ManagedStatic<FoldingSet<ParamAttributeListImpl> > ParamAttrsLists;
+static ManagedStatic<FoldingSet<AttributeListImpl> > ParamAttrsLists;
 
-ParamAttributeListImpl::~ParamAttributeListImpl() {
+AttributeListImpl::~AttributeListImpl() {
   ParamAttrsLists->RemoveNode(this);
 }
 
@@ -128,15 +128,15 @@
   
   // Otherwise, build a key to look up the existing attributes.
   FoldingSetNodeID ID;
-  ParamAttributeListImpl::Profile(ID, Attrs, NumAttrs);
+  AttributeListImpl::Profile(ID, Attrs, NumAttrs);
   void *InsertPos;
-  ParamAttributeListImpl *PAL =
+  AttributeListImpl *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 ParamAttributeListImpl(Attrs, NumAttrs);
+    PAL = new AttributeListImpl(Attrs, NumAttrs);
     ParamAttrsLists->InsertNode(PAL, InsertPos);
   }
   
@@ -149,7 +149,7 @@
 // PAListPtr Method Implementations
 //===----------------------------------------------------------------------===//
 
-PAListPtr::PAListPtr(ParamAttributeListImpl *LI) : PAList(LI) {
+PAListPtr::PAListPtr(AttributeListImpl *LI) : PAList(LI) {
   if (LI) LI->AddRef();
 }
 




From gohman at apple.com  Tue Sep 23 19:36:08 2008
From: gohman at apple.com (Dan Gohman)
Date: Tue, 23 Sep 2008 17:36:08 -0700
Subject: [llvm-commits] [llvm] r56268 - in /llvm/trunk:
	include/llvm/CodeGen/LinkAllCodegenComponents.h
	include/llvm/CodeGen/Passes.h
	lib/CodeGen/DeadMachineInstructionElim.cpp
In-Reply-To: <B90482C3-DEC8-4DE7-B588-26B42F583BD5@apple.com>
References: <200809170043.m8H0hPQK019214@zion.cs.uiuc.edu>
	<B90482C3-DEC8-4DE7-B588-26B42F583BD5@apple.com>
Message-ID: <42DBC5FF-A8D3-4FC4-8C4D-02EE0F82A590@apple.com>


On Sep 21, 2008, at 9:24 PM, Chris Lattner wrote:

>
> On Sep 16, 2008, at 5:43 PM, Dan Gohman wrote:
>
>> +bool  
>> DeadMachineInstructionElim::runOnMachineFunction(MachineFunction  
>> &MF) {
>> +  bool AnyChanges = false;
>> +  const MachineRegisterInfo &MRI = MF.getRegInfo();
>> +  const TargetInstrInfo &TII = *MF.getTarget().getInstrInfo();
>> +  bool SawStore = true;
>> +
>> +  // Loop over all instructions in all blocks, from bottom to top,  
>> so that it's
>> +  // more likely that chains of dependent but ultimately dead  
>> instructions will
>> +  // be cleaned up.
>> +  for (MachineFunction::reverse_iterator I = MF.rbegin(), E =  
>> MF.rend();
>> +       I != E; ++I) {
>
> This looks pretty nice to me.  The one big "problem" is that defs of  
> physregs prevent an instruction from being removed.  Since physreg  
> defs can only be local before regalloc, and since you're walking  
> backward through the block already, can you just keep track of uses  
> of physregs as you scan backward?

Yes, this is the approach I ended up taking, at least for now.

>
>
>> +    MachineBasicBlock *MBB = &*I;
>> +    for (MachineBasicBlock::reverse_iterator MII = MBB->rbegin(),
>> +         MIE = MBB->rend(); MII != MIE; ) {
>> +      MachineInstr *MI = &*MII;
>> +
>> +      // Don't delete instructions with side effects.
>> +      if (MI->isSafeToMove(&TII, SawStore)) {
>
> Is this really the right predicate?  Why not check explicitly for  
> side effects?

There are several kinds of side effects: stores, volatile loads,
calls, branches, and so on, and isSafeToMove checks all of them.

>
>
> Just to avoid nesting, how about:
>
> if (!MI->isSafeToMove(&TII, SawStore)) {
>  ++MII;
>  continue;
> }

Done.

>
>
>>
>> +        // Examine each operand.
>> +        bool AllDefsDead = true;
>> +        for (unsigned i = 0, e = MI->getNumOperands(); i != e; + 
>> +i) {
>> +          const MachineOperand &MO = MI->getOperand(i);
>> +          if (MO.isRegister() && MO.isDef()) {
>> +            unsigned Reg = MO.getReg();
>> +            if (TargetRegisterInfo::isPhysicalRegister(Reg) ||
>> +                !MRI.use_empty(Reg)) {
>> +              // This def has a use. Don't delete the instruction!
>> +              AllDefsDead = false;
>> +              break;
>> +            }
>> +          }
>> +        }
>
> Please split this out to a helper function.

Done.

>
>
>>
>> +
>> +        // If there are no defs with uses, the instruction is dead.
>> +        if (AllDefsDead) {
>> +          // Clear out the operands to take the registers out of  
>> their
>> +          // use chains.
>> +          while (unsigned Num = MI->getNumOperands())
>> +            MI->RemoveOperand(Num-1);
>
> Why do you need to do this?  Just deleting the MI should be enough.


It was a misunderstanding on my part. I removed these lines now.

Dan



From evan.cheng at apple.com  Tue Sep 23 19:49:34 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Wed, 24 Sep 2008 00:49:34 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r56533 -
	/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
Message-ID: <200809240049.m8O0nYt3003315@zion.cs.uiuc.edu>

Author: evancheng
Date: Tue Sep 23 19:49:33 2008
New Revision: 56533

URL: http://llvm.org/viewvc/llvm-project?rev=56533&view=rev
Log:
Implement floating-point not.

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=56533&r1=56532&r2=56533&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Tue Sep 23 19:49:33 2008
@@ -3204,6 +3204,25 @@
   return Call;
 }
 
+/// getSuitableBitCastIntType - Given Ty is a floating point type or a vector
+/// type with floating point elements, return an integer type to bitcast to.
+/// e.g. 4 x float -> 4 x i32
+static const Type *getSuitableBitCastIntType(const Type *Ty) {
+  if (Ty == Type::FloatTy)
+    return Type::Int32Ty;
+  else if (Ty == Type::DoubleTy)
+    return Type::Int64Ty;
+  else if (const VectorType *VTy = dyn_cast<VectorType>(Ty)) {
+    unsigned NumElements = VTy->getNumElements();
+    const Type *EltTy = VTy->getElementType();
+    if (EltTy == Type::FloatTy)
+      return VectorType::get(Type::Int32Ty, NumElements);
+    else if (EltTy == Type::DoubleTy)
+      return VectorType::get(Type::Int64Ty, NumElements);
+  }
+  return NULL;
+}
+
 Value *TreeToLLVM::EmitBIT_NOT_EXPR(tree exp) {
   Value *Op = Emit(TREE_OPERAND(exp, 0), 0);
   if (isa<PointerType>(Op->getType())) {
@@ -3211,6 +3230,16 @@
             "Expected integer type here");
     Op = CastToType(Instruction::PtrToInt, Op, TREE_TYPE(exp));
   }
+
+  const Type *Ty = Op->getType();
+  if (Ty->isFloatingPoint() ||
+      (isa<VectorType>(Ty) && 
+       cast<VectorType>(Ty)->getElementType()->isFloatingPoint())) {
+    Ty = getSuitableBitCastIntType(Ty);
+    if (!Ty)
+      abort();
+    Op = BitCastToType(Op, Ty);
+  }
   return Builder.CreateNot(Op, (Op->getName()+"not").c_str());
 }
 
@@ -3297,20 +3326,8 @@
       (Ty->isFloatingPoint() ||
        (isa<VectorType>(Ty) && 
         cast<VectorType>(Ty)->getElementType()->isFloatingPoint()))) {
-    if (Ty == Type::FloatTy)
-      Ty = Type::Int32Ty;
-    else if (Ty == Type::DoubleTy)
-      Ty = Type::Int64Ty;
-    else if (const VectorType *VTy = dyn_cast<VectorType>(Ty)) {
-      unsigned NumElements = VTy->getNumElements();
-      const Type *EltTy = VTy->getElementType();
-      if (EltTy == Type::FloatTy)
-        Ty = VectorType::get(Type::Int32Ty, NumElements);
-      else if (EltTy == Type::DoubleTy)
-        Ty = VectorType::get(Type::Int64Ty, NumElements);
-      else
-        abort();
-    } else
+    Ty = getSuitableBitCastIntType(Ty);
+    if (!Ty)
       abort();
     LHS = BitCastToType(LHS, Ty);
     RHS = BitCastToType(RHS, Ty);




From evan.cheng at apple.com  Tue Sep 23 19:50:16 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Wed, 24 Sep 2008 00:50:16 -0000
Subject: [llvm-commits] [llvm] r56534 -
	/llvm/trunk/test/FrontendC/fp-logical.c
Message-ID: <200809240050.m8O0oGUN003354@zion.cs.uiuc.edu>

Author: evancheng
Date: Tue Sep 23 19:50:16 2008
New Revision: 56534

URL: http://llvm.org/viewvc/llvm-project?rev=56534&view=rev
Log:
Test fp not.

Modified:
    llvm/trunk/test/FrontendC/fp-logical.c

Modified: llvm/trunk/test/FrontendC/fp-logical.c
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendC/fp-logical.c?rev=56534&r1=56533&r2=56534&view=diff

==============================================================================
--- llvm/trunk/test/FrontendC/fp-logical.c (original)
+++ llvm/trunk/test/FrontendC/fp-logical.c Tue Sep 23 19:50:16 2008
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc %s -S -o - | grep bitcast | count 5
+// RUN: %llvmgcc %s -S -o - | grep bitcast | count 14
 
 typedef float vFloat __attribute__ ((__vector_size__ (16)));
 typedef unsigned int vUInt32 __attribute__ ((__vector_size__ (16)));
@@ -7,3 +7,9 @@
   vFloat ExtremeValue = *X & NoSignBit;
   *X = ExtremeValue;
 }
+
+void bar(vFloat *X) {
+  vFloat NoSignBit = (vFloat) ~ (vUInt32) (vFloat) { -0.f, -0.f, -0.f, -0.f };
+  vFloat ExtremeValue = *X & ~NoSignBit;
+  *X = ExtremeValue;
+}




From dpatel at apple.com  Tue Sep 23 19:55:02 2008
From: dpatel at apple.com (Devang Patel)
Date: Wed, 24 Sep 2008 00:55:02 -0000
Subject: [llvm-commits] [llvm] r56535 - in /llvm/trunk:
 include/llvm/Attributes.h lib/Bitcode/Reader/BitcodeReader.cpp
 lib/Bitcode/Writer/BitcodeWriter.cpp lib/Target/CppBackend/CPPBackend.cpp
 lib/Transforms/IPO/ArgumentPromotion.cpp
 lib/Transforms/IPO/DeadArgumentElimination.cpp
 lib/Transforms/IPO/StructRetPromotion.cpp
 lib/Transforms/Scalar/InstructionCombining.cpp lib/VMCore/Attributes.cpp
 lib/VMCore/Function.cpp lib/VMCore/Verifier.cpp
Message-ID: <200809240055.m8O0t3kE003512@zion.cs.uiuc.edu>

Author: dpatel
Date: Tue Sep 23 19:55:02 2008
New Revision: 56535

URL: http://llvm.org/viewvc/llvm-project?rev=56535&view=rev
Log:
s/ParamAttrsWithIndex/FnAttributeWithIndex/g

Modified:
    llvm/trunk/include/llvm/Attributes.h
    llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
    llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
    llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp
    llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp
    llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp
    llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp
    llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp
    llvm/trunk/lib/VMCore/Attributes.cpp
    llvm/trunk/lib/VMCore/Function.cpp
    llvm/trunk/lib/VMCore/Verifier.cpp

Modified: llvm/trunk/include/llvm/Attributes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Attributes.h?rev=56535&r1=56534&r2=56535&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Attributes.h (original)
+++ llvm/trunk/include/llvm/Attributes.h Tue Sep 23 19:55:02 2008
@@ -89,12 +89,12 @@
 
 /// This is just a pair of values to associate a set of parameter attributes
 /// with a parameter index. 
-struct ParamAttrsWithIndex {
+struct FnAttributeWithIndex {
   Attributes Attrs; ///< The attributes that are set, or'd together.
   unsigned Index; ///< Index of the parameter for which the attributes apply.
   
-  static ParamAttrsWithIndex get(unsigned Idx, Attributes Attrs) {
-    ParamAttrsWithIndex P;
+  static FnAttributeWithIndex get(unsigned Idx, Attributes Attrs) {
+    FnAttributeWithIndex P;
     P.Index = Idx;
     P.Attrs = Attrs;
     return P;
@@ -124,7 +124,7 @@
   //===--------------------------------------------------------------------===//
   
   /// get - Return a ParamAttrs list with the specified parameter in it.
-  static PAListPtr get(const ParamAttrsWithIndex *Attr, unsigned NumAttrs);
+  static PAListPtr get(const FnAttributeWithIndex *Attr, unsigned NumAttrs);
   
   /// get - Return a ParamAttr list with the parameters specified by the
   /// consecutive random access iterator range.
@@ -199,9 +199,9 @@
   /// (including the function itself).
   unsigned getNumSlots() const;
   
-  /// getSlot - Return the ParamAttrsWithIndex at the specified slot.  This
+  /// getSlot - Return the FnAttributeWithIndex at the specified slot.  This
   /// holds a parameter number plus a set of attributes.
-  const ParamAttrsWithIndex &getSlot(unsigned Slot) const;
+  const FnAttributeWithIndex &getSlot(unsigned Slot) const;
   
 private:
   explicit PAListPtr(AttributeListImpl *L);

Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp?rev=56535&r1=56534&r2=56535&view=diff

==============================================================================
--- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp (original)
+++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp Tue Sep 23 19:55:02 2008
@@ -322,7 +322,7 @@
   
   SmallVector<uint64_t, 64> Record;
   
-  SmallVector<ParamAttrsWithIndex, 8> Attrs;
+  SmallVector<FnAttributeWithIndex, 8> Attrs;
   
   // Read all the records.
   while (1) {
@@ -357,7 +357,7 @@
 
       for (unsigned i = 0, e = Record.size(); i != e; i += 2) {
         if (Record[i+1] != ParamAttr::None)
-          Attrs.push_back(ParamAttrsWithIndex::get(Record[i], Record[i+1]));
+          Attrs.push_back(FnAttributeWithIndex::get(Record[i], Record[i+1]));
       }
 
       ParamAttrs.push_back(PAListPtr::get(Attrs.begin(), Attrs.end()));

Modified: llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=56535&r1=56534&r2=56535&view=diff

==============================================================================
--- llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp (original)
+++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Tue Sep 23 19:55:02 2008
@@ -119,7 +119,7 @@
   for (unsigned i = 0, e = Attrs.size(); i != e; ++i) {
     const PAListPtr &A = Attrs[i];
     for (unsigned i = 0, e = A.getNumSlots(); i != e; ++i) {
-      const ParamAttrsWithIndex &PAWI = A.getSlot(i);
+      const FnAttributeWithIndex &PAWI = A.getSlot(i);
       Record.push_back(PAWI.Index);
       Record.push_back(PAWI.Attrs);
     }

Modified: llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp?rev=56535&r1=56534&r2=56535&view=diff

==============================================================================
--- llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp (original)
+++ llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp Tue Sep 23 19:55:02 2008
@@ -434,8 +434,8 @@
     nl(Out);
     if (!PAL.isEmpty()) {
       Out << '{'; in(); nl(Out);
-      Out << "SmallVector<ParamAttrsWithIndex, 4> Attrs;"; nl(Out);
-      Out << "ParamAttrsWithIndex PAWI;"; nl(Out);
+      Out << "SmallVector<FnAttributeWithIndex, 4> Attrs;"; nl(Out);
+      Out << "FnAttributeWithIndex PAWI;"; nl(Out);
       for (unsigned i = 0; i < PAL.getNumSlots(); ++i) {
         uint16_t index = PAL.getSlot(i).Index;
         Attributes attrs = PAL.getSlot(i).Attrs;

Modified: llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp?rev=56535&r1=56534&r2=56535&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp Tue Sep 23 19:55:02 2008
@@ -504,12 +504,12 @@
   // 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
-  SmallVector<ParamAttrsWithIndex, 8> ParamAttrsVec;
+  SmallVector<FnAttributeWithIndex, 8> ParamAttrsVec;
   const PAListPtr &PAL = F->getParamAttrs();
 
   // Add any return attributes.
   if (Attributes attrs = PAL.getParamAttrs(0))
-    ParamAttrsVec.push_back(ParamAttrsWithIndex::get(0, attrs));
+    ParamAttrsVec.push_back(FnAttributeWithIndex::get(0, attrs));
 
   // First, determine the new argument list
   unsigned ArgIndex = 1;
@@ -526,7 +526,7 @@
       // Unchanged argument
       Params.push_back(I->getType());
       if (Attributes attrs = PAL.getParamAttrs(ArgIndex))
-        ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Params.size(), attrs));
+        ParamAttrsVec.push_back(FnAttributeWithIndex::get(Params.size(), attrs));
     } else if (I->use_empty()) {
       // Dead argument (which are always marked as promotable)
       ++NumArgumentsDead;
@@ -622,7 +622,7 @@
 
     // Add any return attributes.
     if (Attributes attrs = CallPAL.getParamAttrs(0))
-      ParamAttrsVec.push_back(ParamAttrsWithIndex::get(0, attrs));
+      ParamAttrsVec.push_back(FnAttributeWithIndex::get(0, attrs));
 
     // Loop over the operands, inserting GEP and loads in the caller as
     // appropriate.
@@ -634,7 +634,7 @@
         Args.push_back(*AI);          // Unmodified argument
 
         if (Attributes Attrs = CallPAL.getParamAttrs(ArgIndex))
-          ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Args.size(), Attrs));
+          ParamAttrsVec.push_back(FnAttributeWithIndex::get(Args.size(), Attrs));
 
       } else if (ByValArgsToTransform.count(I)) {
         // Emit a GEP and load for each element of the struct.
@@ -689,7 +689,7 @@
     for (; AI != CS.arg_end(); ++AI, ++ArgIndex) {
       Args.push_back(*AI);
       if (Attributes Attrs = CallPAL.getParamAttrs(ArgIndex))
-        ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Args.size(), Attrs));
+        ParamAttrsVec.push_back(FnAttributeWithIndex::get(Args.size(), Attrs));
     }
 
     Instruction *New;

Modified: llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp?rev=56535&r1=56534&r2=56535&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp Tue Sep 23 19:55:02 2008
@@ -226,7 +226,7 @@
     // Drop any attributes that were on the vararg arguments.
     PAListPtr PAL = CS.getParamAttrs();
     if (!PAL.isEmpty() && PAL.getSlot(PAL.getNumSlots() - 1).Index > NumArgs) {
-      SmallVector<ParamAttrsWithIndex, 8> ParamAttrsVec;
+      SmallVector<FnAttributeWithIndex, 8> ParamAttrsVec;
       for (unsigned i = 0; PAL.getSlot(i).Index <= NumArgs; ++i)
         ParamAttrsVec.push_back(PAL.getSlot(i));
       PAL = PAListPtr::get(ParamAttrsVec.begin(), ParamAttrsVec.end());
@@ -589,7 +589,7 @@
   std::vector<const Type*> Params;
 
   // Set up to build a new list of parameter attributes.
-  SmallVector<ParamAttrsWithIndex, 8> ParamAttrsVec;
+  SmallVector<FnAttributeWithIndex, 8> ParamAttrsVec;
   const PAListPtr &PAL = F->getParamAttrs();
 
   // The existing function return attributes.
@@ -661,7 +661,7 @@
            && "Return attributes no longer compatible?");
 
   if (RAttrs)
-    ParamAttrsVec.push_back(ParamAttrsWithIndex::get(0, RAttrs));
+    ParamAttrsVec.push_back(FnAttributeWithIndex::get(0, RAttrs));
 
   // Remember which arguments are still alive.
   SmallVector<bool, 10> ArgAlive(FTy->getNumParams(), false);
@@ -679,7 +679,7 @@
       // Get the original parameter attributes (skipping the first one, that is
       // for the return value.
       if (Attributes Attrs = PAL.getParamAttrs(i + 1))
-        ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Params.size(), Attrs));
+        ParamAttrsVec.push_back(FnAttributeWithIndex::get(Params.size(), Attrs));
     } else {
       ++NumArgumentsEliminated;
       DOUT << "DAE - Removing argument " << i << " (" << I->getNameStart()
@@ -734,7 +734,7 @@
     // Adjust in case the function was changed to return void.
     RAttrs &= ~ParamAttr::typeIncompatible(NF->getReturnType());
     if (RAttrs)
-      ParamAttrsVec.push_back(ParamAttrsWithIndex::get(0, RAttrs));
+      ParamAttrsVec.push_back(FnAttributeWithIndex::get(0, RAttrs));
 
     // Declare these outside of the loops, so we can reuse them for the second
     // loop, which loops the varargs.
@@ -747,7 +747,7 @@
         Args.push_back(*I);
         // Get original parameter attributes, but skip return attributes.
         if (Attributes Attrs = CallPAL.getParamAttrs(i + 1))
-          ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Args.size(), Attrs));
+          ParamAttrsVec.push_back(FnAttributeWithIndex::get(Args.size(), Attrs));
       }
 
     if (ExtraArgHack)
@@ -757,7 +757,7 @@
     for (CallSite::arg_iterator E = CS.arg_end(); I != E; ++I, ++i) {
       Args.push_back(*I);
       if (Attributes Attrs = CallPAL.getParamAttrs(i + 1))
-        ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Args.size(), Attrs));
+        ParamAttrsVec.push_back(FnAttributeWithIndex::get(Args.size(), Attrs));
     }
 
     // Reconstruct the ParamAttrsList based on the vector we constructed.

Modified: llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp?rev=56535&r1=56534&r2=56535&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp Tue Sep 23 19:55:02 2008
@@ -206,12 +206,12 @@
   std::vector<const Type*> Params;
 
   // ParamAttrs - Keep track of the parameter attributes for the arguments.
-  SmallVector<ParamAttrsWithIndex, 8> ParamAttrsVec;
+  SmallVector<FnAttributeWithIndex, 8> ParamAttrsVec;
   const PAListPtr &PAL = F->getParamAttrs();
 
   // Add any return attributes.
   if (Attributes attrs = PAL.getParamAttrs(0))
-    ParamAttrsVec.push_back(ParamAttrsWithIndex::get(0, attrs));
+    ParamAttrsVec.push_back(FnAttributeWithIndex::get(0, attrs));
 
   // Skip first argument.
   Function::arg_iterator I = F->arg_begin(), E = F->arg_end();
@@ -222,7 +222,7 @@
   while (I != E) {
     Params.push_back(I->getType());
     if (Attributes Attrs = PAL.getParamAttrs(ParamIndex))
-      ParamAttrsVec.push_back(ParamAttrsWithIndex::get(ParamIndex - 1, Attrs));
+      ParamAttrsVec.push_back(FnAttributeWithIndex::get(ParamIndex - 1, Attrs));
     ++I;
     ++ParamIndex;
   }
@@ -256,7 +256,7 @@
   SmallVector<Value*, 16> Args;
 
   // ParamAttrs - Keep track of the parameter attributes for the arguments.
-  SmallVector<ParamAttrsWithIndex, 8> ArgAttrsVec;
+  SmallVector<FnAttributeWithIndex, 8> ArgAttrsVec;
 
   while (!F->use_empty()) {
     CallSite CS = CallSite::get(*F->use_begin());
@@ -265,7 +265,7 @@
     const PAListPtr &PAL = F->getParamAttrs();
     // Add any return attributes.
     if (Attributes attrs = PAL.getParamAttrs(0))
-      ArgAttrsVec.push_back(ParamAttrsWithIndex::get(0, attrs));
+      ArgAttrsVec.push_back(FnAttributeWithIndex::get(0, attrs));
 
     // Copy arguments, however skip first one.
     CallSite::arg_iterator AI = CS.arg_begin(), AE = CS.arg_end();
@@ -277,7 +277,7 @@
     while (AI != AE) {
       Args.push_back(*AI); 
       if (Attributes Attrs = PAL.getParamAttrs(ParamIndex))
-        ArgAttrsVec.push_back(ParamAttrsWithIndex::get(ParamIndex - 1, Attrs));
+        ArgAttrsVec.push_back(FnAttributeWithIndex::get(ParamIndex - 1, Attrs));
       ++ParamIndex;
       ++AI;
     }

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

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp Tue Sep 23 19:55:02 2008
@@ -9189,7 +9189,7 @@
   // inserting cast instructions as necessary...
   std::vector<Value*> Args;
   Args.reserve(NumActualArgs);
-  SmallVector<ParamAttrsWithIndex, 8> attrVec;
+  SmallVector<FnAttributeWithIndex, 8> attrVec;
   attrVec.reserve(NumCommonArgs);
 
   // Get any return attributes.
@@ -9201,7 +9201,7 @@
 
   // Add the new return attributes.
   if (RAttrs)
-    attrVec.push_back(ParamAttrsWithIndex::get(0, RAttrs));
+    attrVec.push_back(FnAttributeWithIndex::get(0, RAttrs));
 
   AI = CS.arg_begin();
   for (unsigned i = 0; i != NumCommonArgs; ++i, ++AI) {
@@ -9217,7 +9217,7 @@
 
     // Add any parameter attributes.
     if (Attributes PAttrs = CallerPAL.getParamAttrs(i + 1))
-      attrVec.push_back(ParamAttrsWithIndex::get(i + 1, PAttrs));
+      attrVec.push_back(FnAttributeWithIndex::get(i + 1, PAttrs));
   }
 
   // If the function takes more arguments than the call was taking, add them
@@ -9247,7 +9247,7 @@
 
         // Add any parameter attributes.
         if (Attributes PAttrs = CallerPAL.getParamAttrs(i + 1))
-          attrVec.push_back(ParamAttrsWithIndex::get(i + 1, PAttrs));
+          attrVec.push_back(FnAttributeWithIndex::get(i + 1, PAttrs));
       }
     }
   }
@@ -9346,7 +9346,7 @@
       std::vector<Value*> NewArgs;
       NewArgs.reserve(unsigned(CS.arg_end()-CS.arg_begin())+1);
 
-      SmallVector<ParamAttrsWithIndex, 8> NewAttrs;
+      SmallVector<FnAttributeWithIndex, 8> NewAttrs;
       NewAttrs.reserve(Attrs.getNumSlots() + 1);
 
       // Insert the nest argument into the call argument list, which may
@@ -9354,7 +9354,7 @@
 
       // Add any function result attributes.
       if (Attributes Attr = Attrs.getParamAttrs(0))
-        NewAttrs.push_back(ParamAttrsWithIndex::get(0, Attr));
+        NewAttrs.push_back(FnAttributeWithIndex::get(0, Attr));
 
       {
         unsigned Idx = 1;
@@ -9366,7 +9366,7 @@
             if (NestVal->getType() != NestTy)
               NestVal = new BitCastInst(NestVal, NestTy, "nest", Caller);
             NewArgs.push_back(NestVal);
-            NewAttrs.push_back(ParamAttrsWithIndex::get(NestIdx, NestAttr));
+            NewAttrs.push_back(FnAttributeWithIndex::get(NestIdx, NestAttr));
           }
 
           if (I == E)
@@ -9376,7 +9376,7 @@
           NewArgs.push_back(*I);
           if (Attributes Attr = Attrs.getParamAttrs(Idx))
             NewAttrs.push_back
-              (ParamAttrsWithIndex::get(Idx + (Idx >= NestIdx), Attr));
+              (FnAttributeWithIndex::get(Idx + (Idx >= NestIdx), Attr));
 
           ++Idx, ++I;
         } while (1);

Modified: llvm/trunk/lib/VMCore/Attributes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Attributes.cpp?rev=56535&r1=56534&r2=56535&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/Attributes.cpp (original)
+++ llvm/trunk/lib/VMCore/Attributes.cpp Tue Sep 23 19:55:02 2008
@@ -84,9 +84,9 @@
   AttributeListImpl(const AttributeListImpl &); // Do not implement
   ~AttributeListImpl();                        // Private implementation
 public:
-  SmallVector<ParamAttrsWithIndex, 4> Attrs;
+  SmallVector<FnAttributeWithIndex, 4> Attrs;
   
-  AttributeListImpl(const ParamAttrsWithIndex *Attr, unsigned NumAttrs)
+  AttributeListImpl(const FnAttributeWithIndex *Attr, unsigned NumAttrs)
     : Attrs(Attr, Attr+NumAttrs) {
     RefCount = 0;
   }
@@ -97,7 +97,7 @@
   void Profile(FoldingSetNodeID &ID) const {
     Profile(ID, &Attrs[0], Attrs.size());
   }
-  static void Profile(FoldingSetNodeID &ID, const ParamAttrsWithIndex *Attr,
+  static void Profile(FoldingSetNodeID &ID, const FnAttributeWithIndex *Attr,
                       unsigned NumAttrs) {
     for (unsigned i = 0; i != NumAttrs; ++i)
       ID.AddInteger(uint64_t(Attr[i].Attrs) << 32 | unsigned(Attr[i].Index));
@@ -112,7 +112,7 @@
 }
 
 
-PAListPtr PAListPtr::get(const ParamAttrsWithIndex *Attrs, unsigned NumAttrs) {
+PAListPtr PAListPtr::get(const FnAttributeWithIndex *Attrs, unsigned NumAttrs) {
   // If there are no attributes then return a null ParamAttrsList pointer.
   if (NumAttrs == 0)
     return PAListPtr();
@@ -176,9 +176,9 @@
   return PAList ? PAList->Attrs.size() : 0;
 }
 
-/// getSlot - Return the ParamAttrsWithIndex at the specified slot.  This
+/// getSlot - Return the FnAttributeWithIndex at the specified slot.  This
 /// holds a parameter number plus a set of attributes.
-const ParamAttrsWithIndex &PAListPtr::getSlot(unsigned Slot) const {
+const FnAttributeWithIndex &PAListPtr::getSlot(unsigned Slot) const {
   assert(PAList && Slot < PAList->Attrs.size() && "Slot # out of range!");
   return PAList->Attrs[Slot];
 }
@@ -190,7 +190,7 @@
 Attributes PAListPtr::getParamAttrs(unsigned Idx) const {
   if (PAList == 0) return ParamAttr::None;
   
-  const SmallVector<ParamAttrsWithIndex, 4> &Attrs = PAList->Attrs;
+  const SmallVector<FnAttributeWithIndex, 4> &Attrs = PAList->Attrs;
   for (unsigned i = 0, e = Attrs.size(); i != e && Attrs[i].Index <= Idx; ++i)
     if (Attrs[i].Index == Idx)
       return Attrs[i].Attrs;
@@ -202,7 +202,7 @@
 bool PAListPtr::hasAttrSomewhere(Attributes Attr) const {
   if (PAList == 0) return false;
   
-  const SmallVector<ParamAttrsWithIndex, 4> &Attrs = PAList->Attrs;
+  const SmallVector<FnAttributeWithIndex, 4> &Attrs = PAList->Attrs;
   for (unsigned i = 0, e = Attrs.size(); i != e; ++i)
     if (Attrs[i].Attrs & Attr)
       return true;
@@ -225,11 +225,11 @@
   if (NewAttrs == OldAttrs)
     return *this;
   
-  SmallVector<ParamAttrsWithIndex, 8> NewAttrList;
+  SmallVector<FnAttributeWithIndex, 8> NewAttrList;
   if (PAList == 0)
-    NewAttrList.push_back(ParamAttrsWithIndex::get(Idx, Attrs));
+    NewAttrList.push_back(FnAttributeWithIndex::get(Idx, Attrs));
   else {
-    const SmallVector<ParamAttrsWithIndex, 4> &OldAttrList = PAList->Attrs;
+    const SmallVector<FnAttributeWithIndex, 4> &OldAttrList = PAList->Attrs;
     unsigned i = 0, e = OldAttrList.size();
     // Copy attributes for arguments before this one.
     for (; i != e && OldAttrList[i].Index < Idx; ++i)
@@ -241,7 +241,7 @@
       ++i;
     }
     
-    NewAttrList.push_back(ParamAttrsWithIndex::get(Idx, Attrs));
+    NewAttrList.push_back(FnAttributeWithIndex::get(Idx, Attrs));
     
     // Copy attributes for arguments after this one.
     NewAttrList.insert(NewAttrList.end(), 
@@ -264,8 +264,8 @@
   if (NewAttrs == OldAttrs)
     return *this;
 
-  SmallVector<ParamAttrsWithIndex, 8> NewAttrList;
-  const SmallVector<ParamAttrsWithIndex, 4> &OldAttrList = PAList->Attrs;
+  SmallVector<FnAttributeWithIndex, 8> NewAttrList;
+  const SmallVector<FnAttributeWithIndex, 4> &OldAttrList = PAList->Attrs;
   unsigned i = 0, e = OldAttrList.size();
   
   // Copy attributes for arguments before this one.
@@ -277,7 +277,7 @@
   Attrs = OldAttrList[i].Attrs & ~Attrs;
   ++i;
   if (Attrs)  // If any attributes left for this parameter, add them.
-    NewAttrList.push_back(ParamAttrsWithIndex::get(Idx, Attrs));
+    NewAttrList.push_back(FnAttributeWithIndex::get(Idx, Attrs));
   
   // Copy attributes for arguments after this one.
   NewAttrList.insert(NewAttrList.end(), 
@@ -289,7 +289,7 @@
 void PAListPtr::dump() const {
   cerr << "PAL[ ";
   for (unsigned i = 0; i < getNumSlots(); ++i) {
-    const ParamAttrsWithIndex &PAWI = getSlot(i);
+    const FnAttributeWithIndex &PAWI = getSlot(i);
     cerr << "{" << PAWI.Index << "," << PAWI.Attrs << "} ";
   }
   

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

==============================================================================
--- llvm/trunk/lib/VMCore/Function.cpp (original)
+++ llvm/trunk/lib/VMCore/Function.cpp Tue Sep 23 19:55:02 2008
@@ -365,7 +365,7 @@
   // Intrinsics cannot throw exceptions.
   Attr |= ParamAttr::NoUnwind;
 
-  ParamAttrsWithIndex PAWI = ParamAttrsWithIndex::get(0, Attr);
+  FnAttributeWithIndex PAWI = FnAttributeWithIndex::get(0, Attr);
   return PAListPtr::get(&PAWI, 1);
 }
 

Modified: llvm/trunk/lib/VMCore/Verifier.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Verifier.cpp?rev=56535&r1=56534&r2=56535&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/Verifier.cpp (original)
+++ llvm/trunk/lib/VMCore/Verifier.cpp Tue Sep 23 19:55:02 2008
@@ -455,7 +455,7 @@
   bool SawNest = false;
 
   for (unsigned i = 0, e = Attrs.getNumSlots(); i != e; ++i) {
-    const ParamAttrsWithIndex &Attr = Attrs.getSlot(i);
+    const FnAttributeWithIndex &Attr = Attrs.getSlot(i);
 
     const Type *Ty;
     if (Attr.Index == 0)




From dpatel at apple.com  Tue Sep 23 19:55:16 2008
From: dpatel at apple.com (Devang Patel)
Date: Wed, 24 Sep 2008 00:55:16 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r56536 -
	/llvm-gcc-4.2/trunk/gcc/llvm-types.cpp
Message-ID: <200809240055.m8O0tGBR003533@zion.cs.uiuc.edu>

Author: dpatel
Date: Tue Sep 23 19:55:16 2008
New Revision: 56536

URL: http://llvm.org/viewvc/llvm-project?rev=56536&view=rev
Log:
s/ParamAttrsWithIndex/FnAttributeWithIndex/g

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=56536&r1=56535&r2=56536&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-types.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-types.cpp Tue Sep 23 19:55:16 2008
@@ -1058,18 +1058,18 @@
   // Builtins are always prototyped, so this isn't one.
   ABIConverter.HandleReturnType(ReturnType, current_function_decl, false);
 
-  SmallVector<ParamAttrsWithIndex, 8> Attrs;
+  SmallVector<FnAttributeWithIndex, 8> Attrs;
 
   // Compute whether the result needs to be zext or sext'd.
   Attributes RAttributes = HandleArgumentExtension(ReturnType);
 
   if (RAttributes != ParamAttr::None)
-    Attrs.push_back(ParamAttrsWithIndex::get(0, RAttributes));
+    Attrs.push_back(FnAttributeWithIndex::get(0, RAttributes));
 
   // If this function returns via a shadow argument, the dest loc is passed
   // in as a pointer.  Mark that pointer as struct-ret and noalias.
   if (ABIConverter.isShadowReturn())
-    Attrs.push_back(ParamAttrsWithIndex::get(ArgTys.size(),
+    Attrs.push_back(FnAttributeWithIndex::get(ArgTys.size(),
                                     ParamAttr::StructRet | ParamAttr::NoAlias));
 
   std::vector<const Type*> ScalarArgs;
@@ -1077,7 +1077,7 @@
     // Pass the static chain as the first parameter.
     ABIConverter.HandleArgument(TREE_TYPE(static_chain), ScalarArgs);
     // Mark it as the chain argument.
-    Attrs.push_back(ParamAttrsWithIndex::get(ArgTys.size(),
+    Attrs.push_back(FnAttributeWithIndex::get(ArgTys.size(),
                                              ParamAttr::Nest));
   }
 
@@ -1093,7 +1093,7 @@
     Attributes |= HandleArgumentExtension(ArgTy);
 
     if (Attributes != ParamAttr::None)
-      Attrs.push_back(ParamAttrsWithIndex::get(ArgTys.size(), Attributes));
+      Attrs.push_back(FnAttributeWithIndex::get(ArgTys.size(), Attributes));
   }
 
   PAL = PAListPtr::get(Attrs.begin(), Attrs.end());
@@ -1118,7 +1118,7 @@
 #endif
 
   // Compute attributes for return type (and function attributes).
-  SmallVector<ParamAttrsWithIndex, 8> Attrs;
+  SmallVector<FnAttributeWithIndex, 8> Attrs;
   Attributes RAttributes = ParamAttr::None;
 
   int flags = flags_from_decl_or_type(decl ? decl : type);
@@ -1162,12 +1162,12 @@
   RAttributes |= HandleArgumentExtension(TREE_TYPE(type));
 
   if (RAttributes != ParamAttr::None)
-    Attrs.push_back(ParamAttrsWithIndex::get(0, RAttributes));
+    Attrs.push_back(FnAttributeWithIndex::get(0, RAttributes));
 
   // If this function returns via a shadow argument, the dest loc is passed
   // in as a pointer.  Mark that pointer as struct-ret and noalias.
   if (ABIConverter.isShadowReturn())
-    Attrs.push_back(ParamAttrsWithIndex::get(ArgTypes.size(),
+    Attrs.push_back(FnAttributeWithIndex::get(ArgTypes.size(),
                                     ParamAttr::StructRet | ParamAttr::NoAlias));
 
   std::vector<const Type*> ScalarArgs;
@@ -1175,7 +1175,7 @@
     // Pass the static chain as the first parameter.
     ABIConverter.HandleArgument(TREE_TYPE(static_chain), ScalarArgs);
     // Mark it as the chain argument.
-    Attrs.push_back(ParamAttrsWithIndex::get(ArgTypes.size(),
+    Attrs.push_back(FnAttributeWithIndex::get(ArgTypes.size(),
                                              ParamAttr::Nest));
   }
 
@@ -1240,7 +1240,7 @@
     
     if (Attributes != ParamAttr::None) {
       HasByVal |= Attributes & ParamAttr::ByVal;
-      Attrs.push_back(ParamAttrsWithIndex::get(ArgTypes.size(), Attributes));
+      Attrs.push_back(FnAttributeWithIndex::get(ArgTypes.size(), Attributes));
     }
       
     if (DeclArgs)




From dalej at apple.com  Tue Sep 23 20:07:17 2008
From: dalej at apple.com (Dale Johannesen)
Date: Wed, 24 Sep 2008 01:07:17 -0000
Subject: [llvm-commits] [llvm] r56539 - in /llvm/trunk:
 include/llvm/CodeGen/LiveInterval.h include/llvm/CodeGen/MachineOperand.h
 include/llvm/CodeGen/ScheduleDAG.h lib/CodeGen/AsmPrinter/AsmPrinter.cpp
 lib/CodeGen/LiveInterval.cpp lib/CodeGen/LiveIntervalAnalysis.cpp
 lib/CodeGen/MachineInstr.cpp lib/CodeGen/RegAllocLinearScan.cpp
 lib/CodeGen/SelectionDAG/ScheduleDAGEmit.cpp
 lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
 lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
 lib/CodeGen/SimpleRegisterCoalescing.cpp
Message-ID: <200809240107.m8O17Hj8003892@zion.cs.uiuc.edu>

Author: johannes
Date: Tue Sep 23 20:07:17 2008
New Revision: 56539

URL: http://llvm.org/viewvc/llvm-project?rev=56539&view=rev
Log:
Next round of earlyclobber handling.  Approach the
RA problem by expanding the live interval of an
earlyclobber def back one slot.  Remove
overlap-earlyclobber throughout.  Remove 
earlyclobber bits and their handling from
live internals.


Modified:
    llvm/trunk/include/llvm/CodeGen/LiveInterval.h
    llvm/trunk/include/llvm/CodeGen/MachineOperand.h
    llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h
    llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
    llvm/trunk/lib/CodeGen/LiveInterval.cpp
    llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp
    llvm/trunk/lib/CodeGen/MachineInstr.cpp
    llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGEmit.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.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=56539&r1=56538&r2=56539&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/LiveInterval.h (original)
+++ llvm/trunk/include/llvm/CodeGen/LiveInterval.h Tue Sep 23 20:07:17 2008
@@ -104,19 +104,13 @@
     unsigned reg;        // the register or stack slot of this interval
                          // if the top bits is set, it represents a stack slot.
     float weight;        // weight of this interval
-    // The next 3 fields pack into a single word (on most hosts).
-    // Logically the first two could be bitfields, but that's slower.
-    bool isEarlyClobber;  // marked earlyclobber in some asm
-    bool overlapsEarlyClobber; // input to asm that has an earlyclobber
     unsigned short preference; // preferred register for this interval
     Ranges ranges;       // the ranges in which this register is live
     VNInfoList valnos;   // value#'s
 
   public:
-    LiveInterval(unsigned Reg, float Weight, bool IsSS = false, 
-                 bool IsEarlyClobber = false, bool OverlapsEarlyClobber = false)
-      : reg(Reg), weight(Weight), isEarlyClobber(IsEarlyClobber), 
-        overlapsEarlyClobber(OverlapsEarlyClobber), preference(0)  {
+    LiveInterval(unsigned Reg, float Weight, bool IsSS = false)
+      : reg(Reg), weight(Weight), preference(0)  {
       if (IsSS)
         reg = reg | (1U << (sizeof(unsigned)*8-1));
     }

Modified: llvm/trunk/include/llvm/CodeGen/MachineOperand.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineOperand.h?rev=56539&r1=56538&r2=56539&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/MachineOperand.h (original)
+++ llvm/trunk/include/llvm/CodeGen/MachineOperand.h Tue Sep 23 20:07:17 2008
@@ -73,12 +73,6 @@
   /// model the GCC inline asm '&' constraint modifier.
   bool IsEarlyClobber : 1;
 
-  /// OverlapsEarlyClobber - True if this MO_Register operand is used as an
-  /// input to an inline asm that has the earlyclobber bit set on some other
-  /// operand.  Flag is not valid for any other case.   See gcc doc
-  /// for description of earlyclobber.
-  bool OverlapsEarlyClobber : 1;
-
   /// SubReg - Subregister number, only valid for MO_Register.  A value of 0
   /// indicates the MO_Register has no subReg.
   unsigned char SubReg;
@@ -188,11 +182,6 @@
     return IsEarlyClobber;
   }
 
-  bool overlapsEarlyClobber() const {
-    assert(isRegister() && "Wrong MachineOperand accessor");
-    return OverlapsEarlyClobber;
-  }
-
   /// getNextOperandForReg - Return the next MachineOperand in the function that
   /// uses or defines this register.
   MachineOperand *getNextOperandForReg() const {
@@ -243,11 +232,6 @@
     IsEarlyClobber = Val;
   }
 
-  void setOverlapsEarlyClobber(bool Val = true) {
-    assert(isRegister() && "Wrong MachineOperand accessor");
-    OverlapsEarlyClobber = Val;
-  }
-
   //===--------------------------------------------------------------------===//
   // Accessors for various operand types.
   //===--------------------------------------------------------------------===//
@@ -353,15 +337,13 @@
   static MachineOperand CreateReg(unsigned Reg, bool isDef, bool isImp = false,
                                   bool isKill = false, bool isDead = false,
                                   unsigned SubReg = 0,
-                                  bool isEarlyClobber = false,
-                                  bool overlapsEarlyClobber = false) {
+                                  bool isEarlyClobber = false) {
     MachineOperand Op(MachineOperand::MO_Register);
     Op.IsDef = isDef;
     Op.IsImp = isImp;
     Op.IsKill = isKill;
     Op.IsDead = isDead;
     Op.IsEarlyClobber = isEarlyClobber;
-    Op.OverlapsEarlyClobber = overlapsEarlyClobber;
     Op.Contents.Reg.RegNo = Reg;
     Op.Contents.Reg.Prev = 0;
     Op.Contents.Reg.Next = 0;
@@ -408,7 +390,6 @@
     IsKill   = MO.IsKill;
     IsDead   = MO.IsDead;
     IsEarlyClobber = MO.IsEarlyClobber;
-    OverlapsEarlyClobber = MO.OverlapsEarlyClobber;
     SubReg   = MO.SubReg;
     ParentMI = MO.ParentMI;
     Contents = MO.Contents;

Modified: llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h?rev=56539&r1=56538&r2=56539&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h (original)
+++ llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h Tue Sep 23 20:07:17 2008
@@ -361,9 +361,7 @@
 
     void AddOperand(MachineInstr *MI, SDValue Op, unsigned IIOpNum,
                     const TargetInstrDesc *II,
-                    DenseMap<SDValue, unsigned> &VRBaseMap,
-                    bool overlapsEarlyClobber = false);
-
+                    DenseMap<SDValue, unsigned> &VRBaseMap);
     void AddMemOperand(MachineInstr *MI, const MachineMemOperand &MO);
 
     void EmitCrossRCCopy(SUnit *SU, DenseMap<SUnit*, unsigned> &VRBaseMap);

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp?rev=56539&r1=56538&r2=56539&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp Tue Sep 23 20:07:17 2008
@@ -1325,8 +1325,7 @@
                                  false, false, false);
           else {
             AsmPrinter *AP = const_cast<AsmPrinter*>(this);
-            if ((OpFlags & 7) == 4 /*ADDR MODE*/ ||
-                (OpFlags & 7) == 7) /*ADDR MODE OVERLAPS EARLYCLOBBER*/ {
+            if ((OpFlags & 7) == 4) {
               Error = AP->PrintAsmMemoryOperand(MI, OpNo, AsmPrinterVariant,
                                                 Modifier[0] ? Modifier : 0);
             } else {

Modified: llvm/trunk/lib/CodeGen/LiveInterval.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveInterval.cpp?rev=56539&r1=56538&r2=56539&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/LiveInterval.cpp (original)
+++ llvm/trunk/lib/CodeGen/LiveInterval.cpp Tue Sep 23 20:07:17 2008
@@ -686,10 +686,6 @@
     OS << "%reg" << reg;
 
   OS << ',' << weight;
-  if (isEarlyClobber)
-    OS << ",earlyclobber";
-  if (overlapsEarlyClobber)
-    OS << ",overlapsearly";
 
   if (empty())
     OS << " EMPTY";

Modified: llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp?rev=56539&r1=56538&r2=56539&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp (original)
+++ llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Tue Sep 23 20:07:17 2008
@@ -348,6 +348,9 @@
   if (interval.empty()) {
     // Get the Idx of the defining instructions.
     unsigned defIndex = getDefIndex(MIIdx);
+    // Earlyclobbers move back one.
+    if (MO.isEarlyClobber())
+      defIndex = getUseIndex(MIIdx);
     VNInfo *ValNo;
     MachineInstr *CopyMI = NULL;
     unsigned SrcReg, DstReg;
@@ -431,6 +434,9 @@
       assert(interval.containsOneValue());
       unsigned DefIndex = getDefIndex(interval.getValNumInfo(0)->def);
       unsigned RedefIndex = getDefIndex(MIIdx);
+      // Earlyclobbers move back one.
+      if (MO.isEarlyClobber())
+        RedefIndex = getUseIndex(MIIdx);
 
       const LiveRange *OldLR = interval.getLiveRangeContaining(RedefIndex-1);
       VNInfo *OldValNo = OldLR->valno;
@@ -498,6 +504,9 @@
       // live until the end of the block.  We've already taken care of the
       // rest of the live range.
       unsigned defIndex = getDefIndex(MIIdx);
+      // Earlyclobbers move back one.
+      if (MO.isEarlyClobber())
+        defIndex = getUseIndex(MIIdx);
       
       VNInfo *ValNo;
       MachineInstr *CopyMI = NULL;
@@ -532,6 +541,9 @@
 
   unsigned baseIndex = MIIdx;
   unsigned start = getDefIndex(baseIndex);
+  // Earlyclobbers move back one.
+  if (MO.isEarlyClobber())
+    start = getUseIndex(MIIdx);
   unsigned end = start;
 
   // If it is not used after definition, it is considered dead at
@@ -539,7 +551,7 @@
   // [defSlot(def), defSlot(def)+1)
   if (MO.isDead()) {
     DOUT << " dead";
-    end = getDefIndex(start) + 1;
+    end = start + 1;
     goto exit;
   }
 
@@ -561,7 +573,7 @@
       // it. Hence its interval is:
       // [defSlot(def), defSlot(def)+1)
       DOUT << " dead";
-      end = getDefIndex(start) + 1;
+      end = start + 1;
       goto exit;
     }
     
@@ -572,7 +584,7 @@
   // instruction where we know it's dead is if it is live-in to the function
   // and never used.
   assert(!CopyMI && "physreg was not killed in defining block!");
-  end = getDefIndex(start) + 1;  // It's dead.
+  end = start + 1;
 
 exit:
   assert(start < end && "did not find end of interval?");
@@ -713,16 +725,6 @@
         // handle register defs - build intervals
         if (MO.isRegister() && MO.getReg() && MO.isDef()) {
           handleRegisterDef(MBB, MI, MIIndex, MO, i);
-          if (MO.isEarlyClobber()) {
-            LiveInterval &interval =  getOrCreateInterval(MO.getReg());
-            interval.isEarlyClobber = true;
-          }
-        }
-        if (MO.isRegister() && !MO.isDef() &&
-            MO.getReg() && TargetRegisterInfo::isVirtualRegister(MO.getReg()) &&
-            MO.overlapsEarlyClobber()) {
-          LiveInterval &interval = getOrCreateInterval(MO.getReg());
-          interval.overlapsEarlyClobber = true;
         }
       }
       

Modified: llvm/trunk/lib/CodeGen/MachineInstr.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineInstr.cpp?rev=56539&r1=56538&r2=56539&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/MachineInstr.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachineInstr.cpp Tue Sep 23 20:07:17 2008
@@ -109,7 +109,6 @@
   // register's use/def lists.
   if (isRegister()) {
     assert(!isEarlyClobber());
-    assert(!isEarlyClobber() && !overlapsEarlyClobber());
     setReg(Reg);
   } else {
     // Otherwise, change this to a register and set the reg#.
@@ -129,7 +128,6 @@
   IsKill = isKill;
   IsDead = isDead;
   IsEarlyClobber = false;
-  OverlapsEarlyClobber = false;
   SubReg = 0;
 }
 
@@ -185,14 +183,9 @@
         OS << "%mreg" << getReg();
     }
       
-    if (isDef() || isKill() || isDead() || isImplicit() || isEarlyClobber() ||
-        overlapsEarlyClobber()) {
+    if (isDef() || isKill() || isDead() || isImplicit() || isEarlyClobber()) {
       OS << "<";
       bool NeedComma = false;
-      if (overlapsEarlyClobber()) {
-        NeedComma = true;
-        OS << "overlapsearly";
-      }
       if (isImplicit()) {
         if (NeedComma) OS << ",";
         OS << (isDef() ? "imp-def" : "imp-use");

Modified: llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp?rev=56539&r1=56538&r2=56539&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp (original)
+++ llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp Tue Sep 23 20:07:17 2008
@@ -173,9 +173,6 @@
 
     void ComputeRelatedRegClasses();
 
-    bool noEarlyClobberConflict(LiveInterval *cur, unsigned RegNo);
-    unsigned findPhysReg(MachineOperand &MO);
-
     template <typename ItTy>
     void printIntervals(const char* const str, ItTy i, ItTy e) const {
       if (str) DOUT << str << " intervals:\n";
@@ -1007,90 +1004,6 @@
     unhandled_.push(added[i]);
 }
 
-/// findPhysReg - get the physical register, if any, assigned to this operand.
-/// This may be an original physical register, or the physical register which
-/// has been assigned to a virtual register.
-unsigned RALinScan::findPhysReg(MachineOperand &MO) {
-  unsigned PhysReg = MO.getReg();
-  if (PhysReg && TargetRegisterInfo::isVirtualRegister(PhysReg)) {
-    if (!vrm_->hasPhys(PhysReg))
-      return 0;
-    PhysReg = vrm_->getPhys(PhysReg);
-  }
-  return PhysReg;
-}
-
-/// noEarlyClobberConflict - see whether LiveInternal cur has a conflict with
-/// hard reg HReg because of earlyclobbers.  
-///
-/// Earlyclobber operands may not be assigned the same register as
-/// each other, or as earlyclobber-conflict operands (i.e. those that
-/// are non-earlyclobbered inputs to an asm that also has earlyclobbers).
-///
-/// Thus there are two cases to check for:
-/// 1.  cur->reg is an earlyclobber-conflict register and HReg is an
-/// earlyclobber register in some asm that also has cur->reg as an input.
-/// 2.  cur->reg is an earlyclobber register and HReg is an 
-/// earlyclobber-conflict input, or a different earlyclobber register,
-/// elsewhere in some asm.
-/// In both cases HReg can be assigned by the user, or assigned early in
-/// register allocation.
-/// 
-/// Dropping the distinction between earlyclobber and earlyclobber-conflict,
-/// keeping only one bit, looks promising, but two earlyclobber-conflict
-/// operands may be assigned the same register if they happen to contain the 
-/// same value, and that implementation would prevent this.
-///
-bool RALinScan::noEarlyClobberConflict(LiveInterval *cur, unsigned HReg) {
-  if (cur->overlapsEarlyClobber) {
-    for (MachineRegisterInfo::use_iterator I = mri_->use_begin(cur->reg),
-          E = mri_->use_end(); I!=E; ++I) {
-      MachineInstr *MI = I.getOperand().getParent();
-      if (MI->getOpcode()==TargetInstrInfo::INLINEASM) {
-        for (int i = MI->getNumOperands()-1; i>=0; --i) {
-          MachineOperand &MO = MI->getOperand(i);
-          if (MO.isRegister() && MO.isEarlyClobber()) {
-            unsigned PhysReg = findPhysReg(MO);
-            if (HReg==PhysReg) {
-              DOUT << "  earlyclobber conflict: " << 
-                  "%reg" << cur->reg << ", " << tri_->getName(HReg) << "\n\t";
-              return false;
-            }
-          }
-        }
-      }
-    }
-  }
-  if (cur->isEarlyClobber) {
-    for (MachineRegisterInfo::def_iterator I = mri_->def_begin(cur->reg),
-          E = mri_->def_end(); I!=E; ++I) {
-      MachineInstr *MI = I.getOperand().getParent();
-      if (MI->getOpcode()==TargetInstrInfo::INLINEASM) {
-        // make sure cur->reg is really clobbered in this instruction.
-        bool earlyClobberFound = false, overlapFound = false;
-        for (int i = MI->getNumOperands()-1; i>=0; --i) {
-          MachineOperand &MO = MI->getOperand(i);
-          if (MO.isRegister()) {
-            if ((MO.overlapsEarlyClobber() || MO.isEarlyClobber())) {
-              unsigned PhysReg = findPhysReg(MO);
-              if (HReg==PhysReg)
-                overlapFound = true;
-            }
-            if (MO.isEarlyClobber() && cur->reg==MO.getReg())
-              earlyClobberFound = true;
-          }
-        }
-        if (earlyClobberFound && overlapFound) {
-          DOUT << "  earlyclobber conflict: " << 
-                  "%reg" << cur->reg << ", " << tri_->getName(HReg) << "\n\t";
-          return false;
-        }
-      }
-    }
-  }
-  return true;
-}
-
 /// getFreePhysReg - return a free physical register for this virtual register
 /// interval if we have one, otherwise return 0.
 unsigned RALinScan::getFreePhysReg(LiveInterval *cur) {
@@ -1122,12 +1035,10 @@
   unsigned FreeRegInactiveCount = 0;
 
   // If copy coalescer has assigned a "preferred" register, check if it's
-  // available first.  Coalescer can create new earlyclobber interferences,
-  // so we need to check that.
+  // available first.
   if (cur->preference) {
     if (prt_->isRegAvail(cur->preference) && 
-        RC->contains(cur->preference) &&
-        noEarlyClobberConflict(cur, cur->preference)) {
+        RC->contains(cur->preference)) {
       DOUT << "\t\tassigned the preferred register: "
            << tri_->getName(cur->preference) << "\n";
       return cur->preference;
@@ -1141,8 +1052,7 @@
   TargetRegisterClass::iterator E = RC->allocation_order_end(*mf_);
   assert(I != E && "No allocatable register in this register class!");
   for (; I != E; ++I)
-    if (prt_->isRegAvail(*I) && 
-        noEarlyClobberConflict(cur, *I)) {
+    if (prt_->isRegAvail(*I)) {
       FreeReg = *I;
       if (FreeReg < inactiveCounts.size())
         FreeRegInactiveCount = inactiveCounts[FreeReg];
@@ -1162,8 +1072,7 @@
   for (; I != E; ++I) {
     unsigned Reg = *I;
     if (prt_->isRegAvail(Reg) && Reg < inactiveCounts.size() &&
-        FreeRegInactiveCount < inactiveCounts[Reg] &&
-        noEarlyClobberConflict(cur, *I)) {
+        FreeRegInactiveCount < inactiveCounts[Reg]) {
       FreeReg = Reg;
       FreeRegInactiveCount = inactiveCounts[Reg];
       if (FreeRegInactiveCount == MaxInactiveCount)

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGEmit.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGEmit.cpp Tue Sep 23 20:07:17 2008
@@ -231,8 +231,7 @@
 void ScheduleDAG::AddOperand(MachineInstr *MI, SDValue Op,
                              unsigned IIOpNum,
                              const TargetInstrDesc *II,
-                             DenseMap<SDValue, unsigned> &VRBaseMap,
-                             bool overlapsEarlyClobber) {
+                             DenseMap<SDValue, unsigned> &VRBaseMap) {
   if (Op.isMachineOpcode()) {
     // Note that this case is redundant with the final else block, but we
     // include it because it is the most common and it makes the logic
@@ -245,9 +244,7 @@
     const TargetInstrDesc &TID = MI->getDesc();
     bool isOptDef = IIOpNum < TID.getNumOperands() &&
       TID.OpInfo[IIOpNum].isOptionalDef();
-    MI->addOperand(MachineOperand::CreateReg(VReg, isOptDef, false, false,
-                                             false, 0, false,
-                                             overlapsEarlyClobber));
+    MI->addOperand(MachineOperand::CreateReg(VReg, isOptDef));
     
     // Verify that it is right.
     assert(TargetRegisterInfo::isVirtualRegister(VReg) && "Not a vreg?");
@@ -281,9 +278,7 @@
     const ConstantFP *CFP = F->getConstantFPValue();
     MI->addOperand(MachineOperand::CreateFPImm(CFP));
   } else if (RegisterSDNode *R = dyn_cast<RegisterSDNode>(Op)) {
-    MI->addOperand(MachineOperand::CreateReg(R->getReg(), false, false,
-                                             false, false, 0, false,
-                                             overlapsEarlyClobber));
+    MI->addOperand(MachineOperand::CreateReg(R->getReg(), false));
   } else if (GlobalAddressSDNode *TGA = dyn_cast<GlobalAddressSDNode>(Op)) {
     MI->addOperand(MachineOperand::CreateGA(TGA->getGlobal(),TGA->getOffset()));
   } else if (BasicBlockSDNode *BB = dyn_cast<BasicBlockSDNode>(Op)) {
@@ -319,9 +314,7 @@
            Op.getValueType() != MVT::Flag &&
            "Chain and flag operands should occur at end of operand list!");
     unsigned VReg = getVR(Op, VRBaseMap);
-    MI->addOperand(MachineOperand::CreateReg(VReg, false, false,
-                                             false, false, 0, false,
-                                             overlapsEarlyClobber));
+    MI->addOperand(MachineOperand::CreateReg(VReg, false));
     
     // Verify that it is right.  Note that the reg class of the physreg and the
     // vreg don't necessarily need to match, but the target copy insertion has
@@ -603,7 +596,6 @@
       
     // Add all of the operand registers to the instruction.
     for (unsigned i = 2; i != NumOps;) {
-      bool overlapsEarlyClobber = false;
       unsigned Flags =
         cast<ConstantSDNode>(Node->getOperand(i))->getZExtValue();
       unsigned NumVals = Flags >> 3;
@@ -626,18 +618,13 @@
                                                    false, 0, true));
         }
         break;
-      case 7:  // Addressing mode overlapping earlyclobber.
-      case 5:  // Use of register overlapping earlyclobber.
-        overlapsEarlyClobber = true;
-        // fall through
       case 1:  // Use of register.
       case 3:  // Immediate.
       case 4:  // Addressing mode.
         // The addressing mode has been selected, just add all of the
         // operands to the machine instruction.
         for (; NumVals; --NumVals, ++i)
-          AddOperand(MI, Node->getOperand(i), 0, 0, VRBaseMap, 
-                     overlapsEarlyClobber);
+          AddOperand(MI, Node->getOperand(i), 0, 0, VRBaseMap);
         break;
       }
     }

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Tue Sep 23 20:07:17 2008
@@ -4554,7 +4554,7 @@
     // If this is an early clobber or tied register, our regalloc doesn't know
     // how to maintain the constraint.  If it isn't, go ahead and create vreg
     // and let the regalloc do the right thing.
-    if (!OpInfo.hasMatchingInput && !OpInfo.isEarlyClobber &&
+    if (!OpInfo.hasMatchingInput && !OpInfo.isEarlyClobber && 
         // If there is some other early clobber and this is an input register,
         // then we are forced to pre-allocate the input reg so it doesn't
         // conflict with the earlyclobber.
@@ -4843,10 +4843,8 @@
         assert(OpInfo.isIndirect && "Memory output must be indirect operand");
 
         // Add information to the INLINEASM node to know about this output.
-        unsigned ResOpType = SawEarlyClobber ? 
-                                  7 /* MEM OVERLAPS EARLYCLOBBER */ :
-                                  4/*MEM*/;
-        AsmNodeOperands.push_back(DAG.getTargetConstant(ResOpType | (1<<3), 
+        unsigned ResOpType = 4/*MEM*/ | (1<<3);
+        AsmNodeOperands.push_back(DAG.getTargetConstant(ResOpType,
                                                         TLI.getPointerTy()));
         AsmNodeOperands.push_back(OpInfo.CallOperand);
         break;
@@ -4899,8 +4897,7 @@
             cast<ConstantSDNode>(AsmNodeOperands[CurOp])->getZExtValue();
           assert(((NumOps & 7) == 2 /*REGDEF*/ ||
                   (NumOps & 7) == 6 /*EARLYCLOBBER REGDEF*/ ||
-                  (NumOps & 7) == 4 /*MEM*/ ||
-                  (NumOps & 7) == 7 /*MEM OVERLAPS EARLYCLOBBER*/) &&
+                  (NumOps & 7) == 4 /*MEM*/) &&
                  "Skipped past definitions?");
           CurOp += (NumOps>>3)+1;
         }
@@ -4922,14 +4919,10 @@
         
           // Use the produced MatchedRegs object to 
           MatchedRegs.getCopyToRegs(InOperandVal, DAG, Chain, &Flag);
-          MatchedRegs.AddInlineAsmOperands(SawEarlyClobber ? 
-                                           1 /*REGUSE*/ :
-                                           5 /*REGUSE OVERLAPS EARLYCLOBBER*/, 
-                                           DAG, AsmNodeOperands);
+          MatchedRegs.AddInlineAsmOperands(1 /*REGUSE*/, DAG, AsmNodeOperands);
           break;
         } else {
-          assert(((NumOps & 7) == 7/*MEM OVERLAPS EARLYCLOBBER */ ||
-                  (NumOps & 7) == 4) && "Unknown matching constraint!");
+          assert(((NumOps & 7) == 4) && "Unknown matching constraint!");
           assert((NumOps >> 3) == 1 && "Unexpected number of operands"); 
           // Add information to the INLINEASM node to know about this input.
           AsmNodeOperands.push_back(DAG.getTargetConstant(NumOps,
@@ -4964,10 +4957,8 @@
                "Memory operands expect pointer values");
                
         // Add information to the INLINEASM node to know about this input.
-        unsigned ResOpType = SawEarlyClobber ? 
-                                7 /* MEM OVERLAPS EARLYCLOBBER */ : 
-                                4/*MEM*/;
-        AsmNodeOperands.push_back(DAG.getTargetConstant(ResOpType | (1<<3),
+        unsigned ResOpType = 4/*MEM*/ | (1<<3);
+        AsmNodeOperands.push_back(DAG.getTargetConstant(ResOpType,
                                                         TLI.getPointerTy()));
         AsmNodeOperands.push_back(InOperandVal);
         break;
@@ -4985,10 +4976,8 @@
 
       OpInfo.AssignedRegs.getCopyToRegs(InOperandVal, DAG, Chain, &Flag);
       
-      OpInfo.AssignedRegs.AddInlineAsmOperands(SawEarlyClobber ?
-                                           5 /*REGUSE OVERLAPS EARLYCLOBBER*/:
-                                           1/*REGUSE*/,
-                                           DAG, AsmNodeOperands);
+      OpInfo.AssignedRegs.AddInlineAsmOperands(1/*REGUSE*/,
+                                               DAG, AsmNodeOperands);
       break;
     }
     case InlineAsm::isClobber: {

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Tue Sep 23 20:07:17 2008
@@ -1115,8 +1115,7 @@
   
   while (i != e) {
     unsigned Flags = cast<ConstantSDNode>(InOps[i])->getZExtValue();
-    if ((Flags & 7) != 4 /*MEM*/ &&
-        (Flags & 7) != 7 /*MEM OVERLAPS EARLYCLOBBER*/) {
+    if ((Flags & 7) != 4 /*MEM*/) {
       // Just skip over this operand, copying the operands verbatim.
       Ops.insert(Ops.end(), InOps.begin()+i, InOps.begin()+i+(Flags >> 3) + 1);
       i += (Flags >> 3) + 1;
@@ -1131,7 +1130,7 @@
       
       // Add this to the output node.
       MVT IntPtrTy = CurDAG->getTargetLoweringInfo().getPointerTy();
-      Ops.push_back(CurDAG->getTargetConstant((Flags & 7) | (SelOps.size()<< 3),
+      Ops.push_back(CurDAG->getTargetConstant(4/*MEM*/ | (SelOps.size()<< 3),
                                               IntPtrTy));
       Ops.insert(Ops.end(), SelOps.begin(), SelOps.end());
       i += 2;

Modified: llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp?rev=56539&r1=56538&r2=56539&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp (original)
+++ llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp Tue Sep 23 20:07:17 2008
@@ -1206,14 +1206,6 @@
   DOUT << " and "; DstInt.print(DOUT, tri_);
   DOUT << ": ";
 
-  // If one interval is earlyclobber and the other is overlaps-earlyclobber,
-  // we cannot coalesce them.
-  if ((SrcInt.isEarlyClobber && DstInt.overlapsEarlyClobber) ||
-      (DstInt.isEarlyClobber && SrcInt.overlapsEarlyClobber)) {
-    DOUT << "\t\tCannot join due to earlyclobber.";
-    return false;
-  }
-
   // Check if it is necessary to propagate "isDead" property.
   if (!isExtSubReg && !isInsSubReg) {
     MachineOperand *mopd = CopyMI->findRegisterDefOperand(DstReg, false);
@@ -1374,10 +1366,6 @@
   if (TargetRegisterInfo::isVirtualRegister(DstReg))
     RemoveUnnecessaryKills(DstReg, *ResDstInt);
 
-  // Merge the earlyclobber bits.
-  ResDstInt->isEarlyClobber |= ResSrcInt->isEarlyClobber;
-  ResDstInt->overlapsEarlyClobber |= ResSrcInt->overlapsEarlyClobber;
-
   if (isInsSubReg)
     // Avoid:
     // r1024 = op




From ofv at wanadoo.es  Tue Sep 23 20:54:06 2008
From: ofv at wanadoo.es (Oscar Fuentes)
Date: Wed, 24 Sep 2008 01:54:06 -0000
Subject: [llvm-commits] [llvm] r56540 -
	/llvm/trunk/cmake/modules/LLVMConfig.cmake
Message-ID: <200809240154.m8O1s6Tu005334@zion.cs.uiuc.edu>

Author: ofv
Date: Tue Sep 23 20:54:03 2008
New Revision: 56540

URL: http://llvm.org/viewvc/llvm-project?rev=56540&view=rev
Log:
CMake: Removed unnecessary messages from msvc_llvm_config macro.

Modified:
    llvm/trunk/cmake/modules/LLVMConfig.cmake

Modified: llvm/trunk/cmake/modules/LLVMConfig.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/LLVMConfig.cmake?rev=56540&r1=56539&r2=56540&view=diff

==============================================================================
--- llvm/trunk/cmake/modules/LLVMConfig.cmake (original)
+++ llvm/trunk/cmake/modules/LLVMConfig.cmake Tue Sep 23 20:54:03 2008
@@ -9,9 +9,7 @@
 
 macro(msvc_llvm_config executable link_components)
   foreach(c ${link_components})
-    message(STATUS ${c})
     if( c STREQUAL "jit" )
-      message(STATUS "linking jit")
       set_target_properties(${executable}
 	PROPERTIES
 	LINK_FLAGS "/INCLUDE:_X86TargetMachineModule")




From ofv at wanadoo.es  Tue Sep 23 20:58:13 2008
From: ofv at wanadoo.es (Oscar Fuentes)
Date: Wed, 24 Sep 2008 01:58:13 -0000
Subject: [llvm-commits] [llvm] r56541 - in /llvm/trunk:
 lib/VMCore/CMakeLists.txt tools/llvmc2/CMakeLists.txt
Message-ID: <200809240158.m8O1wDcZ005439@zion.cs.uiuc.edu>

Author: ofv
Date: Tue Sep 23 20:58:12 2008
New Revision: 56541

URL: http://llvm.org/viewvc/llvm-project?rev=56541&view=rev
Log:
CMake: Lists of source files updated. Removed bogus dependency from
lib/VMCore/CMakeLists.txt

Modified:
    llvm/trunk/lib/VMCore/CMakeLists.txt
    llvm/trunk/tools/llvmc2/CMakeLists.txt

Modified: llvm/trunk/lib/VMCore/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/CMakeLists.txt?rev=56541&r1=56540&r2=56541&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/CMakeLists.txt (original)
+++ llvm/trunk/lib/VMCore/CMakeLists.txt Tue Sep 23 20:58:12 2008
@@ -1,5 +1,6 @@
 add_llvm_library(LLVMVMCore
   AsmWriter.cpp
+  Attributes.cpp
   AutoUpgrade.cpp
   BasicBlock.cpp
   ConstantFold.cpp
@@ -17,7 +18,6 @@
   Mangler.cpp
   Module.cpp
   ModuleProvider.cpp
-  ParameterAttributes.cpp
   Pass.cpp
   PassManager.cpp
   Type.cpp
@@ -28,5 +28,3 @@
   ValueTypes.cpp
   Verifier.cpp
   )
-
-add_dependencies( LLVMVMCore ${llvm_builded_incs_dir}/Intrinsics.gen )
\ No newline at end of file

Modified: llvm/trunk/tools/llvmc2/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/CMakeLists.txt?rev=56541&r1=56540&r2=56541&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvmc2/CMakeLists.txt Tue Sep 23 20:58:12 2008
@@ -26,6 +26,7 @@
   Action.cpp
   AutoGenerated.cpp
   CompilationGraph.cpp
+  Plugin.cpp
   llvmc.cpp
   )
 




From echristo at apple.com  Tue Sep 23 23:55:49 2008
From: echristo at apple.com (Eric Christopher)
Date: Wed, 24 Sep 2008 04:55:49 -0000
Subject: [llvm-commits] [llvm] r56545 - in /llvm/trunk/lib/AsmParser:
 llvmAsmParser.cpp.cvs llvmAsmParser.h.cvs llvmAsmParser.y
 llvmAsmParser.y.cvs
Message-ID: <200809240455.m8O4tob3010734@zion.cs.uiuc.edu>

Author: echristo
Date: Tue Sep 23 23:55:49 2008
New Revision: 56545

URL: http://llvm.org/viewvc/llvm-project?rev=56545&view=rev
Log:
Fix fallout from revision r56535.

Modified:
    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

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

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs Tue Sep 23 23:55:49 2008
@@ -400,7 +400,7 @@
 
 
 /* Copy the first part of user declarations.  */
-#line 14 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 14 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
 
 #include "ParserInternals.h"
 #include "llvm/CallingConv.h"
@@ -423,13 +423,13 @@
 // 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
 // an error situation. So, whenever we want an error to occur, the GenerateError
-// function (see bottom of file) sets TriggerError. Then, at the end of each 
-// production in the grammer we use CHECK_FOR_ERROR which will invoke YYERROR 
-// (a goto) to put YACC in error state. Furthermore, several calls to 
+// function (see bottom of file) sets TriggerError. Then, at the end of each
+// production in the grammer we use CHECK_FOR_ERROR which will invoke YYERROR
+// (a goto) to put YACC in error state. Furthermore, several calls to
 // GenerateError are made from inside productions and they must simulate the
 // previous exception behavior by exiting the production immediately. We have
 // replaced these with the GEN_ERROR macro which calls GeneratError and then
-// immediately invokes YYERROR. This would be so much cleaner if it was a 
+// immediately invokes YYERROR. This would be so much cleaner if it was a
 // recursive descent parser.
 static bool TriggerError = false;
 #define CHECK_FOR_ERROR { if (TriggerError) { TriggerError = false; YYABORT; } }
@@ -462,7 +462,7 @@
 //
 typedef std::vector<Value *> ValueList;           // Numbered defs
 
-static void 
+static void
 ResolveDefinitions(ValueList &LateResolvers, ValueList *FutureLateResolvers=0);
 
 static struct PerModuleInfo {
@@ -541,7 +541,7 @@
     if (!Ty->isAbstract())
       return false;
     // Traverse the type looking for abstract types. If it isn't abstract then
-    // we don't need to traverse that leg of the type. 
+    // we don't need to traverse that leg of the type.
     std::vector<const Type*> WorkList, SeenList;
     WorkList.push_back(Ty);
     while (!WorkList.empty()) {
@@ -559,7 +559,7 @@
       } else if (const SequentialType* SeqTy = dyn_cast<SequentialType>(Ty)) {
         const Type* TheTy = SeqTy->getElementType();
         if (TheTy->isAbstract() && TheTy != Ty) {
-          std::vector<const Type*>::iterator I = SeenList.begin(), 
+          std::vector<const Type*>::iterator I = SeenList.begin(),
                                              E = SeenList.end();
           for ( ; I != E; ++I)
             if (*I == TheTy)
@@ -571,7 +571,7 @@
         for (unsigned i = 0; i < StrTy->getNumElements(); ++i) {
           const Type* TheTy = StrTy->getElementType(i);
           if (TheTy->isAbstract() && TheTy != Ty) {
-            std::vector<const Type*>::iterator I = SeenList.begin(), 
+            std::vector<const Type*>::iterator I = SeenList.begin(),
                                                E = SeenList.end();
             for ( ; I != E; ++I)
               if (*I == TheTy)
@@ -648,14 +648,14 @@
 
   // In the case of function values, we have to allow for the forward reference
   // of basic blocks, which are included in the numbering. Consequently, we keep
-  // track of the next insertion location with NextValNum. When a BB gets 
+  // track of the next insertion location with NextValNum. When a BB gets
   // inserted, it could change the size of the CurFun.Values vector.
   if (&ValueTab == &CurFun.Values) {
     if (ValueTab.size() <= CurFun.NextValNum)
       ValueTab.resize(CurFun.NextValNum+1);
     ValueTab[CurFun.NextValNum++] = V;
     return CurFun.NextValNum-1;
-  } 
+  }
   // For all other lists, its okay to just tack it on the back of the vector.
   ValueTab.push_back(V);
   return ValueTab.size()-1;
@@ -719,47 +719,47 @@
   switch (D.Type) {
   case ValID::LocalID: {                 // Is it a numbered definition?
     // Check that the number is within bounds.
-    if (D.Num >= CurFun.Values.size()) 
+    if (D.Num >= CurFun.Values.size())
       return 0;
     Value *Result = CurFun.Values[D.Num];
     if (Ty != Result->getType()) {
       GenerateError("Numbered value (%" + utostr(D.Num) + ") of type '" +
-                    Result->getType()->getDescription() + "' does not match " 
+                    Result->getType()->getDescription() + "' does not match "
                     "expected type, '" + Ty->getDescription() + "'");
       return 0;
     }
     return Result;
   }
   case ValID::GlobalID: {                 // Is it a numbered definition?
-    if (D.Num >= CurModule.Values.size()) 
+    if (D.Num >= CurModule.Values.size())
       return 0;
     Value *Result = CurModule.Values[D.Num];
     if (Ty != Result->getType()) {
       GenerateError("Numbered value (@" + utostr(D.Num) + ") of type '" +
-                    Result->getType()->getDescription() + "' does not match " 
+                    Result->getType()->getDescription() + "' does not match "
                     "expected type, '" + Ty->getDescription() + "'");
       return 0;
     }
     return Result;
   }
-    
+
   case ValID::LocalName: {                // Is it a named definition?
-    if (!inFunctionScope()) 
+    if (!inFunctionScope())
       return 0;
     ValueSymbolTable &SymTab = CurFun.CurrentFunction->getValueSymbolTable();
     Value *N = SymTab.lookup(D.getName());
-    if (N == 0) 
+    if (N == 0)
       return 0;
     if (N->getType() != Ty)
       return 0;
-    
+
     D.destroy();  // Free old strdup'd memory...
     return N;
   }
   case ValID::GlobalName: {                // Is it a named definition?
     ValueSymbolTable &SymTab = CurModule.CurrentModule->getValueSymbolTable();
     Value *N = SymTab.lookup(D.getName());
-    if (N == 0) 
+    if (N == 0)
       return 0;
     if (N->getType() != Ty)
       return 0;
@@ -802,20 +802,20 @@
                     Ty->getDescription() + "'");
       return 0;
     }
-      
+
     {
       APSInt Tmp = *D.ConstPoolInt;
       Tmp.extOrTrunc(Ty->getPrimitiveSizeInBits());
       return ConstantInt::get(Tmp);
     }
-      
+
   case ValID::ConstFPVal:        // Is it a floating point const pool reference?
     if (!Ty->isFloatingPoint() ||
         !ConstantFP::isValueValidForType(Ty, *D.ConstPoolFP)) {
       GenerateError("FP constant invalid for type");
       return 0;
     }
-    // Lexer has no type info, so builds all float and double FP constants 
+    // Lexer has no type info, so builds all float and double FP constants
     // as double.  Fix this here.  Long double does not need this.
     if (&D.ConstPoolFP->getSemantics() == &APFloat::IEEEdouble &&
         Ty==Type::FloatTy)
@@ -834,7 +834,7 @@
 
   case ValID::ConstZeroVal:      // Is it a zero value?
     return Constant::getNullValue(Ty);
-    
+
   case ValID::ConstantVal:       // Fully resolved constant?
     if (D.ConstantValue->getType() != Ty) {
       GenerateError("Constant expression type different from required type");
@@ -909,7 +909,7 @@
   default:
    V = new Argument(Ty);
   }
-  
+
   // 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,
@@ -945,7 +945,7 @@
     // Erase the forward ref from the map as its no longer "forward"
     CurFun.BBForwardRefs.erase(ID);
 
-    // The key has been removed from the map but so we don't want to leave 
+    // The key has been removed from the map but so we don't want to leave
     // strdup'd memory around so destroy it too.
     Tmp.destroy();
 
@@ -954,8 +954,8 @@
       assert(ID.Num == CurFun.NextValNum && "Invalid new block number");
       InsertValue(BB);
     }
-  } else { 
-    // We haven't seen this BB before and its first mention is a definition. 
+  } else {
+    // We haven't seen this BB before and its first mention is a definition.
     // Just create it and return it.
     std::string Name (ID.Type == ValID::LocalName ? ID.getName() : "");
     BB = BasicBlock::Create(Name, CurFun.CurrentFunction);
@@ -970,7 +970,7 @@
 }
 
 /// getBBVal - get an existing BB value or create a forward reference for it.
-/// 
+///
 static BasicBlock *getBBVal(const ValID &ID) {
   assert(inFunctionScope() && "Can't get basic block at global scope!");
 
@@ -994,8 +994,8 @@
       if (CurFun.Values[ID.Num]->getType()->getTypeID() == Type::LabelTyID)
         BB = cast<BasicBlock>(CurFun.Values[ID.Num]);
       else
-        GenerateError("Reference to label '%" + utostr(ID.Num) + 
-          "' is actually of type '"+ 
+        GenerateError("Reference to label '%" + utostr(ID.Num) +
+          "' is actually of type '"+
           CurFun.Values[ID.Num]->getType()->getDescription() + "'");
     }
   } else {
@@ -1038,7 +1038,7 @@
 // time (forward branches, phi functions for loops, etc...) resolve the
 // defs now...
 //
-static void 
+static void
 ResolveDefinitions(ValueList &LateResolvers, ValueList *FutureLateResolvers) {
   // Loop over LateResolveDefs fixing up stuff that couldn't be resolved
   while (!LateResolvers.empty()) {
@@ -1088,7 +1088,7 @@
   ValID D;
   if (Name)
     D = ValID::createLocalName(*Name);
-  else      
+  else
     D = ValID::createLocalID(CurModule.Types.size());
 
   std::map<ValID, PATypeHolder>::iterator I =
@@ -1211,7 +1211,7 @@
 static bool setTypeName(const Type *T, std::string *NameStr) {
   assert(!inFunctionScope() && "Can't give types function-local names!");
   if (NameStr == 0) return false;
- 
+
   std::string Name(*NameStr);      // Copy string
   delete NameStr;                  // Free old string
 
@@ -1294,7 +1294,7 @@
   // If Ty isn't abstract, or if there are no up-references in it, then there is
   // nothing to resolve here.
   if (!ty->isAbstract() || UpRefs.empty()) return ty;
-  
+
   PATypeHolder Ty(ty);
   UR_OUT("Type '" << Ty->getDescription() <<
          "' newly formed.  Resolving upreferences.\n" <<
@@ -1377,7 +1377,7 @@
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 970 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 970 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
@@ -3657,152 +3657,152 @@
   switch (yyn)
     {
         case 29:
-#line 1147 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1147 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_EQ; ;}
     break;
 
   case 30:
-#line 1147 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1147 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_NE; ;}
     break;
 
   case 31:
-#line 1148 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1148 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SLT; ;}
     break;
 
   case 32:
-#line 1148 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1148 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SGT; ;}
     break;
 
   case 33:
-#line 1149 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1149 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SLE; ;}
     break;
 
   case 34:
-#line 1149 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1149 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SGE; ;}
     break;
 
   case 35:
-#line 1150 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1150 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_ULT; ;}
     break;
 
   case 36:
-#line 1150 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1150 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_UGT; ;}
     break;
 
   case 37:
-#line 1151 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1151 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_ULE; ;}
     break;
 
   case 38:
-#line 1151 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1151 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_UGE; ;}
     break;
 
   case 39:
-#line 1155 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1155 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OEQ; ;}
     break;
 
   case 40:
-#line 1155 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1155 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ONE; ;}
     break;
 
   case 41:
-#line 1156 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1156 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OLT; ;}
     break;
 
   case 42:
-#line 1156 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1156 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OGT; ;}
     break;
 
   case 43:
-#line 1157 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1157 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OLE; ;}
     break;
 
   case 44:
-#line 1157 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1157 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OGE; ;}
     break;
 
   case 45:
-#line 1158 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1158 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ORD; ;}
     break;
 
   case 46:
-#line 1158 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1158 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UNO; ;}
     break;
 
   case 47:
-#line 1159 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1159 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UEQ; ;}
     break;
 
   case 48:
-#line 1159 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1159 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UNE; ;}
     break;
 
   case 49:
-#line 1160 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1160 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ULT; ;}
     break;
 
   case 50:
-#line 1160 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1160 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UGT; ;}
     break;
 
   case 51:
-#line 1161 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1161 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ULE; ;}
     break;
 
   case 52:
-#line 1161 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1161 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UGE; ;}
     break;
 
   case 53:
-#line 1162 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1162 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_TRUE; ;}
     break;
 
   case 54:
-#line 1163 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1163 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_FALSE; ;}
     break;
 
   case 65:
-#line 1172 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1172 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 66:
-#line 1174 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1174 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal)=(yyvsp[(3) - (4)].UInt64Val); ;}
     break;
 
   case 67:
-#line 1175 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1175 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal)=0; ;}
     break;
 
   case 68:
-#line 1179 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1179 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal);
     CHECK_FOR_ERROR
@@ -3810,7 +3810,7 @@
     break;
 
   case 69:
-#line 1183 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1183 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
@@ -3818,7 +3818,7 @@
     break;
 
   case 70:
-#line 1188 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1188 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[(1) - (2)].UIntVal);
   CHECK_FOR_ERROR
@@ -3826,7 +3826,7 @@
     break;
 
   case 74:
-#line 1197 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1197 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
@@ -3834,7 +3834,7 @@
     break;
 
   case 75:
-#line 1202 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1202 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal);
     CHECK_FOR_ERROR
@@ -3842,162 +3842,162 @@
     break;
 
   case 76:
-#line 1208 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1208 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 77:
-#line 1209 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1209 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 78:
-#line 1210 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1210 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 79:
-#line 1211 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1211 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
     break;
 
   case 80:
-#line 1212 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1212 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 81:
-#line 1213 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1213 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::CommonLinkage; ;}
     break;
 
   case 82:
-#line 1217 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1217 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 83:
-#line 1218 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1218 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 84:
-#line 1219 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1219 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 85:
-#line 1223 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1223 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::DefaultVisibility;   ;}
     break;
 
   case 86:
-#line 1224 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1224 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::DefaultVisibility;   ;}
     break;
 
   case 87:
-#line 1225 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1225 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::HiddenVisibility;    ;}
     break;
 
   case 88:
-#line 1226 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1226 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::ProtectedVisibility; ;}
     break;
 
   case 89:
-#line 1230 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1230 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 90:
-#line 1231 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1231 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 91:
-#line 1232 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1232 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 92:
-#line 1236 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1236 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 93:
-#line 1237 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1237 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 94:
-#line 1238 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1238 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 95:
-#line 1239 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1239 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 96:
-#line 1240 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1240 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 97:
-#line 1244 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1244 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 98:
-#line 1245 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1245 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 99:
-#line 1246 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1246 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 100:
-#line 1249 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1249 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 101:
-#line 1250 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1250 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 102:
-#line 1251 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1251 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Fast; ;}
     break;
 
   case 103:
-#line 1252 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1252 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Cold; ;}
     break;
 
   case 104:
-#line 1253 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1253 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_StdCall; ;}
     break;
 
   case 105:
-#line 1254 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1254 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_FastCall; ;}
     break;
 
   case 106:
-#line 1255 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1255 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_SSECall; ;}
     break;
 
   case 107:
-#line 1256 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1256 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                    if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val))
                      GEN_ERROR("Calling conv too large");
@@ -4007,181 +4007,181 @@
     break;
 
   case 108:
-#line 1263 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1263 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ZExt;      ;}
     break;
 
   case 109:
-#line 1264 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1264 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ZExt;      ;}
     break;
 
   case 110:
-#line 1265 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1265 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::SExt;      ;}
     break;
 
   case 111:
-#line 1266 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1266 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::SExt;      ;}
     break;
 
   case 112:
-#line 1267 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1267 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::InReg;     ;}
     break;
 
   case 113:
-#line 1268 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1268 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::StructRet; ;}
     break;
 
   case 114:
-#line 1269 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1269 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::NoAlias;   ;}
     break;
 
   case 115:
-#line 1270 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1270 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ByVal;     ;}
     break;
 
   case 116:
-#line 1271 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1271 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::Nest;      ;}
     break;
 
   case 117:
-#line 1272 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = 
+#line 1272 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) =
                           ParamAttr::constructAlignmentFromInt((yyvsp[(2) - (2)].UInt64Val));    ;}
     break;
 
   case 118:
-#line 1276 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1276 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::None; ;}
     break;
 
   case 119:
-#line 1277 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1277 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs);
               ;}
     break;
 
   case 120:
-#line 1282 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1282 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::NoReturn; ;}
     break;
 
   case 121:
-#line 1283 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1283 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::NoUnwind; ;}
     break;
 
   case 122:
-#line 1284 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1284 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::InReg;     ;}
     break;
 
   case 123:
-#line 1285 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1285 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ZExt;     ;}
     break;
 
   case 124:
-#line 1286 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1286 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::SExt;     ;}
     break;
 
   case 125:
-#line 1287 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1287 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ReadNone; ;}
     break;
 
   case 126:
-#line 1288 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1288 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ReadOnly; ;}
     break;
 
   case 127:
-#line 1291 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1291 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::None; ;}
     break;
 
   case 128:
-#line 1292 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1292 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs);
               ;}
     break;
 
   case 129:
-#line 1297 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1297 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = (yyvsp[(1) - (1)].ParamAttrs); ;}
     break;
 
   case 130:
-#line 1298 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
-    { 
+#line 1298 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
                 unsigned tmp = (yyvsp[(1) - (3)].ParamAttrs) | (yyvsp[(3) - (3)].ParamAttrs);
-                if ((yyvsp[(3) - (3)].ParamAttrs) == FnAttr::NoInline 
+                if ((yyvsp[(3) - (3)].ParamAttrs) == FnAttr::NoInline
                     && ((yyvsp[(1) - (3)].ParamAttrs) & FnAttr::AlwaysInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
-                    if ((yyvsp[(3) - (3)].ParamAttrs) == FnAttr::AlwaysInline 
+                    if ((yyvsp[(3) - (3)].ParamAttrs) == FnAttr::AlwaysInline
                         && ((yyvsp[(1) - (3)].ParamAttrs) & FnAttr::NoInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
                 (yyval.ParamAttrs) = tmp;
-                CHECK_FOR_ERROR 
+                CHECK_FOR_ERROR
               ;}
     break;
 
   case 131:
-#line 1311 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1311 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = FnAttr::NoInline; ;}
     break;
 
   case 132:
-#line 1312 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1312 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = FnAttr::AlwaysInline; ;}
     break;
 
   case 133:
-#line 1313 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1313 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = FnAttr::OptimizeForSize; ;}
     break;
 
   case 134:
-#line 1316 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1316 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = FnAttr::None; ;}
     break;
 
   case 135:
-#line 1317 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1317 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.ParamAttrs) =  (yyvsp[(3) - (4)].ParamAttrs);
               ;}
     break;
 
   case 136:
-#line 1322 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1322 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 137:
-#line 1323 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1323 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.StrVal) = (yyvsp[(2) - (2)].StrVal);
               ;}
     break;
 
   case 138:
-#line 1330 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1330 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
   case 139:
-#line 1331 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1331 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[(2) - (2)].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -4191,12 +4191,12 @@
     break;
 
   case 140:
-#line 1337 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1337 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
   case 141:
-#line 1338 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1338 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[(3) - (3)].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -4206,7 +4206,7 @@
     break;
 
   case 142:
-#line 1347 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1347 "/Users/echristo/sources/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] == '\\')
@@ -4217,27 +4217,27 @@
     break;
 
   case 143:
-#line 1355 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1355 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 144:
-#line 1356 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1356 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = (yyvsp[(1) - (1)].StrVal); ;}
     break;
 
   case 145:
-#line 1361 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1361 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
   case 146:
-#line 1362 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1362 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
   case 147:
-#line 1363 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1363 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV->setSection(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -4246,7 +4246,7 @@
     break;
 
   case 148:
-#line 1368 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1368 "/Users/echristo/sources/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");
@@ -4256,7 +4256,7 @@
     break;
 
   case 156:
-#line 1384 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1384 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
@@ -4264,7 +4264,7 @@
     break;
 
   case 157:
-#line 1388 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1388 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder((yyvsp[(1) - (1)].PrimType));
     CHECK_FOR_ERROR
@@ -4272,7 +4272,7 @@
     break;
 
   case 158:
-#line 1392 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1392 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {                             // Pointer type?
     if (*(yyvsp[(1) - (3)].TypeVal) == Type::LabelTy)
       GEN_ERROR("Cannot form a pointer to a basic block");
@@ -4283,7 +4283,7 @@
     break;
 
   case 159:
-#line 1399 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1399 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {            // Named types are also simple types...
     const Type* tmp = getTypeVal((yyvsp[(1) - (1)].ValIDVal));
     CHECK_FOR_ERROR
@@ -4292,7 +4292,7 @@
     break;
 
   case 160:
-#line 1404 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1404 "/Users/echristo/sources/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
@@ -4304,14 +4304,14 @@
     break;
 
   case 161:
-#line 1412 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1412 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
     const Type *RetTy = *(yyvsp[(1) - (5)].TypeVal);
     if (!FunctionType::isValidReturnType(RetTy))
       GEN_ERROR("Invalid result type for LLVM function");
-      
+
     std::vector<const Type*> Params;
     TypeWithAttrsList::iterator I = (yyvsp[(3) - (5)].TypeWithAttrsList)->begin(), E = (yyvsp[(3) - (5)].TypeWithAttrsList)->end();
     for (; I != E; ++I ) {
@@ -4331,13 +4331,13 @@
     FunctionType *FT = FunctionType::get(RetTy, 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)); 
+    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(FT));
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 162:
-#line 1441 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1441 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
@@ -4359,13 +4359,13 @@
 
     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)); 
+    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(FT));
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 163:
-#line 1466 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1466 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {          // Sized array type?
     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(ArrayType::get(*(yyvsp[(4) - (5)].TypeVal), (yyvsp[(2) - (5)].UInt64Val))));
     delete (yyvsp[(4) - (5)].TypeVal);
@@ -4374,7 +4374,7 @@
     break;
 
   case 164:
-#line 1471 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1471 "/Users/echristo/sources/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))
@@ -4388,7 +4388,7 @@
     break;
 
   case 165:
-#line 1481 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1481 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {                        // Structure type?
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[(2) - (3)].TypeList)->begin(),
@@ -4402,7 +4402,7 @@
     break;
 
   case 166:
-#line 1491 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1491 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {                                  // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>()));
     CHECK_FOR_ERROR
@@ -4410,7 +4410,7 @@
     break;
 
   case 167:
-#line 1495 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1495 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[(3) - (5)].TypeList)->begin(),
@@ -4424,7 +4424,7 @@
     break;
 
   case 168:
-#line 1505 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1505 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {                         // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>(), true));
     CHECK_FOR_ERROR
@@ -4432,17 +4432,17 @@
     break;
 
   case 169:
-#line 1512 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1512 "/Users/echristo/sources/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).Ty = (yyvsp[(1) - (2)].TypeVal);
     (yyval.TypeWithAttrs).Attrs = ParamAttr::None;
   ;}
     break;
 
   case 170:
-#line 1521 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1521 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (1)].TypeVal))->getDescription());
@@ -4453,14 +4453,14 @@
     break;
 
   case 171:
-#line 1528 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1528 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(Type::VoidTy);
   ;}
     break;
 
   case 172:
-#line 1533 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1533 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     (yyval.TypeWithAttrsList)->push_back((yyvsp[(1) - (1)].TypeWithAttrs));
@@ -4469,7 +4469,7 @@
     break;
 
   case 173:
-#line 1538 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1538 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList))->push_back((yyvsp[(3) - (3)].TypeWithAttrs));
     CHECK_FOR_ERROR
@@ -4477,7 +4477,7 @@
     break;
 
   case 175:
-#line 1546 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1546 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList);
     TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
@@ -4488,7 +4488,7 @@
     break;
 
   case 176:
-#line 1553 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1553 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList;
     TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
@@ -4499,7 +4499,7 @@
     break;
 
   case 177:
-#line 1560 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1560 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     CHECK_FOR_ERROR
@@ -4507,32 +4507,32 @@
     break;
 
   case 178:
-#line 1568 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1568 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeList) = new std::list<PATypeHolder>();
-    (yyval.TypeList)->push_back(*(yyvsp[(1) - (1)].TypeVal)); 
+    (yyval.TypeList)->push_back(*(yyvsp[(1) - (1)].TypeVal));
     delete (yyvsp[(1) - (1)].TypeVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 179:
-#line 1574 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1574 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-    ((yyval.TypeList)=(yyvsp[(1) - (3)].TypeList))->push_back(*(yyvsp[(3) - (3)].TypeVal)); 
+    ((yyval.TypeList)=(yyvsp[(1) - (3)].TypeList))->push_back(*(yyvsp[(3) - (3)].TypeVal));
     delete (yyvsp[(3) - (3)].TypeVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 180:
-#line 1586 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1586 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
     const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[(1) - (4)].TypeVal)->get());
     if (ATy == 0)
-      GEN_ERROR("Cannot make array constant with type: '" + 
+      GEN_ERROR("Cannot make array constant with type: '" +
                      (*(yyvsp[(1) - (4)].TypeVal))->getDescription() + "'");
     const Type *ETy = ATy->getElementType();
     uint64_t NumElements = ATy->getNumElements();
@@ -4540,13 +4540,13 @@
     // Verify that we have the correct size...
     if (NumElements != uint64_t(-1) && NumElements != (yyvsp[(3) - (4)].ConstVector)->size())
       GEN_ERROR("Type mismatch: constant sized array initialized with " +
-                     utostr((yyvsp[(3) - (4)].ConstVector)->size()) +  " arguments, but has size of " + 
+                     utostr((yyvsp[(3) - (4)].ConstVector)->size()) +  " arguments, but has size of " +
                      utostr(NumElements) + "");
 
     // Verify all elements are correct type!
     for (unsigned i = 0; i < (yyvsp[(3) - (4)].ConstVector)->size(); i++) {
       if (ETy != (*(yyvsp[(3) - (4)].ConstVector))[i]->getType())
-        GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
+        GEN_ERROR("Element #" + utostr(i) + " is not of type '" +
                        ETy->getDescription() +"' as required!\nIt is of type '"+
                        (*(yyvsp[(3) - (4)].ConstVector))[i]->getType()->getDescription() + "'.");
     }
@@ -4558,17 +4558,17 @@
     break;
 
   case 181:
-#line 1614 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1614 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
     const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[(1) - (3)].TypeVal)->get());
     if (ATy == 0)
-      GEN_ERROR("Cannot make array constant with type: '" + 
+      GEN_ERROR("Cannot make array constant with type: '" +
                      (*(yyvsp[(1) - (3)].TypeVal))->getDescription() + "'");
 
     uint64_t NumElements = ATy->getNumElements();
-    if (NumElements != uint64_t(-1) && NumElements != 0) 
+    if (NumElements != uint64_t(-1) && NumElements != 0)
       GEN_ERROR("Type mismatch: constant sized array initialized with 0"
                      " arguments, but has size of " + utostr(NumElements) +"");
     (yyval.ConstVal) = ConstantArray::get(ATy, std::vector<Constant*>());
@@ -4578,19 +4578,19 @@
     break;
 
   case 182:
-#line 1630 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1630 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
     const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[(1) - (3)].TypeVal)->get());
     if (ATy == 0)
-      GEN_ERROR("Cannot make array constant with type: '" + 
+      GEN_ERROR("Cannot make array constant with type: '" +
                      (*(yyvsp[(1) - (3)].TypeVal))->getDescription() + "'");
 
     uint64_t NumElements = ATy->getNumElements();
     const Type *ETy = ATy->getElementType();
     if (NumElements != uint64_t(-1) && NumElements != (yyvsp[(3) - (3)].StrVal)->length())
-      GEN_ERROR("Can't build string constant of size " + 
+      GEN_ERROR("Can't build string constant of size " +
                      utostr((yyvsp[(3) - (3)].StrVal)->length()) +
                      " when array has size " + utostr(NumElements) + "");
     std::vector<Constant*> Vals;
@@ -4609,13 +4609,13 @@
     break;
 
   case 183:
-#line 1657 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1657 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
     const VectorType *PTy = dyn_cast<VectorType>((yyvsp[(1) - (4)].TypeVal)->get());
     if (PTy == 0)
-      GEN_ERROR("Cannot make packed constant with type: '" + 
+      GEN_ERROR("Cannot make packed constant with type: '" +
                      (*(yyvsp[(1) - (4)].TypeVal))->getDescription() + "'");
     const Type *ETy = PTy->getElementType();
     unsigned NumElements = PTy->getNumElements();
@@ -4623,13 +4623,13 @@
     // Verify that we have the correct size...
     if (NumElements != unsigned(-1) && NumElements != (unsigned)(yyvsp[(3) - (4)].ConstVector)->size())
       GEN_ERROR("Type mismatch: constant sized packed initialized with " +
-                     utostr((yyvsp[(3) - (4)].ConstVector)->size()) +  " arguments, but has size of " + 
+                     utostr((yyvsp[(3) - (4)].ConstVector)->size()) +  " arguments, but has size of " +
                      utostr(NumElements) + "");
 
     // Verify all elements are correct type!
     for (unsigned i = 0; i < (yyvsp[(3) - (4)].ConstVector)->size(); i++) {
       if (ETy != (*(yyvsp[(3) - (4)].ConstVector))[i]->getType())
-        GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
+        GEN_ERROR("Element #" + utostr(i) + " is not of type '" +
            ETy->getDescription() +"' as required!\nIt is of type '"+
            (*(yyvsp[(3) - (4)].ConstVector))[i]->getType()->getDescription() + "'.");
     }
@@ -4641,11 +4641,11 @@
     break;
 
   case 184:
-#line 1685 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1685 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (4)].TypeVal)->get());
     if (STy == 0)
-      GEN_ERROR("Cannot make struct constant with type: '" + 
+      GEN_ERROR("Cannot make struct constant with type: '" +
                      (*(yyvsp[(1) - (4)].TypeVal))->getDescription() + "'");
 
     if ((yyvsp[(3) - (4)].ConstVector)->size() != STy->getNumContainedTypes())
@@ -4671,13 +4671,13 @@
     break;
 
   case 185:
-#line 1711 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1711 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
     const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (3)].TypeVal)->get());
     if (STy == 0)
-      GEN_ERROR("Cannot make struct constant with type: '" + 
+      GEN_ERROR("Cannot make struct constant with type: '" +
                      (*(yyvsp[(1) - (3)].TypeVal))->getDescription() + "'");
 
     if (STy->getNumContainedTypes() != 0)
@@ -4695,11 +4695,11 @@
     break;
 
   case 186:
-#line 1731 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1731 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (6)].TypeVal)->get());
     if (STy == 0)
-      GEN_ERROR("Cannot make struct constant with type: '" + 
+      GEN_ERROR("Cannot make struct constant with type: '" +
                      (*(yyvsp[(1) - (6)].TypeVal))->getDescription() + "'");
 
     if ((yyvsp[(4) - (6)].ConstVector)->size() != STy->getNumContainedTypes())
@@ -4715,7 +4715,7 @@
 
     // Check to ensure that Type is packed
     if (!STy->isPacked())
-      GEN_ERROR("Vector initializer to non-vector type '" + 
+      GEN_ERROR("Vector initializer to non-vector type '" +
                 STy->getDescription() + "'");
 
     (yyval.ConstVal) = ConstantStruct::get(STy, *(yyvsp[(4) - (6)].ConstVector));
@@ -4725,13 +4725,13 @@
     break;
 
   case 187:
-#line 1757 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1757 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (5)].TypeVal))->getDescription());
     const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (5)].TypeVal)->get());
     if (STy == 0)
-      GEN_ERROR("Cannot make struct constant with type: '" + 
+      GEN_ERROR("Cannot make struct constant with type: '" +
                      (*(yyvsp[(1) - (5)].TypeVal))->getDescription() + "'");
 
     if (STy->getNumContainedTypes() != 0)
@@ -4739,7 +4739,7 @@
 
     // Check to ensure that Type is packed
     if (!STy->isPacked())
-      GEN_ERROR("Vector initializer to non-vector type '" + 
+      GEN_ERROR("Vector initializer to non-vector type '" +
                 STy->getDescription() + "'");
 
     (yyval.ConstVal) = ConstantStruct::get(STy, std::vector<Constant*>());
@@ -4749,13 +4749,13 @@
     break;
 
   case 188:
-#line 1777 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1777 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
     const PointerType *PTy = dyn_cast<PointerType>((yyvsp[(1) - (2)].TypeVal)->get());
     if (PTy == 0)
-      GEN_ERROR("Cannot make null pointer constant with type: '" + 
+      GEN_ERROR("Cannot make null pointer constant with type: '" +
                      (*(yyvsp[(1) - (2)].TypeVal))->getDescription() + "'");
 
     (yyval.ConstVal) = ConstantPointerNull::get(PTy);
@@ -4765,7 +4765,7 @@
     break;
 
   case 189:
-#line 1789 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1789 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4776,7 +4776,7 @@
     break;
 
   case 190:
-#line 1796 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1796 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4810,7 +4810,7 @@
       // First check to see if the forward references value is already created!
       PerModuleInfo::GlobalRefsType::iterator I =
         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[(2) - (2)].ValIDVal).destroy();
@@ -4823,7 +4823,7 @@
 
         // Create the forward referenced global.
         GlobalValue *GV;
-        if (const FunctionType *FTy = 
+        if (const FunctionType *FTy =
                  dyn_cast<FunctionType>(PT->getElementType())) {
           GV = Function::Create(FTy, GlobalValue::ExternalWeakLinkage, Name,
                                 CurModule.CurrentModule);
@@ -4846,12 +4846,12 @@
     break;
 
   case 191:
-#line 1862 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1862 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
     if ((yyvsp[(1) - (2)].TypeVal)->get() != (yyvsp[(2) - (2)].ConstVal)->getType())
-      GEN_ERROR("Mismatched types for constant expression: " + 
+      GEN_ERROR("Mismatched types for constant expression: " +
         (*(yyvsp[(1) - (2)].TypeVal))->getDescription() + " and " + (yyvsp[(2) - (2)].ConstVal)->getType()->getDescription());
     (yyval.ConstVal) = (yyvsp[(2) - (2)].ConstVal);
     delete (yyvsp[(1) - (2)].TypeVal);
@@ -4860,7 +4860,7 @@
     break;
 
   case 192:
-#line 1872 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1872 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4874,7 +4874,7 @@
     break;
 
   case 193:
-#line 1882 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1882 "/Users/echristo/sources/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");
@@ -4884,7 +4884,7 @@
     break;
 
   case 194:
-#line 1888 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1888 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     uint32_t BitWidth = cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth();
     if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > BitWidth) {
@@ -4898,7 +4898,7 @@
     break;
 
   case 195:
-#line 1898 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1898 "/Users/echristo/sources/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");
@@ -4908,12 +4908,12 @@
     break;
 
   case 196:
-#line 1904 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1904 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     uint32_t BitWidth = cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth();
     if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > BitWidth) {
       GEN_ERROR("Constant value does not fit in type");
-    } 
+    }
     (yyvsp[(2) - (2)].APIntVal)->zextOrTrunc(BitWidth);
     (yyval.ConstVal) = ConstantInt::get(*(yyvsp[(2) - (2)].APIntVal));
     delete (yyvsp[(2) - (2)].APIntVal);
@@ -4922,7 +4922,7 @@
     break;
 
   case 197:
-#line 1914 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1914 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {                      // Boolean constants
     if (cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth() != 1)
       GEN_ERROR("Constant true must have type i1");
@@ -4932,7 +4932,7 @@
     break;
 
   case 198:
-#line 1920 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1920 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {                     // Boolean constants
     if (cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth() != 1)
       GEN_ERROR("Constant false must have type i1");
@@ -4942,11 +4942,11 @@
     break;
 
   case 199:
-#line 1926 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1926 "/Users/echristo/sources/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");
-    // Lexer has no type info, so builds all float and double FP constants 
+    // Lexer has no type info, so builds all float and double FP constants
     // as double.  Fix this here.  Long double is done right.
     if (&(yyvsp[(2) - (2)].FPVal)->getSemantics()==&APFloat::IEEEdouble && (yyvsp[(1) - (2)].PrimType)==Type::FloatTy)
       (yyvsp[(2) - (2)].FPVal)->convert(APFloat::IEEEsingle, APFloat::rmNearestTiesToEven);
@@ -4957,7 +4957,7 @@
     break;
 
   case 200:
-#line 1939 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1939 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (6)].TypeVal))->getDescription());
@@ -4966,14 +4966,14 @@
     if (!CastInst::castIsValid((yyvsp[(1) - (6)].CastOpVal), (yyvsp[(3) - (6)].ConstVal), DestTy))
       GEN_ERROR("invalid cast opcode for cast from '" +
                 Val->getType()->getDescription() + "' to '" +
-                DestTy->getDescription() + "'"); 
+                DestTy->getDescription() + "'");
     (yyval.ConstVal) = ConstantExpr::getCast((yyvsp[(1) - (6)].CastOpVal), (yyvsp[(3) - (6)].ConstVal), DestTy);
     delete (yyvsp[(5) - (6)].TypeVal);
   ;}
     break;
 
   case 201:
-#line 1951 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1951 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[(3) - (5)].ConstVal)->getType()))
       GEN_ERROR("GetElementPtr requires a pointer operand");
@@ -4998,7 +4998,7 @@
     break;
 
   case 202:
-#line 1972 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1972 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (8)].ConstVal)->getType() != Type::Int1Ty)
       GEN_ERROR("Select condition must be of boolean type");
@@ -5010,7 +5010,7 @@
     break;
 
   case 203:
-#line 1980 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1980 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType())
       GEN_ERROR("Binary operator types must match");
@@ -5020,12 +5020,12 @@
     break;
 
   case 204:
-#line 1986 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1986 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType())
       GEN_ERROR("Logical operator types must match");
     if (!(yyvsp[(3) - (6)].ConstVal)->getType()->isInteger()) {
-      if (!isa<VectorType>((yyvsp[(3) - (6)].ConstVal)->getType()) || 
+      if (!isa<VectorType>((yyvsp[(3) - (6)].ConstVal)->getType()) ||
           !cast<VectorType>((yyvsp[(3) - (6)].ConstVal)->getType())->getElementType()->isInteger())
         GEN_ERROR("Logical operator requires integral operands");
     }
@@ -5035,7 +5035,7 @@
     break;
 
   case 205:
-#line 1997 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1997 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("icmp operand types must match");
@@ -5044,7 +5044,7 @@
     break;
 
   case 206:
-#line 2002 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2002 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("fcmp operand types must match");
@@ -5053,7 +5053,7 @@
     break;
 
   case 207:
-#line 2007 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2007 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("vicmp operand types must match");
@@ -5062,7 +5062,7 @@
     break;
 
   case 208:
-#line 2012 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2012 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("vfcmp operand types must match");
@@ -5071,7 +5071,7 @@
     break;
 
   case 209:
-#line 2017 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2017 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -5081,7 +5081,7 @@
     break;
 
   case 210:
-#line 2023 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2023 "/Users/echristo/sources/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");
@@ -5091,7 +5091,7 @@
     break;
 
   case 211:
-#line 2029 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2029 "/Users/echristo/sources/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");
@@ -5101,7 +5101,7 @@
     break;
 
   case 212:
-#line 2035 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2035 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<StructType>((yyvsp[(3) - (5)].ConstVal)->getType()) && !isa<ArrayType>((yyvsp[(3) - (5)].ConstVal)->getType()))
       GEN_ERROR("ExtractValue requires an aggregate operand");
@@ -5113,7 +5113,7 @@
     break;
 
   case 213:
-#line 2043 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2043 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<StructType>((yyvsp[(3) - (7)].ConstVal)->getType()) && !isa<ArrayType>((yyvsp[(3) - (7)].ConstVal)->getType()))
       GEN_ERROR("InsertValue requires an aggregate operand");
@@ -5125,7 +5125,7 @@
     break;
 
   case 214:
-#line 2054 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2054 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ConstVector) = (yyvsp[(1) - (3)].ConstVector))->push_back((yyvsp[(3) - (3)].ConstVal));
     CHECK_FOR_ERROR
@@ -5133,7 +5133,7 @@
     break;
 
   case 215:
-#line 2058 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2058 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstVector) = new std::vector<Constant*>();
     (yyval.ConstVector)->push_back((yyvsp[(1) - (1)].ConstVal));
@@ -5142,27 +5142,27 @@
     break;
 
   case 216:
-#line 2066 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2066 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
   case 217:
-#line 2066 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2066 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
   case 218:
-#line 2069 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2069 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
   case 219:
-#line 2069 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2069 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
   case 220:
-#line 2072 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2072 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const Type* VTy = (yyvsp[(1) - (2)].TypeVal)->get();
     Value *V = getVal(VTy, (yyvsp[(2) - (2)].ValIDVal));
@@ -5178,7 +5178,7 @@
     break;
 
   case 221:
-#line 2084 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2084 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     Constant *Val = (yyvsp[(3) - (6)].ConstVal);
     const Type *DestTy = (yyvsp[(5) - (6)].TypeVal)->get();
@@ -5186,7 +5186,7 @@
       GEN_ERROR("invalid cast opcode for cast from '" +
                 Val->getType()->getDescription() + "' to '" +
                 DestTy->getDescription() + "'");
-    
+
     (yyval.ConstVal) = ConstantExpr::getCast((yyvsp[(1) - (6)].CastOpVal), (yyvsp[(3) - (6)].ConstVal), DestTy);
     CHECK_FOR_ERROR
     delete (yyvsp[(5) - (6)].TypeVal);
@@ -5194,7 +5194,7 @@
     break;
 
   case 222:
-#line 2105 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2105 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -5203,7 +5203,7 @@
     break;
 
   case 223:
-#line 2110 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2110 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -5212,12 +5212,12 @@
     break;
 
   case 226:
-#line 2123 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2123 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = false; ;}
     break;
 
   case 227:
-#line 2123 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2123 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
@@ -5225,26 +5225,26 @@
     break;
 
   case 228:
-#line 2127 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2127 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = true; ;}
     break;
 
   case 229:
-#line 2127 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2127 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 230:
-#line 2130 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2130 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 231:
-#line 2133 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2133 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (3)].TypeVal))->getDescription());
@@ -5272,7 +5272,7 @@
     break;
 
   case 232:
-#line 2157 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2157 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ResolveTypeTo((yyvsp[(1) - (3)].StrVal), (yyvsp[(3) - (3)].PrimType));
 
@@ -5287,10 +5287,10 @@
     break;
 
   case 233:
-#line 2169 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
-    { 
+#line 2169 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     /* "Externally Visible" Linkage */
-    if ((yyvsp[(5) - (6)].ConstVal) == 0) 
+    if ((yyvsp[(5) - (6)].ConstVal) == 0)
       GEN_ERROR("Global value initializer is not a constant");
     CurGV = ParseGlobalVariable((yyvsp[(1) - (6)].StrVal), GlobalValue::ExternalLinkage,
                                 (yyvsp[(2) - (6)].Visibility), (yyvsp[(4) - (6)].BoolVal), (yyvsp[(5) - (6)].ConstVal)->getType(), (yyvsp[(5) - (6)].ConstVal), (yyvsp[(3) - (6)].BoolVal), (yyvsp[(6) - (6)].UIntVal));
@@ -5299,16 +5299,16 @@
     break;
 
   case 234:
-#line 2176 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2176 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
   case 235:
-#line 2180 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2180 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-    if ((yyvsp[(6) - (7)].ConstVal) == 0) 
+    if ((yyvsp[(6) - (7)].ConstVal) == 0)
       GEN_ERROR("Global value initializer is not a constant");
     CurGV = ParseGlobalVariable((yyvsp[(1) - (7)].StrVal), (yyvsp[(2) - (7)].Linkage), (yyvsp[(3) - (7)].Visibility), (yyvsp[(5) - (7)].BoolVal), (yyvsp[(6) - (7)].ConstVal)->getType(), (yyvsp[(6) - (7)].ConstVal), (yyvsp[(4) - (7)].BoolVal), (yyvsp[(7) - (7)].UIntVal));
     CHECK_FOR_ERROR
@@ -5316,14 +5316,14 @@
     break;
 
   case 236:
-#line 2185 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2185 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
   case 237:
-#line 2189 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2189 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(6) - (7)].TypeVal))->getDescription());
@@ -5334,7 +5334,7 @@
     break;
 
   case 238:
-#line 2195 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2195 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
@@ -5342,7 +5342,7 @@
     break;
 
   case 239:
-#line 2199 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2199 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     std::string Name;
     if ((yyvsp[(1) - (5)].StrVal)) {
@@ -5351,7 +5351,7 @@
     }
     if (Name.empty())
       GEN_ERROR("Alias name cannot be empty");
-    
+
     Constant* Aliasee = (yyvsp[(5) - (5)].ConstVal);
     if (Aliasee == 0)
       GEN_ERROR(std::string("Invalid aliasee for alias: ") + Name);
@@ -5360,16 +5360,16 @@
                                       CurModule.CurrentModule);
     GA->setVisibility((yyvsp[(2) - (5)].Visibility));
     InsertValue(GA, CurModule.Values);
-    
-    
+
+
     // If there was a forward reference of this alias, resolve it now.
-    
+
     ValID ID;
     if (!Name.empty())
       ID = ValID::createGlobalName(Name);
     else
       ID = ValID::createGlobalID(CurModule.Values.size()-1);
-    
+
     if (GlobalValue *FWGV =
           CurModule.GetForwardRefForGlobal(GA->getType(), ID)) {
       // Replace uses of the fwdref with the actual alias.
@@ -5380,27 +5380,27 @@
         cast<Function>(FWGV)->eraseFromParent();
     }
     ID.destroy();
-    
+
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 240:
-#line 2239 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
-    { 
+#line 2239 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 241:
-#line 2242 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2242 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 242:
-#line 2248 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2248 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
   if (AsmSoFar.empty())
@@ -5413,7 +5413,7 @@
     break;
 
   case 243:
-#line 2258 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2258 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setTargetTriple(*(yyvsp[(3) - (3)].StrVal));
     delete (yyvsp[(3) - (3)].StrVal);
@@ -5421,7 +5421,7 @@
     break;
 
   case 244:
-#line 2262 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2262 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setDataLayout(*(yyvsp[(3) - (3)].StrVal));
     delete (yyvsp[(3) - (3)].StrVal);
@@ -5429,7 +5429,7 @@
     break;
 
   case 246:
-#line 2269 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2269 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary(*(yyvsp[(3) - (3)].StrVal));
           delete (yyvsp[(3) - (3)].StrVal);
@@ -5438,7 +5438,7 @@
     break;
 
   case 247:
-#line 2274 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2274 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary(*(yyvsp[(1) - (1)].StrVal));
           delete (yyvsp[(1) - (1)].StrVal);
@@ -5447,14 +5447,14 @@
     break;
 
   case 248:
-#line 2279 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2279 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
           CHECK_FOR_ERROR
         ;}
     break;
 
   case 249:
-#line 2288 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2288 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
@@ -5468,7 +5468,7 @@
     break;
 
   case 250:
-#line 2298 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2298 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -5482,7 +5482,7 @@
     break;
 
   case 251:
-#line 2309 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2309 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[(1) - (1)].ArgList);
     CHECK_FOR_ERROR
@@ -5490,7 +5490,7 @@
     break;
 
   case 252:
-#line 2313 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2313 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[(1) - (3)].ArgList);
     struct ArgListEntry E;
@@ -5503,7 +5503,7 @@
     break;
 
   case 253:
-#line 2322 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2322 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = new ArgListType;
     struct ArgListEntry E;
@@ -5516,7 +5516,7 @@
     break;
 
   case 254:
-#line 2331 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2331 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = 0;
     CHECK_FOR_ERROR
@@ -5524,11 +5524,11 @@
     break;
 
   case 255:
-#line 2337 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2337 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   std::string FunctionName(*(yyvsp[(3) - (11)].StrVal));
   delete (yyvsp[(3) - (11)].StrVal);  // Free strdup'd memory!
-  
+
   // Check the function result for abstractness if this is a define. We should
   // have no abstract types at this point
   if (!CurFun.isDeclare && CurModule.TypeIsUnresolved((yyvsp[(2) - (11)].TypeVal)))
@@ -5536,11 +5536,11 @@
 
   if (!FunctionType::isValidReturnType(*(yyvsp[(2) - (11)].TypeVal)))
     GEN_ERROR("Invalid result type for LLVM function");
-    
+
   std::vector<const Type*> ParamTypeList;
-  SmallVector<ParamAttrsWithIndex, 8> Attrs;
+  SmallVector<FnAttributeWithIndex, 8> Attrs;
   if ((yyvsp[(7) - (11)].ParamAttrs) != ParamAttr::None)
-    Attrs.push_back(ParamAttrsWithIndex::get(0, (yyvsp[(7) - (11)].ParamAttrs)));
+    Attrs.push_back(FnAttributeWithIndex::get(0, (yyvsp[(7) - (11)].ParamAttrs)));
   if ((yyvsp[(5) - (11)].ArgList)) {   // If there are arguments...
     unsigned index = 1;
     for (ArgListType::iterator I = (yyvsp[(5) - (11)].ArgList)->begin(); I != (yyvsp[(5) - (11)].ArgList)->end(); ++I, ++index) {
@@ -5549,7 +5549,7 @@
         GEN_ERROR("Reference to abstract argument: " + Ty->getDescription());
       ParamTypeList.push_back(Ty);
       if (Ty != Type::VoidTy && I->Attrs != ParamAttr::None)
-        Attrs.push_back(ParamAttrsWithIndex::get(index, I->Attrs));
+        Attrs.push_back(FnAttributeWithIndex::get(index, I->Attrs));
     }
   }
 
@@ -5574,7 +5574,7 @@
   Function *Fn = 0;
   // See if this function was forward referenced.  If so, recycle the object.
   if (GlobalValue *FWRef = CurModule.GetForwardRefForGlobal(PFT, ID)) {
-    // Move the function to the end of the list, from whereever it was 
+    // Move the function to the end of the list, from whereever it was
     // previously inserted.
     Fn = cast<Function>(FWRef);
     assert(Fn->getParamAttrs().isEmpty() &&
@@ -5642,7 +5642,7 @@
     Function::arg_iterator ArgIt = Fn->arg_begin();
     Function::arg_iterator ArgEnd = Fn->arg_end();
     unsigned Idx = 1;
-    for (ArgListType::iterator I = (yyvsp[(5) - (11)].ArgList)->begin(); 
+    for (ArgListType::iterator I = (yyvsp[(5) - (11)].ArgList)->begin();
          I != (yyvsp[(5) - (11)].ArgList)->end() && ArgIt != ArgEnd; ++I, ++ArgIt) {
       delete I->Ty;                          // Delete the typeholder...
       setValueName(ArgIt, I->Name);       // Insert arg into symtab...
@@ -5658,7 +5658,7 @@
     break;
 
   case 258:
-#line 2470 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2470 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = CurFun.CurrentFunction;
 
@@ -5670,7 +5670,7 @@
     break;
 
   case 261:
-#line 2481 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2481 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
   CHECK_FOR_ERROR
@@ -5678,7 +5678,7 @@
     break;
 
   case 262:
-#line 2486 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2486 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.CurrentFunction->setLinkage((yyvsp[(1) - (3)].Linkage));
     CurFun.CurrentFunction->setVisibility((yyvsp[(2) - (3)].Visibility));
@@ -5689,7 +5689,7 @@
     break;
 
   case 263:
-#line 2498 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2498 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -5697,7 +5697,7 @@
     break;
 
   case 264:
-#line 2502 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2502 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -5705,7 +5705,7 @@
     break;
 
   case 265:
-#line 2507 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2507 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {    // A reference to a direct constant
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].SInt64Val));
     CHECK_FOR_ERROR
@@ -5713,7 +5713,7 @@
     break;
 
   case 266:
-#line 2511 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2511 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].UInt64Val));
     CHECK_FOR_ERROR
@@ -5721,7 +5721,7 @@
     break;
 
   case 267:
-#line 2515 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2515 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     (yyval.ValIDVal) = ValID::create(*(yyvsp[(1) - (1)].APIntVal), true);
     delete (yyvsp[(1) - (1)].APIntVal);
@@ -5730,7 +5730,7 @@
     break;
 
   case 268:
-#line 2520 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2520 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     (yyval.ValIDVal) = ValID::create(*(yyvsp[(1) - (1)].APIntVal), false);
     delete (yyvsp[(1) - (1)].APIntVal);
@@ -5739,7 +5739,7 @@
     break;
 
   case 269:
-#line 2525 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2525 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {                     // Perhaps it's an FP constant?
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].FPVal));
     CHECK_FOR_ERROR
@@ -5747,7 +5747,7 @@
     break;
 
   case 270:
-#line 2529 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2529 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getTrue());
     CHECK_FOR_ERROR
@@ -5755,7 +5755,7 @@
     break;
 
   case 271:
-#line 2533 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2533 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getFalse());
     CHECK_FOR_ERROR
@@ -5763,7 +5763,7 @@
     break;
 
   case 272:
-#line 2537 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2537 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createNull();
     CHECK_FOR_ERROR
@@ -5771,7 +5771,7 @@
     break;
 
   case 273:
-#line 2541 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2541 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createUndef();
     CHECK_FOR_ERROR
@@ -5779,7 +5779,7 @@
     break;
 
   case 274:
-#line 2545 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2545 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {     // A vector zero constant.
     (yyval.ValIDVal) = ValID::createZeroInit();
     CHECK_FOR_ERROR
@@ -5787,21 +5787,21 @@
     break;
 
   case 275:
-#line 2549 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2549 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized packed vector
     const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0]->getType();
-    unsigned NumElements = (yyvsp[(2) - (3)].ConstVector)->size(); 
+    unsigned NumElements = (yyvsp[(2) - (3)].ConstVector)->size();
 
     if (!ETy->isInteger() && !ETy->isFloatingPoint())
       GEN_ERROR("Invalid vector element type: " + ETy->getDescription());
-    
+
     VectorType* pt = VectorType::get(ETy, NumElements);
     PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(pt));
-    
+
     // Verify all elements are correct type!
     for (unsigned i = 0; i < (yyvsp[(2) - (3)].ConstVector)->size(); i++) {
       if (ETy != (*(yyvsp[(2) - (3)].ConstVector))[i]->getType())
-        GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
+        GEN_ERROR("Element #" + utostr(i) + " is not of type '" +
                      ETy->getDescription() +"' as required!\nIt is of type '" +
                      (*(yyvsp[(2) - (3)].ConstVector))[i]->getType()->getDescription() + "'.");
     }
@@ -5813,10 +5813,10 @@
     break;
 
   case 276:
-#line 2571 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2571 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0]->getType();
-    uint64_t NumElements = (yyvsp[(2) - (3)].ConstVector)->size(); 
+    uint64_t NumElements = (yyvsp[(2) - (3)].ConstVector)->size();
 
     if (!ETy->isFirstClassType())
       GEN_ERROR("Invalid array element type: " + ETy->getDescription());
@@ -5827,7 +5827,7 @@
     // Verify all elements are correct type!
     for (unsigned i = 0; i < (yyvsp[(2) - (3)].ConstVector)->size(); i++) {
       if (ETy != (*(yyvsp[(2) - (3)].ConstVector))[i]->getType())
-        GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
+        GEN_ERROR("Element #" + utostr(i) + " is not of type '" +
                        ETy->getDescription() +"' as required!\nIt is of type '"+
                        (*(yyvsp[(2) - (3)].ConstVector))[i]->getType()->getDescription() + "'.");
     }
@@ -5839,7 +5839,7 @@
     break;
 
   case 277:
-#line 2593 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2593 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Use undef instead of an array because it's inconvenient to determine
     // the element type at this point, there being no elements to examine.
@@ -5849,7 +5849,7 @@
     break;
 
   case 278:
-#line 2599 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2599 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     uint64_t NumElements = (yyvsp[(2) - (2)].StrVal)->length();
     const Type *ETy = Type::Int8Ty;
@@ -5866,7 +5866,7 @@
     break;
 
   case 279:
-#line 2612 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2612 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements((yyvsp[(2) - (3)].ConstVector)->size());
     for (unsigned i = 0, e = (yyvsp[(2) - (3)].ConstVector)->size(); i != e; ++i)
@@ -5882,7 +5882,7 @@
     break;
 
   case 280:
-#line 2624 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2624 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = StructType::get(std::vector<const Type*>());
     (yyval.ValIDVal) = ValID::create(ConstantStruct::get(STy, std::vector<Constant*>()));
@@ -5891,7 +5891,7 @@
     break;
 
   case 281:
-#line 2629 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2629 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements((yyvsp[(3) - (5)].ConstVector)->size());
     for (unsigned i = 0, e = (yyvsp[(3) - (5)].ConstVector)->size(); i != e; ++i)
@@ -5907,7 +5907,7 @@
     break;
 
   case 282:
-#line 2641 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2641 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = StructType::get(std::vector<const Type*>(),
                                             /*isPacked=*/true);
@@ -5917,7 +5917,7 @@
     break;
 
   case 283:
-#line 2647 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2647 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].ConstVal));
     CHECK_FOR_ERROR
@@ -5925,7 +5925,7 @@
     break;
 
   case 284:
-#line 2651 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2651 "/Users/echristo/sources/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);
@@ -5935,7 +5935,7 @@
     break;
 
   case 285:
-#line 2661 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2661 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {  // Is it an integer reference...?
     (yyval.ValIDVal) = ValID::createLocalID((yyvsp[(1) - (1)].UIntVal));
     CHECK_FOR_ERROR
@@ -5943,7 +5943,7 @@
     break;
 
   case 286:
-#line 2665 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2665 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createGlobalID((yyvsp[(1) - (1)].UIntVal));
     CHECK_FOR_ERROR
@@ -5951,7 +5951,7 @@
     break;
 
   case 287:
-#line 2669 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2669 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -5960,7 +5960,7 @@
     break;
 
   case 288:
-#line 2674 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2674 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createGlobalName(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -5969,35 +5969,35 @@
     break;
 
   case 291:
-#line 2687 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2687 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
-    (yyval.ValueVal) = getVal(*(yyvsp[(1) - (2)].TypeVal), (yyvsp[(2) - (2)].ValIDVal)); 
+    (yyval.ValueVal) = getVal(*(yyvsp[(1) - (2)].TypeVal), (yyvsp[(2) - (2)].ValIDVal));
     delete (yyvsp[(1) - (2)].TypeVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 292:
-#line 2696 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2696 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = new std::vector<Value *>();
-    (yyval.ValueList)->push_back((yyvsp[(1) - (1)].ValueVal)); 
+    (yyval.ValueList)->push_back((yyvsp[(1) - (1)].ValueVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 293:
-#line 2701 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2701 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-    ((yyval.ValueList)=(yyvsp[(1) - (3)].ValueList))->push_back((yyvsp[(3) - (3)].ValueVal)); 
+    ((yyval.ValueList)=(yyvsp[(1) - (3)].ValueList))->push_back((yyvsp[(3) - (3)].ValueVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 294:
-#line 2706 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2706 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
     CHECK_FOR_ERROR
@@ -6005,15 +6005,15 @@
     break;
 
   case 295:
-#line 2710 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
-    { // Do not allow functions with 0 basic blocks   
+#line 2710 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+    { // Do not allow functions with 0 basic blocks
     (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 296:
-#line 2719 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2719 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     setValueName((yyvsp[(3) - (3)].TermInstVal), (yyvsp[(2) - (3)].StrVal));
     CHECK_FOR_ERROR
@@ -6025,14 +6025,14 @@
     break;
 
   case 297:
-#line 2728 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2728 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   CHECK_FOR_ERROR
   int ValNum = InsertValue((yyvsp[(3) - (3)].TermInstVal));
   if (ValNum != (int)(yyvsp[(2) - (3)].UIntVal))
     GEN_ERROR("Result value number %" + utostr((yyvsp[(2) - (3)].UIntVal)) +
               " is incorrect, expected %" + utostr((unsigned)ValNum));
-  
+
   (yyvsp[(1) - (3)].BasicBlockVal)->getInstList().push_back((yyvsp[(3) - (3)].TermInstVal));
   (yyval.BasicBlockVal) = (yyvsp[(1) - (3)].BasicBlockVal);
   CHECK_FOR_ERROR
@@ -6040,7 +6040,7 @@
     break;
 
   case 298:
-#line 2741 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2741 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (CastInst *CI1 = dyn_cast<CastInst>((yyvsp[(2) - (2)].InstVal)))
       if (CastInst *CI2 = dyn_cast<CastInst>(CI1->getOperand(0)))
@@ -6053,7 +6053,7 @@
     break;
 
   case 299:
-#line 2750 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2750 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {          // Empty space between instruction lists
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
     CHECK_FOR_ERROR
@@ -6061,7 +6061,7 @@
     break;
 
   case 300:
-#line 2754 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2754 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {             // Labelled (named) basic block
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal)));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -6071,7 +6071,7 @@
     break;
 
   case 301:
-#line 2762 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2762 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Return with a result...
     ValueList &VL = *(yyvsp[(2) - (2)].ValueList);
     assert(!VL.empty() && "Invalid ret operands!");
@@ -6095,7 +6095,7 @@
     break;
 
   case 302:
-#line 2782 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2782 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {                                    // Return with no result...
     (yyval.TermInstVal) = ReturnInst::Create();
     CHECK_FOR_ERROR
@@ -6103,7 +6103,7 @@
     break;
 
   case 303:
-#line 2786 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2786 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {                           // Unconditional Branch...
     BasicBlock* tmpBB = getBBVal((yyvsp[(3) - (3)].ValIDVal));
     CHECK_FOR_ERROR
@@ -6112,8 +6112,8 @@
     break;
 
   case 304:
-#line 2791 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
-    {  
+#line 2791 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (cast<IntegerType>((yyvsp[(2) - (9)].PrimType))->getBitWidth() != 1)
       GEN_ERROR("Branch condition must have type i1");
     BasicBlock* tmpBBA = getBBVal((yyvsp[(6) - (9)].ValIDVal));
@@ -6127,7 +6127,7 @@
     break;
 
   case 305:
-#line 2802 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2802 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[(2) - (9)].PrimType), (yyvsp[(3) - (9)].ValIDVal));
     CHECK_FOR_ERROR
@@ -6150,7 +6150,7 @@
     break;
 
   case 306:
-#line 2821 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2821 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[(2) - (8)].PrimType), (yyvsp[(3) - (8)].ValIDVal));
     CHECK_FOR_ERROR
@@ -6163,7 +6163,7 @@
     break;
 
   case 307:
-#line 2831 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2831 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -6180,7 +6180,7 @@
           GEN_ERROR("Short call syntax cannot be used with varargs");
         ParamTypes.push_back(Ty);
       }
-      
+
       if (!FunctionType::isValidReturnType(*(yyvsp[(3) - (14)].TypeVal)))
         GEN_ERROR("Invalid result type for LLVM function");
 
@@ -6197,9 +6197,9 @@
     BasicBlock *Except = getBBVal((yyvsp[(14) - (14)].ValIDVal));
     CHECK_FOR_ERROR
 
-    SmallVector<ParamAttrsWithIndex, 8> Attrs;
+    SmallVector<FnAttributeWithIndex, 8> Attrs;
     if ((yyvsp[(8) - (14)].ParamAttrs) != ParamAttr::None)
-      Attrs.push_back(ParamAttrsWithIndex::get(0, (yyvsp[(8) - (14)].ParamAttrs)));
+      Attrs.push_back(FnAttributeWithIndex::get(0, (yyvsp[(8) - (14)].ParamAttrs)));
 
     // Check the arguments
     ValueList Args;
@@ -6222,7 +6222,7 @@
                          (*I)->getDescription() + "'");
         Args.push_back(ArgI->Val);
         if (ArgI->Attrs != ParamAttr::None)
-          Attrs.push_back(ParamAttrsWithIndex::get(index, ArgI->Attrs));
+          Attrs.push_back(FnAttributeWithIndex::get(index, ArgI->Attrs));
       }
 
       if (Ty->isVarArg()) {
@@ -6230,7 +6230,7 @@
           for (; ArgI != ArgE; ++ArgI, ++index) {
             Args.push_back(ArgI->Val); // push the remaining varargs
             if (ArgI->Attrs != ParamAttr::None)
-              Attrs.push_back(ParamAttrsWithIndex::get(index, ArgI->Attrs));
+              Attrs.push_back(FnAttributeWithIndex::get(index, ArgI->Attrs));
           }
       } else if (I != E || ArgI != ArgE)
         GEN_ERROR("Invalid number of parameters detected");
@@ -6252,7 +6252,7 @@
     break;
 
   case 308:
-#line 2916 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2916 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnwindInst();
     CHECK_FOR_ERROR
@@ -6260,7 +6260,7 @@
     break;
 
   case 309:
-#line 2920 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2920 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnreachableInst();
     CHECK_FOR_ERROR
@@ -6268,7 +6268,7 @@
     break;
 
   case 310:
-#line 2927 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2927 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = (yyvsp[(1) - (6)].JumpTable);
     Constant *V = cast<Constant>(getExistingVal((yyvsp[(2) - (6)].PrimType), (yyvsp[(3) - (6)].ValIDVal)));
@@ -6283,7 +6283,7 @@
     break;
 
   case 311:
-#line 2938 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2938 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
     Constant *V = cast<Constant>(getExistingVal((yyvsp[(1) - (5)].PrimType), (yyvsp[(2) - (5)].ValIDVal)));
@@ -6294,12 +6294,12 @@
 
     BasicBlock* tmpBB = getBBVal((yyvsp[(5) - (5)].ValIDVal));
     CHECK_FOR_ERROR
-    (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB)); 
+    (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB));
   ;}
     break;
 
   case 312:
-#line 2951 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2951 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Is this definition named?? if so, assign the name...
     setValueName((yyvsp[(2) - (2)].InstVal), (yyvsp[(1) - (2)].StrVal));
@@ -6311,11 +6311,11 @@
     break;
 
   case 313:
-#line 2960 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2960 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
     int ValNum = InsertValue((yyvsp[(2) - (2)].InstVal));
-  
+
     if (ValNum != (int)(yyvsp[(1) - (2)].UIntVal))
       GEN_ERROR("Result value number %" + utostr((yyvsp[(1) - (2)].UIntVal)) +
                 " is incorrect, expected %" + utostr((unsigned)ValNum));
@@ -6326,7 +6326,7 @@
     break;
 
   case 314:
-#line 2973 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2973 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {    // Used for PHI nodes
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (6)].TypeVal))->getDescription());
@@ -6341,7 +6341,7 @@
     break;
 
   case 315:
-#line 2984 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2984 "/Users/echristo/sources/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));
@@ -6353,7 +6353,7 @@
     break;
 
   case 316:
-#line 2994 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2994 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
     if (!UpRefs.empty())
@@ -6368,7 +6368,7 @@
     break;
 
   case 317:
-#line 3005 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3005 "/Users/echristo/sources/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
@@ -6380,7 +6380,7 @@
     break;
 
   case 318:
-#line 3013 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3013 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
     if (!UpRefs.empty())
@@ -6394,7 +6394,7 @@
     break;
 
   case 319:
-#line 3023 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3023 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
     (yyval.ParamList) = (yyvsp[(1) - (6)].ParamList);
@@ -6405,17 +6405,17 @@
     break;
 
   case 320:
-#line 3030 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3030 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamList) = new ParamList(); ;}
     break;
 
   case 321:
-#line 3033 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3033 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueList) = new std::vector<Value*>(); ;}
     break;
 
   case 322:
-#line 3034 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3034 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = (yyvsp[(1) - (3)].ValueList);
     (yyval.ValueList)->push_back((yyvsp[(3) - (3)].ValueVal));
@@ -6424,7 +6424,7 @@
     break;
 
   case 323:
-#line 3042 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3042 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstantList) = new std::vector<unsigned>();
     if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val))
@@ -6434,7 +6434,7 @@
     break;
 
   case 324:
-#line 3048 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3048 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstantList) = (yyvsp[(1) - (3)].ConstantList);
     if ((unsigned)(yyvsp[(3) - (3)].UInt64Val) != (yyvsp[(3) - (3)].UInt64Val))
@@ -6445,7 +6445,7 @@
     break;
 
   case 325:
-#line 3057 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3057 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -6453,7 +6453,7 @@
     break;
 
   case 326:
-#line 3061 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3061 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -6461,15 +6461,15 @@
     break;
 
   case 327:
-#line 3066 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3066 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
-    if (!(*(yyvsp[(2) - (5)].TypeVal))->isInteger() && !(*(yyvsp[(2) - (5)].TypeVal))->isFloatingPoint() && 
+    if (!(*(yyvsp[(2) - (5)].TypeVal))->isInteger() && !(*(yyvsp[(2) - (5)].TypeVal))->isFloatingPoint() &&
         !isa<VectorType>((*(yyvsp[(2) - (5)].TypeVal)).get()))
       GEN_ERROR(
         "Arithmetic operator requires integer, FP, or packed operands");
-    Value* val1 = getVal(*(yyvsp[(2) - (5)].TypeVal), (yyvsp[(3) - (5)].ValIDVal)); 
+    Value* val1 = getVal(*(yyvsp[(2) - (5)].TypeVal), (yyvsp[(3) - (5)].ValIDVal));
     CHECK_FOR_ERROR
     Value* val2 = getVal(*(yyvsp[(2) - (5)].TypeVal), (yyvsp[(5) - (5)].ValIDVal));
     CHECK_FOR_ERROR
@@ -6481,7 +6481,7 @@
     break;
 
   case 328:
-#line 3082 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3082 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
@@ -6502,7 +6502,7 @@
     break;
 
   case 329:
-#line 3099 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3099 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6518,7 +6518,7 @@
     break;
 
   case 330:
-#line 3111 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3111 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6534,7 +6534,7 @@
     break;
 
   case 331:
-#line 3123 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3123 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6552,7 +6552,7 @@
     break;
 
   case 332:
-#line 3137 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3137 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6570,7 +6570,7 @@
     break;
 
   case 333:
-#line 3151 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3151 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription());
@@ -6579,14 +6579,14 @@
     if (!CastInst::castIsValid((yyvsp[(1) - (4)].CastOpVal), Val, DestTy))
       GEN_ERROR("invalid cast opcode for cast from '" +
                 Val->getType()->getDescription() + "' to '" +
-                DestTy->getDescription() + "'"); 
+                DestTy->getDescription() + "'");
     (yyval.InstVal) = CastInst::Create((yyvsp[(1) - (4)].CastOpVal), Val, DestTy);
     delete (yyvsp[(4) - (4)].TypeVal);
   ;}
     break;
 
   case 334:
-#line 3163 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3163 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (isa<VectorType>((yyvsp[(2) - (6)].ValueVal)->getType())) {
       // vector select
@@ -6611,7 +6611,7 @@
     break;
 
   case 335:
-#line 3184 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3184 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription());
@@ -6622,7 +6622,7 @@
     break;
 
   case 336:
-#line 3191 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3191 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[(2) - (4)].ValueVal), (yyvsp[(4) - (4)].ValueVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -6632,7 +6632,7 @@
     break;
 
   case 337:
-#line 3197 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3197 "/Users/echristo/sources/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");
@@ -6642,7 +6642,7 @@
     break;
 
   case 338:
-#line 3203 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3203 "/Users/echristo/sources/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");
@@ -6652,7 +6652,7 @@
     break;
 
   case 339:
-#line 3209 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3209 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const Type *Ty = (yyvsp[(2) - (2)].PHIList)->front().first->getType();
     if (!Ty->isFirstClassType())
@@ -6660,7 +6660,7 @@
     (yyval.InstVal) = PHINode::Create(Ty);
     ((PHINode*)(yyval.InstVal))->reserveOperandSpace((yyvsp[(2) - (2)].PHIList)->size());
     while ((yyvsp[(2) - (2)].PHIList)->begin() != (yyvsp[(2) - (2)].PHIList)->end()) {
-      if ((yyvsp[(2) - (2)].PHIList)->front().first->getType() != Ty) 
+      if ((yyvsp[(2) - (2)].PHIList)->front().first->getType() != Ty)
         GEN_ERROR("All elements of a PHI node must be of the same type");
       cast<PHINode>((yyval.InstVal))->addIncoming((yyvsp[(2) - (2)].PHIList)->front().first, (yyvsp[(2) - (2)].PHIList)->front().second);
       (yyvsp[(2) - (2)].PHIList)->pop_front();
@@ -6671,7 +6671,7 @@
     break;
 
   case 340:
-#line 3225 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3225 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -6709,10 +6709,10 @@
     }
 
     // Set up the ParamAttrs for the function
-    SmallVector<ParamAttrsWithIndex, 8> Attrs;
+    SmallVector<FnAttributeWithIndex, 8> Attrs;
     if ((yyvsp[(8) - (8)].ParamAttrs) != ParamAttr::None)
-      Attrs.push_back(ParamAttrsWithIndex::get(0, (yyvsp[(8) - (8)].ParamAttrs)));
-    // Check the arguments 
+      Attrs.push_back(FnAttributeWithIndex::get(0, (yyvsp[(8) - (8)].ParamAttrs)));
+    // Check the arguments
     ValueList Args;
     if ((yyvsp[(6) - (8)].ParamList)->empty()) {                                   // Has no arguments?
       // Make sure no arguments is a good thing!
@@ -6733,14 +6733,14 @@
                          (*I)->getDescription() + "'");
         Args.push_back(ArgI->Val);
         if (ArgI->Attrs != ParamAttr::None)
-          Attrs.push_back(ParamAttrsWithIndex::get(index, ArgI->Attrs));
+          Attrs.push_back(FnAttributeWithIndex::get(index, ArgI->Attrs));
       }
       if (Ty->isVarArg()) {
         if (I == E)
           for (; ArgI != ArgE; ++ArgI, ++index) {
             Args.push_back(ArgI->Val); // push the remaining varargs
             if (ArgI->Attrs != ParamAttr::None)
-              Attrs.push_back(ParamAttrsWithIndex::get(index, ArgI->Attrs));
+              Attrs.push_back(FnAttributeWithIndex::get(index, ArgI->Attrs));
           }
       } else if (I != E || ArgI != ArgE)
         GEN_ERROR("Invalid number of parameters detected");
@@ -6764,7 +6764,7 @@
     break;
 
   case 341:
-#line 3314 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3314 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = (yyvsp[(1) - (1)].InstVal);
     CHECK_FOR_ERROR
@@ -6772,7 +6772,7 @@
     break;
 
   case 342:
-#line 3319 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3319 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -6780,7 +6780,7 @@
     break;
 
   case 343:
-#line 3323 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3323 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -6788,7 +6788,7 @@
     break;
 
   case 344:
-#line 3330 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3330 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription());
@@ -6799,7 +6799,7 @@
     break;
 
   case 345:
-#line 3337 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3337 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription());
@@ -6813,7 +6813,7 @@
     break;
 
   case 346:
-#line 3347 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3347 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription());
@@ -6824,7 +6824,7 @@
     break;
 
   case 347:
-#line 3354 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3354 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription());
@@ -6838,10 +6838,10 @@
     break;
 
   case 348:
-#line 3364 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3364 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[(2) - (2)].ValueVal)->getType()))
-      GEN_ERROR("Trying to free nonpointer type " + 
+      GEN_ERROR("Trying to free nonpointer type " +
                      (yyvsp[(2) - (2)].ValueVal)->getType()->getDescription() + "");
     (yyval.InstVal) = new FreeInst((yyvsp[(2) - (2)].ValueVal));
     CHECK_FOR_ERROR
@@ -6849,7 +6849,7 @@
     break;
 
   case 349:
-#line 3372 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3372 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
@@ -6867,7 +6867,7 @@
     break;
 
   case 350:
-#line 3386 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3386 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (7)].TypeVal))->getDescription());
@@ -6888,7 +6888,7 @@
     break;
 
   case 351:
-#line 3403 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3403 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
@@ -6906,7 +6906,7 @@
     break;
 
   case 352:
-#line 3417 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3417 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription());
@@ -6919,13 +6919,13 @@
     Value* tmpVal = getVal(*(yyvsp[(2) - (4)].TypeVal), (yyvsp[(3) - (4)].ValIDVal));
     CHECK_FOR_ERROR
     (yyval.InstVal) = GetElementPtrInst::Create(tmpVal, (yyvsp[(4) - (4)].ValueList)->begin(), (yyvsp[(4) - (4)].ValueList)->end());
-    delete (yyvsp[(2) - (4)].TypeVal); 
+    delete (yyvsp[(2) - (4)].TypeVal);
     delete (yyvsp[(4) - (4)].ValueList);
   ;}
     break;
 
   case 353:
-#line 3432 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3432 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription());
@@ -6938,13 +6938,13 @@
     Value* tmpVal = getVal(*(yyvsp[(2) - (4)].TypeVal), (yyvsp[(3) - (4)].ValIDVal));
     CHECK_FOR_ERROR
     (yyval.InstVal) = ExtractValueInst::Create(tmpVal, (yyvsp[(4) - (4)].ConstantList)->begin(), (yyvsp[(4) - (4)].ConstantList)->end());
-    delete (yyvsp[(2) - (4)].TypeVal); 
+    delete (yyvsp[(2) - (4)].TypeVal);
     delete (yyvsp[(4) - (4)].ConstantList);
   ;}
     break;
 
   case 354:
-#line 3447 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3447 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (7)].TypeVal))->getDescription());
@@ -6958,7 +6958,7 @@
     Value* tmpVal = getVal(*(yyvsp[(5) - (7)].TypeVal), (yyvsp[(6) - (7)].ValIDVal));
     CHECK_FOR_ERROR
     (yyval.InstVal) = InsertValueInst::Create(aggVal, tmpVal, (yyvsp[(7) - (7)].ConstantList)->begin(), (yyvsp[(7) - (7)].ConstantList)->end());
-    delete (yyvsp[(2) - (7)].TypeVal); 
+    delete (yyvsp[(2) - (7)].TypeVal);
     delete (yyvsp[(5) - (7)].TypeVal);
     delete (yyvsp[(7) - (7)].ConstantList);
   ;}
@@ -7180,7 +7180,7 @@
 }
 
 
-#line 3466 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3466 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
 
 
 // common code from the two 'RunVMAsmParser' functions
@@ -7249,7 +7249,7 @@
   std::string errMsg = where + "error: " + std::string(ErrorMsg);
   if (yychar != YYEMPTY && yychar != 0) {
     errMsg += " while reading token: '";
-    errMsg += std::string(LLLgetTokenStart(), 
+    errMsg += std::string(LLLgetTokenStart(),
                           LLLgetTokenStart()+LLLgetTokenLength()) + "'";
   }
   GenerateError(errMsg);

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

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs Tue Sep 23 23:55:49 2008
@@ -366,7 +366,7 @@
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 970 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 970 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;

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

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.y (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.y Tue Sep 23 23:55:49 2008
@@ -33,13 +33,13 @@
 // 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
 // an error situation. So, whenever we want an error to occur, the GenerateError
-// function (see bottom of file) sets TriggerError. Then, at the end of each 
-// production in the grammer we use CHECK_FOR_ERROR which will invoke YYERROR 
-// (a goto) to put YACC in error state. Furthermore, several calls to 
+// function (see bottom of file) sets TriggerError. Then, at the end of each
+// production in the grammer we use CHECK_FOR_ERROR which will invoke YYERROR
+// (a goto) to put YACC in error state. Furthermore, several calls to
 // GenerateError are made from inside productions and they must simulate the
 // previous exception behavior by exiting the production immediately. We have
 // replaced these with the GEN_ERROR macro which calls GeneratError and then
-// immediately invokes YYERROR. This would be so much cleaner if it was a 
+// immediately invokes YYERROR. This would be so much cleaner if it was a
 // recursive descent parser.
 static bool TriggerError = false;
 #define CHECK_FOR_ERROR { if (TriggerError) { TriggerError = false; YYABORT; } }
@@ -72,7 +72,7 @@
 //
 typedef std::vector<Value *> ValueList;           // Numbered defs
 
-static void 
+static void
 ResolveDefinitions(ValueList &LateResolvers, ValueList *FutureLateResolvers=0);
 
 static struct PerModuleInfo {
@@ -151,7 +151,7 @@
     if (!Ty->isAbstract())
       return false;
     // Traverse the type looking for abstract types. If it isn't abstract then
-    // we don't need to traverse that leg of the type. 
+    // we don't need to traverse that leg of the type.
     std::vector<const Type*> WorkList, SeenList;
     WorkList.push_back(Ty);
     while (!WorkList.empty()) {
@@ -169,7 +169,7 @@
       } else if (const SequentialType* SeqTy = dyn_cast<SequentialType>(Ty)) {
         const Type* TheTy = SeqTy->getElementType();
         if (TheTy->isAbstract() && TheTy != Ty) {
-          std::vector<const Type*>::iterator I = SeenList.begin(), 
+          std::vector<const Type*>::iterator I = SeenList.begin(),
                                              E = SeenList.end();
           for ( ; I != E; ++I)
             if (*I == TheTy)
@@ -181,7 +181,7 @@
         for (unsigned i = 0; i < StrTy->getNumElements(); ++i) {
           const Type* TheTy = StrTy->getElementType(i);
           if (TheTy->isAbstract() && TheTy != Ty) {
-            std::vector<const Type*>::iterator I = SeenList.begin(), 
+            std::vector<const Type*>::iterator I = SeenList.begin(),
                                                E = SeenList.end();
             for ( ; I != E; ++I)
               if (*I == TheTy)
@@ -258,14 +258,14 @@
 
   // In the case of function values, we have to allow for the forward reference
   // of basic blocks, which are included in the numbering. Consequently, we keep
-  // track of the next insertion location with NextValNum. When a BB gets 
+  // track of the next insertion location with NextValNum. When a BB gets
   // inserted, it could change the size of the CurFun.Values vector.
   if (&ValueTab == &CurFun.Values) {
     if (ValueTab.size() <= CurFun.NextValNum)
       ValueTab.resize(CurFun.NextValNum+1);
     ValueTab[CurFun.NextValNum++] = V;
     return CurFun.NextValNum-1;
-  } 
+  }
   // For all other lists, its okay to just tack it on the back of the vector.
   ValueTab.push_back(V);
   return ValueTab.size()-1;
@@ -329,47 +329,47 @@
   switch (D.Type) {
   case ValID::LocalID: {                 // Is it a numbered definition?
     // Check that the number is within bounds.
-    if (D.Num >= CurFun.Values.size()) 
+    if (D.Num >= CurFun.Values.size())
       return 0;
     Value *Result = CurFun.Values[D.Num];
     if (Ty != Result->getType()) {
       GenerateError("Numbered value (%" + utostr(D.Num) + ") of type '" +
-                    Result->getType()->getDescription() + "' does not match " 
+                    Result->getType()->getDescription() + "' does not match "
                     "expected type, '" + Ty->getDescription() + "'");
       return 0;
     }
     return Result;
   }
   case ValID::GlobalID: {                 // Is it a numbered definition?
-    if (D.Num >= CurModule.Values.size()) 
+    if (D.Num >= CurModule.Values.size())
       return 0;
     Value *Result = CurModule.Values[D.Num];
     if (Ty != Result->getType()) {
       GenerateError("Numbered value (@" + utostr(D.Num) + ") of type '" +
-                    Result->getType()->getDescription() + "' does not match " 
+                    Result->getType()->getDescription() + "' does not match "
                     "expected type, '" + Ty->getDescription() + "'");
       return 0;
     }
     return Result;
   }
-    
+
   case ValID::LocalName: {                // Is it a named definition?
-    if (!inFunctionScope()) 
+    if (!inFunctionScope())
       return 0;
     ValueSymbolTable &SymTab = CurFun.CurrentFunction->getValueSymbolTable();
     Value *N = SymTab.lookup(D.getName());
-    if (N == 0) 
+    if (N == 0)
       return 0;
     if (N->getType() != Ty)
       return 0;
-    
+
     D.destroy();  // Free old strdup'd memory...
     return N;
   }
   case ValID::GlobalName: {                // Is it a named definition?
     ValueSymbolTable &SymTab = CurModule.CurrentModule->getValueSymbolTable();
     Value *N = SymTab.lookup(D.getName());
-    if (N == 0) 
+    if (N == 0)
       return 0;
     if (N->getType() != Ty)
       return 0;
@@ -412,20 +412,20 @@
                     Ty->getDescription() + "'");
       return 0;
     }
-      
+
     {
       APSInt Tmp = *D.ConstPoolInt;
       Tmp.extOrTrunc(Ty->getPrimitiveSizeInBits());
       return ConstantInt::get(Tmp);
     }
-      
+
   case ValID::ConstFPVal:        // Is it a floating point const pool reference?
     if (!Ty->isFloatingPoint() ||
         !ConstantFP::isValueValidForType(Ty, *D.ConstPoolFP)) {
       GenerateError("FP constant invalid for type");
       return 0;
     }
-    // Lexer has no type info, so builds all float and double FP constants 
+    // Lexer has no type info, so builds all float and double FP constants
     // as double.  Fix this here.  Long double does not need this.
     if (&D.ConstPoolFP->getSemantics() == &APFloat::IEEEdouble &&
         Ty==Type::FloatTy)
@@ -444,7 +444,7 @@
 
   case ValID::ConstZeroVal:      // Is it a zero value?
     return Constant::getNullValue(Ty);
-    
+
   case ValID::ConstantVal:       // Fully resolved constant?
     if (D.ConstantValue->getType() != Ty) {
       GenerateError("Constant expression type different from required type");
@@ -519,7 +519,7 @@
   default:
    V = new Argument(Ty);
   }
-  
+
   // 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,
@@ -555,7 +555,7 @@
     // Erase the forward ref from the map as its no longer "forward"
     CurFun.BBForwardRefs.erase(ID);
 
-    // The key has been removed from the map but so we don't want to leave 
+    // The key has been removed from the map but so we don't want to leave
     // strdup'd memory around so destroy it too.
     Tmp.destroy();
 
@@ -564,8 +564,8 @@
       assert(ID.Num == CurFun.NextValNum && "Invalid new block number");
       InsertValue(BB);
     }
-  } else { 
-    // We haven't seen this BB before and its first mention is a definition. 
+  } else {
+    // We haven't seen this BB before and its first mention is a definition.
     // Just create it and return it.
     std::string Name (ID.Type == ValID::LocalName ? ID.getName() : "");
     BB = BasicBlock::Create(Name, CurFun.CurrentFunction);
@@ -580,7 +580,7 @@
 }
 
 /// getBBVal - get an existing BB value or create a forward reference for it.
-/// 
+///
 static BasicBlock *getBBVal(const ValID &ID) {
   assert(inFunctionScope() && "Can't get basic block at global scope!");
 
@@ -604,8 +604,8 @@
       if (CurFun.Values[ID.Num]->getType()->getTypeID() == Type::LabelTyID)
         BB = cast<BasicBlock>(CurFun.Values[ID.Num]);
       else
-        GenerateError("Reference to label '%" + utostr(ID.Num) + 
-          "' is actually of type '"+ 
+        GenerateError("Reference to label '%" + utostr(ID.Num) +
+          "' is actually of type '"+
           CurFun.Values[ID.Num]->getType()->getDescription() + "'");
     }
   } else {
@@ -648,7 +648,7 @@
 // time (forward branches, phi functions for loops, etc...) resolve the
 // defs now...
 //
-static void 
+static void
 ResolveDefinitions(ValueList &LateResolvers, ValueList *FutureLateResolvers) {
   // Loop over LateResolveDefs fixing up stuff that couldn't be resolved
   while (!LateResolvers.empty()) {
@@ -698,7 +698,7 @@
   ValID D;
   if (Name)
     D = ValID::createLocalName(*Name);
-  else      
+  else
     D = ValID::createLocalID(CurModule.Types.size());
 
   std::map<ValID, PATypeHolder>::iterator I =
@@ -821,7 +821,7 @@
 static bool setTypeName(const Type *T, std::string *NameStr) {
   assert(!inFunctionScope() && "Can't give types function-local names!");
   if (NameStr == 0) return false;
- 
+
   std::string Name(*NameStr);      // Copy string
   delete NameStr;                  // Free old string
 
@@ -904,7 +904,7 @@
   // If Ty isn't abstract, or if there are no up-references in it, then there is
   // nothing to resolve here.
   if (!ty->isAbstract() || UpRefs.empty()) return ty;
-  
+
   PATypeHolder Ty(ty);
   UR_OUT("Type '" << Ty->getDescription() <<
          "' newly formed.  Resolving upreferences.\n" <<
@@ -1015,7 +1015,7 @@
   llvm::FCmpInst::Predicate         FPredicate;
 }
 
-%type <ModuleVal>     Module 
+%type <ModuleVal>     Module
 %type <FunctionVal>   Function FunctionProto FunctionHeader BasicBlockList
 %type <BasicBlockVal> BasicBlock InstructionList
 %type <TermInstVal>   BBTerminatorInst
@@ -1027,7 +1027,7 @@
 %type <ParamList>     ParamList      // For call param lists & GEP indices
 %type <ValueList>     IndexList         // For GEP indices
 %type <ConstantList>  ConstantIndexList // For insertvalue/extractvalue indices
-%type <TypeList>      TypeListI 
+%type <TypeList>      TypeListI
 %type <TypeWithAttrsList> ArgTypeList ArgTypeListI
 %type <TypeWithAttrs> ArgType
 %type <JumpTable>     JumpTable
@@ -1053,10 +1053,10 @@
 // EUINT64VAL - A positive number within uns. long long range
 %token <UInt64Val> EUINT64VAL
 
-// ESAPINTVAL - A negative number with arbitrary precision 
+// ESAPINTVAL - A negative number with arbitrary precision
 %token <APIntVal>  ESAPINTVAL
 
-// EUAPINTVAL - A positive number with arbitrary precision 
+// EUAPINTVAL - A positive number with arbitrary precision
 %token <APIntVal>  EUAPINTVAL
 
 %token  <UIntVal>   LOCALVAL_ID GLOBALVAL_ID  // %123 @123
@@ -1065,12 +1065,12 @@
 // Built in types...
 %type  <TypeVal> Types ResultTypes
 %type  <PrimType> IntType FPType PrimType           // Classifications
-%token <PrimType> VOID INTTYPE 
+%token <PrimType> VOID INTTYPE
 %token <PrimType> FLOAT DOUBLE X86_FP80 FP128 PPC_FP128 LABEL
 %token TYPE
 
 
-%token<StrVal> LOCALVAR GLOBALVAR LABELSTR 
+%token<StrVal> LOCALVAR GLOBALVAR LABELSTR
 %token<StrVal> STRINGCONSTANT ATSTRINGCONSTANT PCTSTRINGCONSTANT
 %type <StrVal> LocalName OptLocalName OptLocalAssign
 %type <StrVal> GlobalName OptGlobalAssign GlobalAssign
@@ -1088,9 +1088,9 @@
 %token X86_SSECALLCC_TOK
 %token DATALAYOUT
 %type <UIntVal> OptCallingConv LocalNumber
-%type <ParamAttrs> OptParamAttrs ParamAttr 
+%type <ParamAttrs> OptParamAttrs ParamAttr
 %type <ParamAttrs> OptFuncAttrs  FuncAttr
-%type <ParamAttrs> OptFuncNotes FuncNote 
+%type <ParamAttrs> OptFuncNotes FuncNote
 %type <ParamAttrs> FuncNoteList
 
 // Basic Block Terminating Operators
@@ -1101,10 +1101,10 @@
 %token <BinaryOpVal> ADD SUB MUL UDIV SDIV FDIV UREM SREM FREM AND OR XOR
 %token <BinaryOpVal> SHL LSHR ASHR
 
-%token <OtherOpVal> ICMP FCMP VICMP VFCMP 
+%token <OtherOpVal> ICMP FCMP VICMP VFCMP
 %type  <IPredicate> IPredicates
 %type  <FPredicate> FPredicates
-%token  EQ NE SLT SGT SLE SGE ULT UGT ULE UGE 
+%token  EQ NE SLT SGT SLE SGE ULT UGT ULE UGE
 %token  OEQ ONE OLT OGT OLE OGE ORD UNO UEQ UNE
 
 // Memory Instructions
@@ -1140,18 +1140,18 @@
 //
 ArithmeticOps: ADD | SUB | MUL | UDIV | SDIV | FDIV | UREM | SREM | FREM;
 LogicalOps   : SHL | LSHR | ASHR | AND | OR | XOR;
-CastOps      : TRUNC | ZEXT | SEXT | FPTRUNC | FPEXT | BITCAST | 
+CastOps      : TRUNC | ZEXT | SEXT | FPTRUNC | FPEXT | BITCAST |
                UITOFP | SITOFP | FPTOUI | FPTOSI | INTTOPTR | PTRTOINT;
 
-IPredicates  
+IPredicates
   : EQ   { $$ = ICmpInst::ICMP_EQ; }  | NE   { $$ = ICmpInst::ICMP_NE; }
   | SLT  { $$ = ICmpInst::ICMP_SLT; } | SGT  { $$ = ICmpInst::ICMP_SGT; }
   | SLE  { $$ = ICmpInst::ICMP_SLE; } | SGE  { $$ = ICmpInst::ICMP_SGE; }
   | ULT  { $$ = ICmpInst::ICMP_ULT; } | UGT  { $$ = ICmpInst::ICMP_UGT; }
-  | ULE  { $$ = ICmpInst::ICMP_ULE; } | UGE  { $$ = ICmpInst::ICMP_UGE; } 
+  | ULE  { $$ = ICmpInst::ICMP_ULE; } | UGE  { $$ = ICmpInst::ICMP_UGE; }
   ;
 
-FPredicates  
+FPredicates
   : OEQ  { $$ = FCmpInst::FCMP_OEQ; } | ONE  { $$ = FCmpInst::FCMP_ONE; }
   | OLT  { $$ = FCmpInst::FCMP_OLT; } | OGT  { $$ = FCmpInst::FCMP_OGT; }
   | OLE  { $$ = FCmpInst::FCMP_OLE; } | OGE  { $$ = FCmpInst::FCMP_OGE; }
@@ -1163,7 +1163,7 @@
   | FALSETOK { $$ = FCmpInst::FCMP_FALSE; }
   ;
 
-// These are some types that allow classification if we only want a particular 
+// These are some types that allow classification if we only want a particular
 // thing... for example, only a signed, unsigned, or integral type.
 IntType :  INTTYPE;
 FPType   : FLOAT | DOUBLE | PPC_FP128 | FP128 | X86_FP80;
@@ -1204,12 +1204,12 @@
     CHECK_FOR_ERROR
   };
 
-GVInternalLinkage 
-  : INTERNAL    { $$ = GlobalValue::InternalLinkage; } 
-  | WEAK        { $$ = GlobalValue::WeakLinkage; } 
+GVInternalLinkage
+  : INTERNAL    { $$ = GlobalValue::InternalLinkage; }
+  | WEAK        { $$ = GlobalValue::WeakLinkage; }
   | LINKONCE    { $$ = GlobalValue::LinkOnceLinkage; }
   | APPENDING   { $$ = GlobalValue::AppendingLinkage; }
-  | DLLEXPORT   { $$ = GlobalValue::DLLExportLinkage; } 
+  | DLLEXPORT   { $$ = GlobalValue::DLLExportLinkage; }
   | COMMON      { $$ = GlobalValue::CommonLinkage; }
   ;
 
@@ -1228,17 +1228,17 @@
 
 FunctionDeclareLinkage
   : /*empty*/   { $$ = GlobalValue::ExternalLinkage; }
-  | DLLIMPORT   { $$ = GlobalValue::DLLImportLinkage; } 
+  | DLLIMPORT   { $$ = GlobalValue::DLLImportLinkage; }
   | EXTERN_WEAK { $$ = GlobalValue::ExternalWeakLinkage; }
   ;
-  
+
 FunctionDefineLinkage
   : /*empty*/   { $$ = GlobalValue::ExternalLinkage; }
   | INTERNAL    { $$ = GlobalValue::InternalLinkage; }
   | LINKONCE    { $$ = GlobalValue::LinkOnceLinkage; }
   | WEAK        { $$ = GlobalValue::WeakLinkage; }
-  | DLLEXPORT   { $$ = GlobalValue::DLLExportLinkage; } 
-  ; 
+  | DLLEXPORT   { $$ = GlobalValue::DLLExportLinkage; }
+  ;
 
 AliasLinkage
   : /*empty*/   { $$ = GlobalValue::ExternalLinkage; }
@@ -1269,7 +1269,7 @@
               | NOALIAS { $$ = ParamAttr::NoAlias;   }
               | BYVAL   { $$ = ParamAttr::ByVal;     }
               | NEST    { $$ = ParamAttr::Nest;      }
-              | ALIGN EUINT64VAL { $$ = 
+              | ALIGN EUINT64VAL { $$ =
                           ParamAttr::constructAlignmentFromInt($2);    }
               ;
 
@@ -1295,16 +1295,16 @@
               ;
 
 FuncNoteList  : FuncNote { $$ = $1; }
-              | FuncNoteList ',' FuncNote { 
+              | FuncNoteList ',' FuncNote {
                 unsigned tmp = $1 | $3;
-                if ($3 == FnAttr::NoInline 
+                if ($3 == FnAttr::NoInline
                     && ($1 & FnAttr::AlwaysInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
-                    if ($3 == FnAttr::AlwaysInline 
+                    if ($3 == FnAttr::AlwaysInline
                         && ($1 & FnAttr::NoInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
                 $$ = tmp;
-                CHECK_FOR_ERROR 
+                CHECK_FOR_ERROR
               }
               ;
 
@@ -1364,7 +1364,7 @@
     CurGV->setSection(*$1);
     delete $1;
     CHECK_FOR_ERROR
-  } 
+  }
   | ALIGN EUINT64VAL {
     if ($2 != 0 && !isPowerOf2_32($2))
       GEN_ERROR("Alignment must be a power of two");
@@ -1374,13 +1374,13 @@
 
 //===----------------------------------------------------------------------===//
 // Types includes all predefined types... except void, because it can only be
-// used in specific contexts (function returning void for example).  
+// used in specific contexts (function returning void for example).
 
 // Derived types are added later...
 //
 PrimType : INTTYPE | FLOAT | DOUBLE | PPC_FP128 | FP128 | X86_FP80 | LABEL ;
 
-Types 
+Types
   : OPAQUE {
     $$ = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
@@ -1415,7 +1415,7 @@
     const Type *RetTy = *$1;
     if (!FunctionType::isValidReturnType(RetTy))
       GEN_ERROR("Invalid result type for LLVM function");
-      
+
     std::vector<const Type*> Params;
     TypeWithAttrsList::iterator I = $3->begin(), E = $3->end();
     for (; I != E; ++I ) {
@@ -1435,7 +1435,7 @@
     FunctionType *FT = FunctionType::get(RetTy, Params, isVarArg);
     delete $3;   // Delete the argument list
     delete $1;   // Delete the return type handle
-    $$ = new PATypeHolder(HandleUpRefs(FT)); 
+    $$ = new PATypeHolder(HandleUpRefs(FT));
     CHECK_FOR_ERROR
   }
   | VOID '(' ArgTypeListI ')' OptFuncAttrs {
@@ -1459,7 +1459,7 @@
 
     FunctionType *FT = FunctionType::get($1, Params, isVarArg);
     delete $3;      // Delete the argument list
-    $$ = new PATypeHolder(HandleUpRefs(FT)); 
+    $$ = new PATypeHolder(HandleUpRefs(FT));
     CHECK_FOR_ERROR
   }
 
@@ -1508,11 +1508,11 @@
   }
   ;
 
-ArgType 
+ArgType
   : Types OptParamAttrs {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
-    $$.Ty = $1; 
+    $$.Ty = $1;
     $$.Attrs = ParamAttr::None;
   }
   ;
@@ -1541,7 +1541,7 @@
   }
   ;
 
-ArgTypeListI 
+ArgTypeListI
   : ArgTypeList
   | ArgTypeList ',' DOTDOTDOT {
     $$=$1;
@@ -1562,17 +1562,17 @@
     CHECK_FOR_ERROR
   };
 
-// TypeList - Used for struct declarations and as a basis for function type 
+// TypeList - Used for struct declarations and as a basis for function type
 // declaration type lists
 //
 TypeListI : Types {
     $$ = new std::list<PATypeHolder>();
-    $$->push_back(*$1); 
+    $$->push_back(*$1);
     delete $1;
     CHECK_FOR_ERROR
   }
   | TypeListI ',' Types {
-    ($$=$1)->push_back(*$3); 
+    ($$=$1)->push_back(*$3);
     delete $3;
     CHECK_FOR_ERROR
   };
@@ -1588,7 +1588,7 @@
       GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
     const ArrayType *ATy = dyn_cast<ArrayType>($1->get());
     if (ATy == 0)
-      GEN_ERROR("Cannot make array constant with type: '" + 
+      GEN_ERROR("Cannot make array constant with type: '" +
                      (*$1)->getDescription() + "'");
     const Type *ETy = ATy->getElementType();
     uint64_t NumElements = ATy->getNumElements();
@@ -1596,13 +1596,13 @@
     // Verify that we have the correct size...
     if (NumElements != uint64_t(-1) && NumElements != $3->size())
       GEN_ERROR("Type mismatch: constant sized array initialized with " +
-                     utostr($3->size()) +  " arguments, but has size of " + 
+                     utostr($3->size()) +  " arguments, but has size of " +
                      utostr(NumElements) + "");
 
     // Verify all elements are correct type!
     for (unsigned i = 0; i < $3->size(); i++) {
       if (ETy != (*$3)[i]->getType())
-        GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
+        GEN_ERROR("Element #" + utostr(i) + " is not of type '" +
                        ETy->getDescription() +"' as required!\nIt is of type '"+
                        (*$3)[i]->getType()->getDescription() + "'.");
     }
@@ -1616,11 +1616,11 @@
       GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
     const ArrayType *ATy = dyn_cast<ArrayType>($1->get());
     if (ATy == 0)
-      GEN_ERROR("Cannot make array constant with type: '" + 
+      GEN_ERROR("Cannot make array constant with type: '" +
                      (*$1)->getDescription() + "'");
 
     uint64_t NumElements = ATy->getNumElements();
-    if (NumElements != uint64_t(-1) && NumElements != 0) 
+    if (NumElements != uint64_t(-1) && NumElements != 0)
       GEN_ERROR("Type mismatch: constant sized array initialized with 0"
                      " arguments, but has size of " + utostr(NumElements) +"");
     $$ = ConstantArray::get(ATy, std::vector<Constant*>());
@@ -1632,13 +1632,13 @@
       GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
     const ArrayType *ATy = dyn_cast<ArrayType>($1->get());
     if (ATy == 0)
-      GEN_ERROR("Cannot make array constant with type: '" + 
+      GEN_ERROR("Cannot make array constant with type: '" +
                      (*$1)->getDescription() + "'");
 
     uint64_t NumElements = ATy->getNumElements();
     const Type *ETy = ATy->getElementType();
     if (NumElements != uint64_t(-1) && NumElements != $3->length())
-      GEN_ERROR("Can't build string constant of size " + 
+      GEN_ERROR("Can't build string constant of size " +
                      utostr($3->length()) +
                      " when array has size " + utostr(NumElements) + "");
     std::vector<Constant*> Vals;
@@ -1659,7 +1659,7 @@
       GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
     const VectorType *PTy = dyn_cast<VectorType>($1->get());
     if (PTy == 0)
-      GEN_ERROR("Cannot make packed constant with type: '" + 
+      GEN_ERROR("Cannot make packed constant with type: '" +
                      (*$1)->getDescription() + "'");
     const Type *ETy = PTy->getElementType();
     unsigned NumElements = PTy->getNumElements();
@@ -1667,13 +1667,13 @@
     // Verify that we have the correct size...
     if (NumElements != unsigned(-1) && NumElements != (unsigned)$3->size())
       GEN_ERROR("Type mismatch: constant sized packed initialized with " +
-                     utostr($3->size()) +  " arguments, but has size of " + 
+                     utostr($3->size()) +  " arguments, but has size of " +
                      utostr(NumElements) + "");
 
     // Verify all elements are correct type!
     for (unsigned i = 0; i < $3->size(); i++) {
       if (ETy != (*$3)[i]->getType())
-        GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
+        GEN_ERROR("Element #" + utostr(i) + " is not of type '" +
            ETy->getDescription() +"' as required!\nIt is of type '"+
            (*$3)[i]->getType()->getDescription() + "'.");
     }
@@ -1685,7 +1685,7 @@
   | Types '{' ConstVector '}' {
     const StructType *STy = dyn_cast<StructType>($1->get());
     if (STy == 0)
-      GEN_ERROR("Cannot make struct constant with type: '" + 
+      GEN_ERROR("Cannot make struct constant with type: '" +
                      (*$1)->getDescription() + "'");
 
     if ($3->size() != STy->getNumContainedTypes())
@@ -1713,7 +1713,7 @@
       GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
     const StructType *STy = dyn_cast<StructType>($1->get());
     if (STy == 0)
-      GEN_ERROR("Cannot make struct constant with type: '" + 
+      GEN_ERROR("Cannot make struct constant with type: '" +
                      (*$1)->getDescription() + "'");
 
     if (STy->getNumContainedTypes() != 0)
@@ -1731,7 +1731,7 @@
   | Types '<' '{' ConstVector '}' '>' {
     const StructType *STy = dyn_cast<StructType>($1->get());
     if (STy == 0)
-      GEN_ERROR("Cannot make struct constant with type: '" + 
+      GEN_ERROR("Cannot make struct constant with type: '" +
                      (*$1)->getDescription() + "'");
 
     if ($4->size() != STy->getNumContainedTypes())
@@ -1747,7 +1747,7 @@
 
     // Check to ensure that Type is packed
     if (!STy->isPacked())
-      GEN_ERROR("Vector initializer to non-vector type '" + 
+      GEN_ERROR("Vector initializer to non-vector type '" +
                 STy->getDescription() + "'");
 
     $$ = ConstantStruct::get(STy, *$4);
@@ -1759,7 +1759,7 @@
       GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
     const StructType *STy = dyn_cast<StructType>($1->get());
     if (STy == 0)
-      GEN_ERROR("Cannot make struct constant with type: '" + 
+      GEN_ERROR("Cannot make struct constant with type: '" +
                      (*$1)->getDescription() + "'");
 
     if (STy->getNumContainedTypes() != 0)
@@ -1767,7 +1767,7 @@
 
     // Check to ensure that Type is packed
     if (!STy->isPacked())
-      GEN_ERROR("Vector initializer to non-vector type '" + 
+      GEN_ERROR("Vector initializer to non-vector type '" +
                 STy->getDescription() + "'");
 
     $$ = ConstantStruct::get(STy, std::vector<Constant*>());
@@ -1779,7 +1779,7 @@
       GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
     const PointerType *PTy = dyn_cast<PointerType>($1->get());
     if (PTy == 0)
-      GEN_ERROR("Cannot make null pointer constant with type: '" + 
+      GEN_ERROR("Cannot make null pointer constant with type: '" +
                      (*$1)->getDescription() + "'");
 
     $$ = ConstantPointerNull::get(PTy);
@@ -1826,7 +1826,7 @@
       // First check to see if the forward references value is already created!
       PerModuleInfo::GlobalRefsType::iterator I =
         CurModule.GlobalRefs.find(std::make_pair(PT, $2));
-    
+
       if (I != CurModule.GlobalRefs.end()) {
         V = I->second;             // Placeholder already exists, use it...
         $2.destroy();
@@ -1839,7 +1839,7 @@
 
         // Create the forward referenced global.
         GlobalValue *GV;
-        if (const FunctionType *FTy = 
+        if (const FunctionType *FTy =
                  dyn_cast<FunctionType>(PT->getElementType())) {
           GV = Function::Create(FTy, GlobalValue::ExternalWeakLinkage, Name,
                                 CurModule.CurrentModule);
@@ -1863,7 +1863,7 @@
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
     if ($1->get() != $2->getType())
-      GEN_ERROR("Mismatched types for constant expression: " + 
+      GEN_ERROR("Mismatched types for constant expression: " +
         (*$1)->getDescription() + " and " + $2->getType()->getDescription());
     $$ = $2;
     delete $1;
@@ -1905,7 +1905,7 @@
     uint32_t BitWidth = cast<IntegerType>($1)->getBitWidth();
     if ($2->getBitWidth() > BitWidth) {
       GEN_ERROR("Constant value does not fit in type");
-    } 
+    }
     $2->zextOrTrunc(BitWidth);
     $$ = ConstantInt::get(*$2);
     delete $2;
@@ -1926,7 +1926,7 @@
   | FPType FPVAL {                   // Floating point constants
     if (!ConstantFP::isValueValidForType($1, *$2))
       GEN_ERROR("Floating point constant invalid for type");
-    // Lexer has no type info, so builds all float and double FP constants 
+    // Lexer has no type info, so builds all float and double FP constants
     // as double.  Fix this here.  Long double is done right.
     if (&$2->getSemantics()==&APFloat::IEEEdouble && $1==Type::FloatTy)
       $2->convert(APFloat::IEEEsingle, APFloat::rmNearestTiesToEven);
@@ -1944,7 +1944,7 @@
     if (!CastInst::castIsValid($1, $3, DestTy))
       GEN_ERROR("invalid cast opcode for cast from '" +
                 Val->getType()->getDescription() + "' to '" +
-                DestTy->getDescription() + "'"); 
+                DestTy->getDescription() + "'");
     $$ = ConstantExpr::getCast($1, $3, DestTy);
     delete $5;
   }
@@ -1987,7 +1987,7 @@
     if ($3->getType() != $5->getType())
       GEN_ERROR("Logical operator types must match");
     if (!$3->getType()->isInteger()) {
-      if (!isa<VectorType>($3->getType()) || 
+      if (!isa<VectorType>($3->getType()) ||
           !cast<VectorType>($3->getType())->getElementType()->isInteger())
         GEN_ERROR("Logical operator requires integral operands");
     }
@@ -2065,7 +2065,7 @@
 // GlobalType - Match either GLOBAL or CONSTANT for global declarations...
 GlobalType : GLOBAL { $$ = false; } | CONSTANT { $$ = true; };
 
-// ThreadLocal 
+// ThreadLocal
 ThreadLocal : THREAD_LOCAL { $$ = true; } | { $$ = false; };
 
 // AliaseeRef - Match either GlobalValue or bitcast to GlobalValue.
@@ -2088,7 +2088,7 @@
       GEN_ERROR("invalid cast opcode for cast from '" +
                 Val->getType()->getDescription() + "' to '" +
                 DestTy->getDescription() + "'");
-    
+
     $$ = ConstantExpr::getCast($1, $3, DestTy);
     CHECK_FOR_ERROR
     delete $5;
@@ -2101,7 +2101,7 @@
 // Module rule: Capture the result of parsing the whole file into a result
 // variable...
 //
-Module 
+Module
   : DefinitionList {
     $$ = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -2119,7 +2119,7 @@
   | DefinitionList Definition
   ;
 
-Definition 
+Definition
   : DEFINE { CurFun.isDeclare = false; } Function {
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
@@ -2129,7 +2129,7 @@
   }
   | MODULE ASM_TOK AsmBlock {
     CHECK_FOR_ERROR
-  }  
+  }
   | OptLocalAssign TYPE Types {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*$3)->getDescription());
@@ -2165,10 +2165,10 @@
     }
     CHECK_FOR_ERROR
   }
-  | OptGlobalAssign GVVisibilityStyle ThreadLocal GlobalType ConstVal 
-    OptAddrSpace { 
+  | OptGlobalAssign GVVisibilityStyle ThreadLocal GlobalType ConstVal
+    OptAddrSpace {
     /* "Externally Visible" Linkage */
-    if ($5 == 0) 
+    if ($5 == 0)
       GEN_ERROR("Global value initializer is not a constant");
     CurGV = ParseGlobalVariable($1, GlobalValue::ExternalLinkage,
                                 $2, $4, $5->getType(), $5, $3, $6);
@@ -2178,7 +2178,7 @@
   }
   | OptGlobalAssign GVInternalLinkage GVVisibilityStyle ThreadLocal GlobalType
     ConstVal OptAddrSpace {
-    if ($6 == 0) 
+    if ($6 == 0)
       GEN_ERROR("Global value initializer is not a constant");
     CurGV = ParseGlobalVariable($1, $2, $3, $5, $6->getType(), $6, $4, $7);
     CHECK_FOR_ERROR
@@ -2204,7 +2204,7 @@
     }
     if (Name.empty())
       GEN_ERROR("Alias name cannot be empty");
-    
+
     Constant* Aliasee = $5;
     if (Aliasee == 0)
       GEN_ERROR(std::string("Invalid aliasee for alias: ") + Name);
@@ -2213,16 +2213,16 @@
                                       CurModule.CurrentModule);
     GA->setVisibility($2);
     InsertValue(GA, CurModule.Values);
-    
-    
+
+
     // If there was a forward reference of this alias, resolve it now.
-    
+
     ValID ID;
     if (!Name.empty())
       ID = ValID::createGlobalName(Name);
     else
       ID = ValID::createGlobalID(CurModule.Values.size()-1);
-    
+
     if (GlobalValue *FWGV =
           CurModule.GetForwardRefForGlobal(GA->getType(), ID)) {
       // Replace uses of the fwdref with the actual alias.
@@ -2233,10 +2233,10 @@
         cast<Function>(FWGV)->eraseFromParent();
     }
     ID.destroy();
-    
+
     CHECK_FOR_ERROR
   }
-  | TARGET TargetDefinition { 
+  | TARGET TargetDefinition {
     CHECK_FOR_ERROR
   }
   | DEPLIBS '=' LibrariesDefinition {
@@ -2333,11 +2333,11 @@
     CHECK_FOR_ERROR
   };
 
-FunctionHeaderH : OptCallingConv ResultTypes GlobalName '(' ArgList ')' 
+FunctionHeaderH : OptCallingConv ResultTypes GlobalName '(' ArgList ')'
                   OptFuncAttrs OptSection OptAlign OptGC OptFuncNotes {
   std::string FunctionName(*$3);
   delete $3;  // Free strdup'd memory!
-  
+
   // Check the function result for abstractness if this is a define. We should
   // have no abstract types at this point
   if (!CurFun.isDeclare && CurModule.TypeIsUnresolved($2))
@@ -2345,11 +2345,11 @@
 
   if (!FunctionType::isValidReturnType(*$2))
     GEN_ERROR("Invalid result type for LLVM function");
-    
+
   std::vector<const Type*> ParamTypeList;
-  SmallVector<ParamAttrsWithIndex, 8> Attrs;
+  SmallVector<FnAttributeWithIndex, 8> Attrs;
   if ($7 != ParamAttr::None)
-    Attrs.push_back(ParamAttrsWithIndex::get(0, $7));
+    Attrs.push_back(FnAttributeWithIndex::get(0, $7));
   if ($5) {   // If there are arguments...
     unsigned index = 1;
     for (ArgListType::iterator I = $5->begin(); I != $5->end(); ++I, ++index) {
@@ -2358,7 +2358,7 @@
         GEN_ERROR("Reference to abstract argument: " + Ty->getDescription());
       ParamTypeList.push_back(Ty);
       if (Ty != Type::VoidTy && I->Attrs != ParamAttr::None)
-        Attrs.push_back(ParamAttrsWithIndex::get(index, I->Attrs));
+        Attrs.push_back(FnAttributeWithIndex::get(index, I->Attrs));
     }
   }
 
@@ -2383,7 +2383,7 @@
   Function *Fn = 0;
   // See if this function was forward referenced.  If so, recycle the object.
   if (GlobalValue *FWRef = CurModule.GetForwardRefForGlobal(PFT, ID)) {
-    // Move the function to the end of the list, from whereever it was 
+    // Move the function to the end of the list, from whereever it was
     // previously inserted.
     Fn = cast<Function>(FWRef);
     assert(Fn->getParamAttrs().isEmpty() &&
@@ -2451,7 +2451,7 @@
     Function::arg_iterator ArgIt = Fn->arg_begin();
     Function::arg_iterator ArgEnd = Fn->arg_end();
     unsigned Idx = 1;
-    for (ArgListType::iterator I = $5->begin(); 
+    for (ArgListType::iterator I = $5->begin();
          I != $5->end() && ArgIt != ArgEnd; ++I, ++ArgIt) {
       delete I->Ty;                          // Delete the typeholder...
       setValueName(ArgIt, I->Name);       // Insert arg into symtab...
@@ -2516,7 +2516,7 @@
     $$ = ValID::create(*$1, true);
     delete $1;
     CHECK_FOR_ERROR
-  }  
+  }
   | EUAPINTVAL {      // arbitrary precision integer constants
     $$ = ValID::create(*$1, false);
     delete $1;
@@ -2529,7 +2529,7 @@
   | TRUETOK {
     $$ = ValID::create(ConstantInt::getTrue());
     CHECK_FOR_ERROR
-  } 
+  }
   | FALSETOK {
     $$ = ValID::create(ConstantInt::getFalse());
     CHECK_FOR_ERROR
@@ -2548,18 +2548,18 @@
   }
   | '<' ConstVector '>' { // Nonempty unsized packed vector
     const Type *ETy = (*$2)[0]->getType();
-    unsigned NumElements = $2->size(); 
+    unsigned NumElements = $2->size();
 
     if (!ETy->isInteger() && !ETy->isFloatingPoint())
       GEN_ERROR("Invalid vector element type: " + ETy->getDescription());
-    
+
     VectorType* pt = VectorType::get(ETy, NumElements);
     PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(pt));
-    
+
     // Verify all elements are correct type!
     for (unsigned i = 0; i < $2->size(); i++) {
       if (ETy != (*$2)[i]->getType())
-        GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
+        GEN_ERROR("Element #" + utostr(i) + " is not of type '" +
                      ETy->getDescription() +"' as required!\nIt is of type '" +
                      (*$2)[i]->getType()->getDescription() + "'.");
     }
@@ -2570,7 +2570,7 @@
   }
   | '[' ConstVector ']' { // Nonempty unsized arr
     const Type *ETy = (*$2)[0]->getType();
-    uint64_t NumElements = $2->size(); 
+    uint64_t NumElements = $2->size();
 
     if (!ETy->isFirstClassType())
       GEN_ERROR("Invalid array element type: " + ETy->getDescription());
@@ -2581,7 +2581,7 @@
     // Verify all elements are correct type!
     for (unsigned i = 0; i < $2->size(); i++) {
       if (ETy != (*$2)[i]->getType())
-        GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
+        GEN_ERROR("Element #" + utostr(i) + " is not of type '" +
                        ETy->getDescription() +"' as required!\nIt is of type '"+
                        (*$2)[i]->getType()->getDescription() + "'.");
     }
@@ -2687,7 +2687,7 @@
 ResolvedVal : Types ValueRef {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
-    $$ = getVal(*$1, $2); 
+    $$ = getVal(*$1, $2);
     delete $1;
     CHECK_FOR_ERROR
   }
@@ -2695,11 +2695,11 @@
 
 ReturnedVal : ResolvedVal {
     $$ = new std::vector<Value *>();
-    $$->push_back($1); 
+    $$->push_back($1);
     CHECK_FOR_ERROR
   }
   | ReturnedVal ',' ResolvedVal {
-    ($$=$1)->push_back($3); 
+    ($$=$1)->push_back($3);
     CHECK_FOR_ERROR
   };
 
@@ -2707,13 +2707,13 @@
     $$ = $1;
     CHECK_FOR_ERROR
   }
-  | FunctionHeader BasicBlock { // Do not allow functions with 0 basic blocks   
+  | FunctionHeader BasicBlock { // Do not allow functions with 0 basic blocks
     $$ = $1;
     CHECK_FOR_ERROR
   };
 
 
-// Basic blocks are terminated by branching instructions: 
+// Basic blocks are terminated by branching instructions:
 // br, br/cc, switch, ret
 //
 BasicBlock : InstructionList OptLocalAssign BBTerminatorInst {
@@ -2731,7 +2731,7 @@
   if (ValNum != (int)$2)
     GEN_ERROR("Result value number %" + utostr($2) +
               " is incorrect, expected %" + utostr((unsigned)ValNum));
-  
+
   $1->getInstList().push_back($3);
   $$ = $1;
   CHECK_FOR_ERROR
@@ -2758,7 +2758,7 @@
 
   };
 
-BBTerminatorInst : 
+BBTerminatorInst :
   RET ReturnedVal  { // Return with a result...
     ValueList &VL = *$2;
     assert(!VL.empty() && "Invalid ret operands!");
@@ -2788,7 +2788,7 @@
     CHECK_FOR_ERROR
     $$ = BranchInst::Create(tmpBB);
   }                                               // Conditional Branch...
-  | BR INTTYPE ValueRef ',' LABEL ValueRef ',' LABEL ValueRef {  
+  | BR INTTYPE ValueRef ',' LABEL ValueRef ',' LABEL ValueRef {
     if (cast<IntegerType>($2)->getBitWidth() != 1)
       GEN_ERROR("Branch condition must have type i1");
     BasicBlock* tmpBBA = getBBVal($6);
@@ -2844,7 +2844,7 @@
           GEN_ERROR("Short call syntax cannot be used with varargs");
         ParamTypes.push_back(Ty);
       }
-      
+
       if (!FunctionType::isValidReturnType(*$3))
         GEN_ERROR("Invalid result type for LLVM function");
 
@@ -2861,9 +2861,9 @@
     BasicBlock *Except = getBBVal($14);
     CHECK_FOR_ERROR
 
-    SmallVector<ParamAttrsWithIndex, 8> Attrs;
+    SmallVector<FnAttributeWithIndex, 8> Attrs;
     if ($8 != ParamAttr::None)
-      Attrs.push_back(ParamAttrsWithIndex::get(0, $8));
+      Attrs.push_back(FnAttributeWithIndex::get(0, $8));
 
     // Check the arguments
     ValueList Args;
@@ -2886,7 +2886,7 @@
                          (*I)->getDescription() + "'");
         Args.push_back(ArgI->Val);
         if (ArgI->Attrs != ParamAttr::None)
-          Attrs.push_back(ParamAttrsWithIndex::get(index, ArgI->Attrs));
+          Attrs.push_back(FnAttributeWithIndex::get(index, ArgI->Attrs));
       }
 
       if (Ty->isVarArg()) {
@@ -2894,7 +2894,7 @@
           for (; ArgI != ArgE; ++ArgI, ++index) {
             Args.push_back(ArgI->Val); // push the remaining varargs
             if (ArgI->Attrs != ParamAttr::None)
-              Attrs.push_back(ParamAttrsWithIndex::get(index, ArgI->Attrs));
+              Attrs.push_back(FnAttributeWithIndex::get(index, ArgI->Attrs));
           }
       } else if (I != E || ArgI != ArgE)
         GEN_ERROR("Invalid number of parameters detected");
@@ -2945,7 +2945,7 @@
 
     BasicBlock* tmpBB = getBBVal($5);
     CHECK_FOR_ERROR
-    $$->push_back(std::make_pair(V, tmpBB)); 
+    $$->push_back(std::make_pair(V, tmpBB));
   };
 
 Inst : OptLocalAssign InstVal {
@@ -2960,7 +2960,7 @@
 Inst : LocalNumber InstVal {
     CHECK_FOR_ERROR
     int ValNum = InsertValue($2);
-  
+
     if (ValNum != (int)$1)
       GEN_ERROR("Result value number %" + utostr($1) +
                 " is incorrect, expected %" + utostr((unsigned)ValNum));
@@ -3066,11 +3066,11 @@
 InstVal : ArithmeticOps Types ValueRef ',' ValueRef {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*$2)->getDescription());
-    if (!(*$2)->isInteger() && !(*$2)->isFloatingPoint() && 
+    if (!(*$2)->isInteger() && !(*$2)->isFloatingPoint() &&
         !isa<VectorType>((*$2).get()))
       GEN_ERROR(
         "Arithmetic operator requires integer, FP, or packed operands");
-    Value* val1 = getVal(*$2, $3); 
+    Value* val1 = getVal(*$2, $3);
     CHECK_FOR_ERROR
     Value* val2 = getVal(*$2, $5);
     CHECK_FOR_ERROR
@@ -3156,7 +3156,7 @@
     if (!CastInst::castIsValid($1, Val, DestTy))
       GEN_ERROR("invalid cast opcode for cast from '" +
                 Val->getType()->getDescription() + "' to '" +
-                DestTy->getDescription() + "'"); 
+                DestTy->getDescription() + "'");
     $$ = CastInst::Create($1, Val, DestTy);
     delete $4;
   }
@@ -3213,7 +3213,7 @@
     $$ = PHINode::Create(Ty);
     ((PHINode*)$$)->reserveOperandSpace($2->size());
     while ($2->begin() != $2->end()) {
-      if ($2->front().first->getType() != Ty) 
+      if ($2->front().first->getType() != Ty)
         GEN_ERROR("All elements of a PHI node must be of the same type");
       cast<PHINode>($$)->addIncoming($2->front().first, $2->front().second);
       $2->pop_front();
@@ -3221,7 +3221,7 @@
     delete $2;  // Free the list...
     CHECK_FOR_ERROR
   }
-  | OptTailCall OptCallingConv ResultTypes ValueRef '(' ParamList ')' 
+  | OptTailCall OptCallingConv ResultTypes ValueRef '(' ParamList ')'
     OptFuncAttrs {
 
     // Handle the short syntax
@@ -3259,10 +3259,10 @@
     }
 
     // Set up the ParamAttrs for the function
-    SmallVector<ParamAttrsWithIndex, 8> Attrs;
+    SmallVector<FnAttributeWithIndex, 8> Attrs;
     if ($8 != ParamAttr::None)
-      Attrs.push_back(ParamAttrsWithIndex::get(0, $8));
-    // Check the arguments 
+      Attrs.push_back(FnAttributeWithIndex::get(0, $8));
+    // Check the arguments
     ValueList Args;
     if ($6->empty()) {                                   // Has no arguments?
       // Make sure no arguments is a good thing!
@@ -3283,14 +3283,14 @@
                          (*I)->getDescription() + "'");
         Args.push_back(ArgI->Val);
         if (ArgI->Attrs != ParamAttr::None)
-          Attrs.push_back(ParamAttrsWithIndex::get(index, ArgI->Attrs));
+          Attrs.push_back(FnAttributeWithIndex::get(index, ArgI->Attrs));
       }
       if (Ty->isVarArg()) {
         if (I == E)
           for (; ArgI != ArgE; ++ArgI, ++index) {
             Args.push_back(ArgI->Val); // push the remaining varargs
             if (ArgI->Attrs != ParamAttr::None)
-              Attrs.push_back(ParamAttrsWithIndex::get(index, ArgI->Attrs));
+              Attrs.push_back(FnAttributeWithIndex::get(index, ArgI->Attrs));
           }
       } else if (I != E || ArgI != ArgE)
         GEN_ERROR("Invalid number of parameters detected");
@@ -3363,7 +3363,7 @@
   }
   | FREE ResolvedVal {
     if (!isa<PointerType>($2->getType()))
-      GEN_ERROR("Trying to free nonpointer type " + 
+      GEN_ERROR("Trying to free nonpointer type " +
                      $2->getType()->getDescription() + "");
     $$ = new FreeInst($2);
     CHECK_FOR_ERROR
@@ -3426,7 +3426,7 @@
     Value* tmpVal = getVal(*$2, $3);
     CHECK_FOR_ERROR
     $$ = GetElementPtrInst::Create(tmpVal, $4->begin(), $4->end());
-    delete $2; 
+    delete $2;
     delete $4;
   }
   | EXTRACTVALUE Types ValueRef ConstantIndexList {
@@ -3441,7 +3441,7 @@
     Value* tmpVal = getVal(*$2, $3);
     CHECK_FOR_ERROR
     $$ = ExtractValueInst::Create(tmpVal, $4->begin(), $4->end());
-    delete $2; 
+    delete $2;
     delete $4;
   }
   | INSERTVALUE Types ValueRef ',' Types ValueRef ConstantIndexList {
@@ -3457,7 +3457,7 @@
     Value* tmpVal = getVal(*$5, $6);
     CHECK_FOR_ERROR
     $$ = InsertValueInst::Create(aggVal, tmpVal, $7->begin(), $7->end());
-    delete $2; 
+    delete $2;
     delete $5;
     delete $7;
   };
@@ -3531,7 +3531,7 @@
   std::string errMsg = where + "error: " + std::string(ErrorMsg);
   if (yychar != YYEMPTY && yychar != 0) {
     errMsg += " while reading token: '";
-    errMsg += std::string(LLLgetTokenStart(), 
+    errMsg += std::string(LLLgetTokenStart(),
                           LLLgetTokenStart()+LLLgetTokenLength()) + "'";
   }
   GenerateError(errMsg);

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

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs Tue Sep 23 23:55:49 2008
@@ -33,13 +33,13 @@
 // 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
 // an error situation. So, whenever we want an error to occur, the GenerateError
-// function (see bottom of file) sets TriggerError. Then, at the end of each 
-// production in the grammer we use CHECK_FOR_ERROR which will invoke YYERROR 
-// (a goto) to put YACC in error state. Furthermore, several calls to 
+// function (see bottom of file) sets TriggerError. Then, at the end of each
+// production in the grammer we use CHECK_FOR_ERROR which will invoke YYERROR
+// (a goto) to put YACC in error state. Furthermore, several calls to
 // GenerateError are made from inside productions and they must simulate the
 // previous exception behavior by exiting the production immediately. We have
 // replaced these with the GEN_ERROR macro which calls GeneratError and then
-// immediately invokes YYERROR. This would be so much cleaner if it was a 
+// immediately invokes YYERROR. This would be so much cleaner if it was a
 // recursive descent parser.
 static bool TriggerError = false;
 #define CHECK_FOR_ERROR { if (TriggerError) { TriggerError = false; YYABORT; } }
@@ -72,7 +72,7 @@
 //
 typedef std::vector<Value *> ValueList;           // Numbered defs
 
-static void 
+static void
 ResolveDefinitions(ValueList &LateResolvers, ValueList *FutureLateResolvers=0);
 
 static struct PerModuleInfo {
@@ -151,7 +151,7 @@
     if (!Ty->isAbstract())
       return false;
     // Traverse the type looking for abstract types. If it isn't abstract then
-    // we don't need to traverse that leg of the type. 
+    // we don't need to traverse that leg of the type.
     std::vector<const Type*> WorkList, SeenList;
     WorkList.push_back(Ty);
     while (!WorkList.empty()) {
@@ -169,7 +169,7 @@
       } else if (const SequentialType* SeqTy = dyn_cast<SequentialType>(Ty)) {
         const Type* TheTy = SeqTy->getElementType();
         if (TheTy->isAbstract() && TheTy != Ty) {
-          std::vector<const Type*>::iterator I = SeenList.begin(), 
+          std::vector<const Type*>::iterator I = SeenList.begin(),
                                              E = SeenList.end();
           for ( ; I != E; ++I)
             if (*I == TheTy)
@@ -181,7 +181,7 @@
         for (unsigned i = 0; i < StrTy->getNumElements(); ++i) {
           const Type* TheTy = StrTy->getElementType(i);
           if (TheTy->isAbstract() && TheTy != Ty) {
-            std::vector<const Type*>::iterator I = SeenList.begin(), 
+            std::vector<const Type*>::iterator I = SeenList.begin(),
                                                E = SeenList.end();
             for ( ; I != E; ++I)
               if (*I == TheTy)
@@ -258,14 +258,14 @@
 
   // In the case of function values, we have to allow for the forward reference
   // of basic blocks, which are included in the numbering. Consequently, we keep
-  // track of the next insertion location with NextValNum. When a BB gets 
+  // track of the next insertion location with NextValNum. When a BB gets
   // inserted, it could change the size of the CurFun.Values vector.
   if (&ValueTab == &CurFun.Values) {
     if (ValueTab.size() <= CurFun.NextValNum)
       ValueTab.resize(CurFun.NextValNum+1);
     ValueTab[CurFun.NextValNum++] = V;
     return CurFun.NextValNum-1;
-  } 
+  }
   // For all other lists, its okay to just tack it on the back of the vector.
   ValueTab.push_back(V);
   return ValueTab.size()-1;
@@ -329,47 +329,47 @@
   switch (D.Type) {
   case ValID::LocalID: {                 // Is it a numbered definition?
     // Check that the number is within bounds.
-    if (D.Num >= CurFun.Values.size()) 
+    if (D.Num >= CurFun.Values.size())
       return 0;
     Value *Result = CurFun.Values[D.Num];
     if (Ty != Result->getType()) {
       GenerateError("Numbered value (%" + utostr(D.Num) + ") of type '" +
-                    Result->getType()->getDescription() + "' does not match " 
+                    Result->getType()->getDescription() + "' does not match "
                     "expected type, '" + Ty->getDescription() + "'");
       return 0;
     }
     return Result;
   }
   case ValID::GlobalID: {                 // Is it a numbered definition?
-    if (D.Num >= CurModule.Values.size()) 
+    if (D.Num >= CurModule.Values.size())
       return 0;
     Value *Result = CurModule.Values[D.Num];
     if (Ty != Result->getType()) {
       GenerateError("Numbered value (@" + utostr(D.Num) + ") of type '" +
-                    Result->getType()->getDescription() + "' does not match " 
+                    Result->getType()->getDescription() + "' does not match "
                     "expected type, '" + Ty->getDescription() + "'");
       return 0;
     }
     return Result;
   }
-    
+
   case ValID::LocalName: {                // Is it a named definition?
-    if (!inFunctionScope()) 
+    if (!inFunctionScope())
       return 0;
     ValueSymbolTable &SymTab = CurFun.CurrentFunction->getValueSymbolTable();
     Value *N = SymTab.lookup(D.getName());
-    if (N == 0) 
+    if (N == 0)
       return 0;
     if (N->getType() != Ty)
       return 0;
-    
+
     D.destroy();  // Free old strdup'd memory...
     return N;
   }
   case ValID::GlobalName: {                // Is it a named definition?
     ValueSymbolTable &SymTab = CurModule.CurrentModule->getValueSymbolTable();
     Value *N = SymTab.lookup(D.getName());
-    if (N == 0) 
+    if (N == 0)
       return 0;
     if (N->getType() != Ty)
       return 0;
@@ -412,20 +412,20 @@
                     Ty->getDescription() + "'");
       return 0;
     }
-      
+
     {
       APSInt Tmp = *D.ConstPoolInt;
       Tmp.extOrTrunc(Ty->getPrimitiveSizeInBits());
       return ConstantInt::get(Tmp);
     }
-      
+
   case ValID::ConstFPVal:        // Is it a floating point const pool reference?
     if (!Ty->isFloatingPoint() ||
         !ConstantFP::isValueValidForType(Ty, *D.ConstPoolFP)) {
       GenerateError("FP constant invalid for type");
       return 0;
     }
-    // Lexer has no type info, so builds all float and double FP constants 
+    // Lexer has no type info, so builds all float and double FP constants
     // as double.  Fix this here.  Long double does not need this.
     if (&D.ConstPoolFP->getSemantics() == &APFloat::IEEEdouble &&
         Ty==Type::FloatTy)
@@ -444,7 +444,7 @@
 
   case ValID::ConstZeroVal:      // Is it a zero value?
     return Constant::getNullValue(Ty);
-    
+
   case ValID::ConstantVal:       // Fully resolved constant?
     if (D.ConstantValue->getType() != Ty) {
       GenerateError("Constant expression type different from required type");
@@ -519,7 +519,7 @@
   default:
    V = new Argument(Ty);
   }
-  
+
   // 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,
@@ -555,7 +555,7 @@
     // Erase the forward ref from the map as its no longer "forward"
     CurFun.BBForwardRefs.erase(ID);
 
-    // The key has been removed from the map but so we don't want to leave 
+    // The key has been removed from the map but so we don't want to leave
     // strdup'd memory around so destroy it too.
     Tmp.destroy();
 
@@ -564,8 +564,8 @@
       assert(ID.Num == CurFun.NextValNum && "Invalid new block number");
       InsertValue(BB);
     }
-  } else { 
-    // We haven't seen this BB before and its first mention is a definition. 
+  } else {
+    // We haven't seen this BB before and its first mention is a definition.
     // Just create it and return it.
     std::string Name (ID.Type == ValID::LocalName ? ID.getName() : "");
     BB = BasicBlock::Create(Name, CurFun.CurrentFunction);
@@ -580,7 +580,7 @@
 }
 
 /// getBBVal - get an existing BB value or create a forward reference for it.
-/// 
+///
 static BasicBlock *getBBVal(const ValID &ID) {
   assert(inFunctionScope() && "Can't get basic block at global scope!");
 
@@ -604,8 +604,8 @@
       if (CurFun.Values[ID.Num]->getType()->getTypeID() == Type::LabelTyID)
         BB = cast<BasicBlock>(CurFun.Values[ID.Num]);
       else
-        GenerateError("Reference to label '%" + utostr(ID.Num) + 
-          "' is actually of type '"+ 
+        GenerateError("Reference to label '%" + utostr(ID.Num) +
+          "' is actually of type '"+
           CurFun.Values[ID.Num]->getType()->getDescription() + "'");
     }
   } else {
@@ -648,7 +648,7 @@
 // time (forward branches, phi functions for loops, etc...) resolve the
 // defs now...
 //
-static void 
+static void
 ResolveDefinitions(ValueList &LateResolvers, ValueList *FutureLateResolvers) {
   // Loop over LateResolveDefs fixing up stuff that couldn't be resolved
   while (!LateResolvers.empty()) {
@@ -698,7 +698,7 @@
   ValID D;
   if (Name)
     D = ValID::createLocalName(*Name);
-  else      
+  else
     D = ValID::createLocalID(CurModule.Types.size());
 
   std::map<ValID, PATypeHolder>::iterator I =
@@ -821,7 +821,7 @@
 static bool setTypeName(const Type *T, std::string *NameStr) {
   assert(!inFunctionScope() && "Can't give types function-local names!");
   if (NameStr == 0) return false;
- 
+
   std::string Name(*NameStr);      // Copy string
   delete NameStr;                  // Free old string
 
@@ -904,7 +904,7 @@
   // If Ty isn't abstract, or if there are no up-references in it, then there is
   // nothing to resolve here.
   if (!ty->isAbstract() || UpRefs.empty()) return ty;
-  
+
   PATypeHolder Ty(ty);
   UR_OUT("Type '" << Ty->getDescription() <<
          "' newly formed.  Resolving upreferences.\n" <<
@@ -1015,7 +1015,7 @@
   llvm::FCmpInst::Predicate         FPredicate;
 }
 
-%type <ModuleVal>     Module 
+%type <ModuleVal>     Module
 %type <FunctionVal>   Function FunctionProto FunctionHeader BasicBlockList
 %type <BasicBlockVal> BasicBlock InstructionList
 %type <TermInstVal>   BBTerminatorInst
@@ -1027,7 +1027,7 @@
 %type <ParamList>     ParamList      // For call param lists & GEP indices
 %type <ValueList>     IndexList         // For GEP indices
 %type <ConstantList>  ConstantIndexList // For insertvalue/extractvalue indices
-%type <TypeList>      TypeListI 
+%type <TypeList>      TypeListI
 %type <TypeWithAttrsList> ArgTypeList ArgTypeListI
 %type <TypeWithAttrs> ArgType
 %type <JumpTable>     JumpTable
@@ -1053,10 +1053,10 @@
 // EUINT64VAL - A positive number within uns. long long range
 %token <UInt64Val> EUINT64VAL
 
-// ESAPINTVAL - A negative number with arbitrary precision 
+// ESAPINTVAL - A negative number with arbitrary precision
 %token <APIntVal>  ESAPINTVAL
 
-// EUAPINTVAL - A positive number with arbitrary precision 
+// EUAPINTVAL - A positive number with arbitrary precision
 %token <APIntVal>  EUAPINTVAL
 
 %token  <UIntVal>   LOCALVAL_ID GLOBALVAL_ID  // %123 @123
@@ -1065,12 +1065,12 @@
 // Built in types...
 %type  <TypeVal> Types ResultTypes
 %type  <PrimType> IntType FPType PrimType           // Classifications
-%token <PrimType> VOID INTTYPE 
+%token <PrimType> VOID INTTYPE
 %token <PrimType> FLOAT DOUBLE X86_FP80 FP128 PPC_FP128 LABEL
 %token TYPE
 
 
-%token<StrVal> LOCALVAR GLOBALVAR LABELSTR 
+%token<StrVal> LOCALVAR GLOBALVAR LABELSTR
 %token<StrVal> STRINGCONSTANT ATSTRINGCONSTANT PCTSTRINGCONSTANT
 %type <StrVal> LocalName OptLocalName OptLocalAssign
 %type <StrVal> GlobalName OptGlobalAssign GlobalAssign
@@ -1088,9 +1088,9 @@
 %token X86_SSECALLCC_TOK
 %token DATALAYOUT
 %type <UIntVal> OptCallingConv LocalNumber
-%type <ParamAttrs> OptParamAttrs ParamAttr 
+%type <ParamAttrs> OptParamAttrs ParamAttr
 %type <ParamAttrs> OptFuncAttrs  FuncAttr
-%type <ParamAttrs> OptFuncNotes FuncNote 
+%type <ParamAttrs> OptFuncNotes FuncNote
 %type <ParamAttrs> FuncNoteList
 
 // Basic Block Terminating Operators
@@ -1101,10 +1101,10 @@
 %token <BinaryOpVal> ADD SUB MUL UDIV SDIV FDIV UREM SREM FREM AND OR XOR
 %token <BinaryOpVal> SHL LSHR ASHR
 
-%token <OtherOpVal> ICMP FCMP VICMP VFCMP 
+%token <OtherOpVal> ICMP FCMP VICMP VFCMP
 %type  <IPredicate> IPredicates
 %type  <FPredicate> FPredicates
-%token  EQ NE SLT SGT SLE SGE ULT UGT ULE UGE 
+%token  EQ NE SLT SGT SLE SGE ULT UGT ULE UGE
 %token  OEQ ONE OLT OGT OLE OGE ORD UNO UEQ UNE
 
 // Memory Instructions
@@ -1140,18 +1140,18 @@
 //
 ArithmeticOps: ADD | SUB | MUL | UDIV | SDIV | FDIV | UREM | SREM | FREM;
 LogicalOps   : SHL | LSHR | ASHR | AND | OR | XOR;
-CastOps      : TRUNC | ZEXT | SEXT | FPTRUNC | FPEXT | BITCAST | 
+CastOps      : TRUNC | ZEXT | SEXT | FPTRUNC | FPEXT | BITCAST |
                UITOFP | SITOFP | FPTOUI | FPTOSI | INTTOPTR | PTRTOINT;
 
-IPredicates  
+IPredicates
   : EQ   { $$ = ICmpInst::ICMP_EQ; }  | NE   { $$ = ICmpInst::ICMP_NE; }
   | SLT  { $$ = ICmpInst::ICMP_SLT; } | SGT  { $$ = ICmpInst::ICMP_SGT; }
   | SLE  { $$ = ICmpInst::ICMP_SLE; } | SGE  { $$ = ICmpInst::ICMP_SGE; }
   | ULT  { $$ = ICmpInst::ICMP_ULT; } | UGT  { $$ = ICmpInst::ICMP_UGT; }
-  | ULE  { $$ = ICmpInst::ICMP_ULE; } | UGE  { $$ = ICmpInst::ICMP_UGE; } 
+  | ULE  { $$ = ICmpInst::ICMP_ULE; } | UGE  { $$ = ICmpInst::ICMP_UGE; }
   ;
 
-FPredicates  
+FPredicates
   : OEQ  { $$ = FCmpInst::FCMP_OEQ; } | ONE  { $$ = FCmpInst::FCMP_ONE; }
   | OLT  { $$ = FCmpInst::FCMP_OLT; } | OGT  { $$ = FCmpInst::FCMP_OGT; }
   | OLE  { $$ = FCmpInst::FCMP_OLE; } | OGE  { $$ = FCmpInst::FCMP_OGE; }
@@ -1163,7 +1163,7 @@
   | FALSETOK { $$ = FCmpInst::FCMP_FALSE; }
   ;
 
-// These are some types that allow classification if we only want a particular 
+// These are some types that allow classification if we only want a particular
 // thing... for example, only a signed, unsigned, or integral type.
 IntType :  INTTYPE;
 FPType   : FLOAT | DOUBLE | PPC_FP128 | FP128 | X86_FP80;
@@ -1204,12 +1204,12 @@
     CHECK_FOR_ERROR
   };
 
-GVInternalLinkage 
-  : INTERNAL    { $$ = GlobalValue::InternalLinkage; } 
-  | WEAK        { $$ = GlobalValue::WeakLinkage; } 
+GVInternalLinkage
+  : INTERNAL    { $$ = GlobalValue::InternalLinkage; }
+  | WEAK        { $$ = GlobalValue::WeakLinkage; }
   | LINKONCE    { $$ = GlobalValue::LinkOnceLinkage; }
   | APPENDING   { $$ = GlobalValue::AppendingLinkage; }
-  | DLLEXPORT   { $$ = GlobalValue::DLLExportLinkage; } 
+  | DLLEXPORT   { $$ = GlobalValue::DLLExportLinkage; }
   | COMMON      { $$ = GlobalValue::CommonLinkage; }
   ;
 
@@ -1228,17 +1228,17 @@
 
 FunctionDeclareLinkage
   : /*empty*/   { $$ = GlobalValue::ExternalLinkage; }
-  | DLLIMPORT   { $$ = GlobalValue::DLLImportLinkage; } 
+  | DLLIMPORT   { $$ = GlobalValue::DLLImportLinkage; }
   | EXTERN_WEAK { $$ = GlobalValue::ExternalWeakLinkage; }
   ;
-  
+
 FunctionDefineLinkage
   : /*empty*/   { $$ = GlobalValue::ExternalLinkage; }
   | INTERNAL    { $$ = GlobalValue::InternalLinkage; }
   | LINKONCE    { $$ = GlobalValue::LinkOnceLinkage; }
   | WEAK        { $$ = GlobalValue::WeakLinkage; }
-  | DLLEXPORT   { $$ = GlobalValue::DLLExportLinkage; } 
-  ; 
+  | DLLEXPORT   { $$ = GlobalValue::DLLExportLinkage; }
+  ;
 
 AliasLinkage
   : /*empty*/   { $$ = GlobalValue::ExternalLinkage; }
@@ -1269,7 +1269,7 @@
               | NOALIAS { $$ = ParamAttr::NoAlias;   }
               | BYVAL   { $$ = ParamAttr::ByVal;     }
               | NEST    { $$ = ParamAttr::Nest;      }
-              | ALIGN EUINT64VAL { $$ = 
+              | ALIGN EUINT64VAL { $$ =
                           ParamAttr::constructAlignmentFromInt($2);    }
               ;
 
@@ -1295,16 +1295,16 @@
               ;
 
 FuncNoteList  : FuncNote { $$ = $1; }
-              | FuncNoteList ',' FuncNote { 
+              | FuncNoteList ',' FuncNote {
                 unsigned tmp = $1 | $3;
-                if ($3 == FnAttr::NoInline 
+                if ($3 == FnAttr::NoInline
                     && ($1 & FnAttr::AlwaysInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
-                    if ($3 == FnAttr::AlwaysInline 
+                    if ($3 == FnAttr::AlwaysInline
                         && ($1 & FnAttr::NoInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
                 $$ = tmp;
-                CHECK_FOR_ERROR 
+                CHECK_FOR_ERROR
               }
               ;
 
@@ -1364,7 +1364,7 @@
     CurGV->setSection(*$1);
     delete $1;
     CHECK_FOR_ERROR
-  } 
+  }
   | ALIGN EUINT64VAL {
     if ($2 != 0 && !isPowerOf2_32($2))
       GEN_ERROR("Alignment must be a power of two");
@@ -1374,13 +1374,13 @@
 
 //===----------------------------------------------------------------------===//
 // Types includes all predefined types... except void, because it can only be
-// used in specific contexts (function returning void for example).  
+// used in specific contexts (function returning void for example).
 
 // Derived types are added later...
 //
 PrimType : INTTYPE | FLOAT | DOUBLE | PPC_FP128 | FP128 | X86_FP80 | LABEL ;
 
-Types 
+Types
   : OPAQUE {
     $$ = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
@@ -1415,7 +1415,7 @@
     const Type *RetTy = *$1;
     if (!FunctionType::isValidReturnType(RetTy))
       GEN_ERROR("Invalid result type for LLVM function");
-      
+
     std::vector<const Type*> Params;
     TypeWithAttrsList::iterator I = $3->begin(), E = $3->end();
     for (; I != E; ++I ) {
@@ -1435,7 +1435,7 @@
     FunctionType *FT = FunctionType::get(RetTy, Params, isVarArg);
     delete $3;   // Delete the argument list
     delete $1;   // Delete the return type handle
-    $$ = new PATypeHolder(HandleUpRefs(FT)); 
+    $$ = new PATypeHolder(HandleUpRefs(FT));
     CHECK_FOR_ERROR
   }
   | VOID '(' ArgTypeListI ')' OptFuncAttrs {
@@ -1459,7 +1459,7 @@
 
     FunctionType *FT = FunctionType::get($1, Params, isVarArg);
     delete $3;      // Delete the argument list
-    $$ = new PATypeHolder(HandleUpRefs(FT)); 
+    $$ = new PATypeHolder(HandleUpRefs(FT));
     CHECK_FOR_ERROR
   }
 
@@ -1508,11 +1508,11 @@
   }
   ;
 
-ArgType 
+ArgType
   : Types OptParamAttrs {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
-    $$.Ty = $1; 
+    $$.Ty = $1;
     $$.Attrs = ParamAttr::None;
   }
   ;
@@ -1541,7 +1541,7 @@
   }
   ;
 
-ArgTypeListI 
+ArgTypeListI
   : ArgTypeList
   | ArgTypeList ',' DOTDOTDOT {
     $$=$1;
@@ -1562,17 +1562,17 @@
     CHECK_FOR_ERROR
   };
 
-// TypeList - Used for struct declarations and as a basis for function type 
+// TypeList - Used for struct declarations and as a basis for function type
 // declaration type lists
 //
 TypeListI : Types {
     $$ = new std::list<PATypeHolder>();
-    $$->push_back(*$1); 
+    $$->push_back(*$1);
     delete $1;
     CHECK_FOR_ERROR
   }
   | TypeListI ',' Types {
-    ($$=$1)->push_back(*$3); 
+    ($$=$1)->push_back(*$3);
     delete $3;
     CHECK_FOR_ERROR
   };
@@ -1588,7 +1588,7 @@
       GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
     const ArrayType *ATy = dyn_cast<ArrayType>($1->get());
     if (ATy == 0)
-      GEN_ERROR("Cannot make array constant with type: '" + 
+      GEN_ERROR("Cannot make array constant with type: '" +
                      (*$1)->getDescription() + "'");
     const Type *ETy = ATy->getElementType();
     uint64_t NumElements = ATy->getNumElements();
@@ -1596,13 +1596,13 @@
     // Verify that we have the correct size...
     if (NumElements != uint64_t(-1) && NumElements != $3->size())
       GEN_ERROR("Type mismatch: constant sized array initialized with " +
-                     utostr($3->size()) +  " arguments, but has size of " + 
+                     utostr($3->size()) +  " arguments, but has size of " +
                      utostr(NumElements) + "");
 
     // Verify all elements are correct type!
     for (unsigned i = 0; i < $3->size(); i++) {
       if (ETy != (*$3)[i]->getType())
-        GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
+        GEN_ERROR("Element #" + utostr(i) + " is not of type '" +
                        ETy->getDescription() +"' as required!\nIt is of type '"+
                        (*$3)[i]->getType()->getDescription() + "'.");
     }
@@ -1616,11 +1616,11 @@
       GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
     const ArrayType *ATy = dyn_cast<ArrayType>($1->get());
     if (ATy == 0)
-      GEN_ERROR("Cannot make array constant with type: '" + 
+      GEN_ERROR("Cannot make array constant with type: '" +
                      (*$1)->getDescription() + "'");
 
     uint64_t NumElements = ATy->getNumElements();
-    if (NumElements != uint64_t(-1) && NumElements != 0) 
+    if (NumElements != uint64_t(-1) && NumElements != 0)
       GEN_ERROR("Type mismatch: constant sized array initialized with 0"
                      " arguments, but has size of " + utostr(NumElements) +"");
     $$ = ConstantArray::get(ATy, std::vector<Constant*>());
@@ -1632,13 +1632,13 @@
       GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
     const ArrayType *ATy = dyn_cast<ArrayType>($1->get());
     if (ATy == 0)
-      GEN_ERROR("Cannot make array constant with type: '" + 
+      GEN_ERROR("Cannot make array constant with type: '" +
                      (*$1)->getDescription() + "'");
 
     uint64_t NumElements = ATy->getNumElements();
     const Type *ETy = ATy->getElementType();
     if (NumElements != uint64_t(-1) && NumElements != $3->length())
-      GEN_ERROR("Can't build string constant of size " + 
+      GEN_ERROR("Can't build string constant of size " +
                      utostr($3->length()) +
                      " when array has size " + utostr(NumElements) + "");
     std::vector<Constant*> Vals;
@@ -1659,7 +1659,7 @@
       GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
     const VectorType *PTy = dyn_cast<VectorType>($1->get());
     if (PTy == 0)
-      GEN_ERROR("Cannot make packed constant with type: '" + 
+      GEN_ERROR("Cannot make packed constant with type: '" +
                      (*$1)->getDescription() + "'");
     const Type *ETy = PTy->getElementType();
     unsigned NumElements = PTy->getNumElements();
@@ -1667,13 +1667,13 @@
     // Verify that we have the correct size...
     if (NumElements != unsigned(-1) && NumElements != (unsigned)$3->size())
       GEN_ERROR("Type mismatch: constant sized packed initialized with " +
-                     utostr($3->size()) +  " arguments, but has size of " + 
+                     utostr($3->size()) +  " arguments, but has size of " +
                      utostr(NumElements) + "");
 
     // Verify all elements are correct type!
     for (unsigned i = 0; i < $3->size(); i++) {
       if (ETy != (*$3)[i]->getType())
-        GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
+        GEN_ERROR("Element #" + utostr(i) + " is not of type '" +
            ETy->getDescription() +"' as required!\nIt is of type '"+
            (*$3)[i]->getType()->getDescription() + "'.");
     }
@@ -1685,7 +1685,7 @@
   | Types '{' ConstVector '}' {
     const StructType *STy = dyn_cast<StructType>($1->get());
     if (STy == 0)
-      GEN_ERROR("Cannot make struct constant with type: '" + 
+      GEN_ERROR("Cannot make struct constant with type: '" +
                      (*$1)->getDescription() + "'");
 
     if ($3->size() != STy->getNumContainedTypes())
@@ -1713,7 +1713,7 @@
       GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
     const StructType *STy = dyn_cast<StructType>($1->get());
     if (STy == 0)
-      GEN_ERROR("Cannot make struct constant with type: '" + 
+      GEN_ERROR("Cannot make struct constant with type: '" +
                      (*$1)->getDescription() + "'");
 
     if (STy->getNumContainedTypes() != 0)
@@ -1731,7 +1731,7 @@
   | Types '<' '{' ConstVector '}' '>' {
     const StructType *STy = dyn_cast<StructType>($1->get());
     if (STy == 0)
-      GEN_ERROR("Cannot make struct constant with type: '" + 
+      GEN_ERROR("Cannot make struct constant with type: '" +
                      (*$1)->getDescription() + "'");
 
     if ($4->size() != STy->getNumContainedTypes())
@@ -1747,7 +1747,7 @@
 
     // Check to ensure that Type is packed
     if (!STy->isPacked())
-      GEN_ERROR("Vector initializer to non-vector type '" + 
+      GEN_ERROR("Vector initializer to non-vector type '" +
                 STy->getDescription() + "'");
 
     $$ = ConstantStruct::get(STy, *$4);
@@ -1759,7 +1759,7 @@
       GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
     const StructType *STy = dyn_cast<StructType>($1->get());
     if (STy == 0)
-      GEN_ERROR("Cannot make struct constant with type: '" + 
+      GEN_ERROR("Cannot make struct constant with type: '" +
                      (*$1)->getDescription() + "'");
 
     if (STy->getNumContainedTypes() != 0)
@@ -1767,7 +1767,7 @@
 
     // Check to ensure that Type is packed
     if (!STy->isPacked())
-      GEN_ERROR("Vector initializer to non-vector type '" + 
+      GEN_ERROR("Vector initializer to non-vector type '" +
                 STy->getDescription() + "'");
 
     $$ = ConstantStruct::get(STy, std::vector<Constant*>());
@@ -1779,7 +1779,7 @@
       GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
     const PointerType *PTy = dyn_cast<PointerType>($1->get());
     if (PTy == 0)
-      GEN_ERROR("Cannot make null pointer constant with type: '" + 
+      GEN_ERROR("Cannot make null pointer constant with type: '" +
                      (*$1)->getDescription() + "'");
 
     $$ = ConstantPointerNull::get(PTy);
@@ -1826,7 +1826,7 @@
       // First check to see if the forward references value is already created!
       PerModuleInfo::GlobalRefsType::iterator I =
         CurModule.GlobalRefs.find(std::make_pair(PT, $2));
-    
+
       if (I != CurModule.GlobalRefs.end()) {
         V = I->second;             // Placeholder already exists, use it...
         $2.destroy();
@@ -1839,7 +1839,7 @@
 
         // Create the forward referenced global.
         GlobalValue *GV;
-        if (const FunctionType *FTy = 
+        if (const FunctionType *FTy =
                  dyn_cast<FunctionType>(PT->getElementType())) {
           GV = Function::Create(FTy, GlobalValue::ExternalWeakLinkage, Name,
                                 CurModule.CurrentModule);
@@ -1863,7 +1863,7 @@
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
     if ($1->get() != $2->getType())
-      GEN_ERROR("Mismatched types for constant expression: " + 
+      GEN_ERROR("Mismatched types for constant expression: " +
         (*$1)->getDescription() + " and " + $2->getType()->getDescription());
     $$ = $2;
     delete $1;
@@ -1905,7 +1905,7 @@
     uint32_t BitWidth = cast<IntegerType>($1)->getBitWidth();
     if ($2->getBitWidth() > BitWidth) {
       GEN_ERROR("Constant value does not fit in type");
-    } 
+    }
     $2->zextOrTrunc(BitWidth);
     $$ = ConstantInt::get(*$2);
     delete $2;
@@ -1926,7 +1926,7 @@
   | FPType FPVAL {                   // Floating point constants
     if (!ConstantFP::isValueValidForType($1, *$2))
       GEN_ERROR("Floating point constant invalid for type");
-    // Lexer has no type info, so builds all float and double FP constants 
+    // Lexer has no type info, so builds all float and double FP constants
     // as double.  Fix this here.  Long double is done right.
     if (&$2->getSemantics()==&APFloat::IEEEdouble && $1==Type::FloatTy)
       $2->convert(APFloat::IEEEsingle, APFloat::rmNearestTiesToEven);
@@ -1944,7 +1944,7 @@
     if (!CastInst::castIsValid($1, $3, DestTy))
       GEN_ERROR("invalid cast opcode for cast from '" +
                 Val->getType()->getDescription() + "' to '" +
-                DestTy->getDescription() + "'"); 
+                DestTy->getDescription() + "'");
     $$ = ConstantExpr::getCast($1, $3, DestTy);
     delete $5;
   }
@@ -1987,7 +1987,7 @@
     if ($3->getType() != $5->getType())
       GEN_ERROR("Logical operator types must match");
     if (!$3->getType()->isInteger()) {
-      if (!isa<VectorType>($3->getType()) || 
+      if (!isa<VectorType>($3->getType()) ||
           !cast<VectorType>($3->getType())->getElementType()->isInteger())
         GEN_ERROR("Logical operator requires integral operands");
     }
@@ -2065,7 +2065,7 @@
 // GlobalType - Match either GLOBAL or CONSTANT for global declarations...
 GlobalType : GLOBAL { $$ = false; } | CONSTANT { $$ = true; };
 
-// ThreadLocal 
+// ThreadLocal
 ThreadLocal : THREAD_LOCAL { $$ = true; } | { $$ = false; };
 
 // AliaseeRef - Match either GlobalValue or bitcast to GlobalValue.
@@ -2088,7 +2088,7 @@
       GEN_ERROR("invalid cast opcode for cast from '" +
                 Val->getType()->getDescription() + "' to '" +
                 DestTy->getDescription() + "'");
-    
+
     $$ = ConstantExpr::getCast($1, $3, DestTy);
     CHECK_FOR_ERROR
     delete $5;
@@ -2101,7 +2101,7 @@
 // Module rule: Capture the result of parsing the whole file into a result
 // variable...
 //
-Module 
+Module
   : DefinitionList {
     $$ = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -2119,7 +2119,7 @@
   | DefinitionList Definition
   ;
 
-Definition 
+Definition
   : DEFINE { CurFun.isDeclare = false; } Function {
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
@@ -2129,7 +2129,7 @@
   }
   | MODULE ASM_TOK AsmBlock {
     CHECK_FOR_ERROR
-  }  
+  }
   | OptLocalAssign TYPE Types {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*$3)->getDescription());
@@ -2165,10 +2165,10 @@
     }
     CHECK_FOR_ERROR
   }
-  | OptGlobalAssign GVVisibilityStyle ThreadLocal GlobalType ConstVal 
-    OptAddrSpace { 
+  | OptGlobalAssign GVVisibilityStyle ThreadLocal GlobalType ConstVal
+    OptAddrSpace {
     /* "Externally Visible" Linkage */
-    if ($5 == 0) 
+    if ($5 == 0)
       GEN_ERROR("Global value initializer is not a constant");
     CurGV = ParseGlobalVariable($1, GlobalValue::ExternalLinkage,
                                 $2, $4, $5->getType(), $5, $3, $6);
@@ -2178,7 +2178,7 @@
   }
   | OptGlobalAssign GVInternalLinkage GVVisibilityStyle ThreadLocal GlobalType
     ConstVal OptAddrSpace {
-    if ($6 == 0) 
+    if ($6 == 0)
       GEN_ERROR("Global value initializer is not a constant");
     CurGV = ParseGlobalVariable($1, $2, $3, $5, $6->getType(), $6, $4, $7);
     CHECK_FOR_ERROR
@@ -2204,7 +2204,7 @@
     }
     if (Name.empty())
       GEN_ERROR("Alias name cannot be empty");
-    
+
     Constant* Aliasee = $5;
     if (Aliasee == 0)
       GEN_ERROR(std::string("Invalid aliasee for alias: ") + Name);
@@ -2213,16 +2213,16 @@
                                       CurModule.CurrentModule);
     GA->setVisibility($2);
     InsertValue(GA, CurModule.Values);
-    
-    
+
+
     // If there was a forward reference of this alias, resolve it now.
-    
+
     ValID ID;
     if (!Name.empty())
       ID = ValID::createGlobalName(Name);
     else
       ID = ValID::createGlobalID(CurModule.Values.size()-1);
-    
+
     if (GlobalValue *FWGV =
           CurModule.GetForwardRefForGlobal(GA->getType(), ID)) {
       // Replace uses of the fwdref with the actual alias.
@@ -2233,10 +2233,10 @@
         cast<Function>(FWGV)->eraseFromParent();
     }
     ID.destroy();
-    
+
     CHECK_FOR_ERROR
   }
-  | TARGET TargetDefinition { 
+  | TARGET TargetDefinition {
     CHECK_FOR_ERROR
   }
   | DEPLIBS '=' LibrariesDefinition {
@@ -2333,11 +2333,11 @@
     CHECK_FOR_ERROR
   };
 
-FunctionHeaderH : OptCallingConv ResultTypes GlobalName '(' ArgList ')' 
+FunctionHeaderH : OptCallingConv ResultTypes GlobalName '(' ArgList ')'
                   OptFuncAttrs OptSection OptAlign OptGC OptFuncNotes {
   std::string FunctionName(*$3);
   delete $3;  // Free strdup'd memory!
-  
+
   // Check the function result for abstractness if this is a define. We should
   // have no abstract types at this point
   if (!CurFun.isDeclare && CurModule.TypeIsUnresolved($2))
@@ -2345,11 +2345,11 @@
 
   if (!FunctionType::isValidReturnType(*$2))
     GEN_ERROR("Invalid result type for LLVM function");
-    
+
   std::vector<const Type*> ParamTypeList;
-  SmallVector<ParamAttrsWithIndex, 8> Attrs;
+  SmallVector<FnAttributeWithIndex, 8> Attrs;
   if ($7 != ParamAttr::None)
-    Attrs.push_back(ParamAttrsWithIndex::get(0, $7));
+    Attrs.push_back(FnAttributeWithIndex::get(0, $7));
   if ($5) {   // If there are arguments...
     unsigned index = 1;
     for (ArgListType::iterator I = $5->begin(); I != $5->end(); ++I, ++index) {
@@ -2358,7 +2358,7 @@
         GEN_ERROR("Reference to abstract argument: " + Ty->getDescription());
       ParamTypeList.push_back(Ty);
       if (Ty != Type::VoidTy && I->Attrs != ParamAttr::None)
-        Attrs.push_back(ParamAttrsWithIndex::get(index, I->Attrs));
+        Attrs.push_back(FnAttributeWithIndex::get(index, I->Attrs));
     }
   }
 
@@ -2383,7 +2383,7 @@
   Function *Fn = 0;
   // See if this function was forward referenced.  If so, recycle the object.
   if (GlobalValue *FWRef = CurModule.GetForwardRefForGlobal(PFT, ID)) {
-    // Move the function to the end of the list, from whereever it was 
+    // Move the function to the end of the list, from whereever it was
     // previously inserted.
     Fn = cast<Function>(FWRef);
     assert(Fn->getParamAttrs().isEmpty() &&
@@ -2451,7 +2451,7 @@
     Function::arg_iterator ArgIt = Fn->arg_begin();
     Function::arg_iterator ArgEnd = Fn->arg_end();
     unsigned Idx = 1;
-    for (ArgListType::iterator I = $5->begin(); 
+    for (ArgListType::iterator I = $5->begin();
          I != $5->end() && ArgIt != ArgEnd; ++I, ++ArgIt) {
       delete I->Ty;                          // Delete the typeholder...
       setValueName(ArgIt, I->Name);       // Insert arg into symtab...
@@ -2516,7 +2516,7 @@
     $$ = ValID::create(*$1, true);
     delete $1;
     CHECK_FOR_ERROR
-  }  
+  }
   | EUAPINTVAL {      // arbitrary precision integer constants
     $$ = ValID::create(*$1, false);
     delete $1;
@@ -2529,7 +2529,7 @@
   | TRUETOK {
     $$ = ValID::create(ConstantInt::getTrue());
     CHECK_FOR_ERROR
-  } 
+  }
   | FALSETOK {
     $$ = ValID::create(ConstantInt::getFalse());
     CHECK_FOR_ERROR
@@ -2548,18 +2548,18 @@
   }
   | '<' ConstVector '>' { // Nonempty unsized packed vector
     const Type *ETy = (*$2)[0]->getType();
-    unsigned NumElements = $2->size(); 
+    unsigned NumElements = $2->size();
 
     if (!ETy->isInteger() && !ETy->isFloatingPoint())
       GEN_ERROR("Invalid vector element type: " + ETy->getDescription());
-    
+
     VectorType* pt = VectorType::get(ETy, NumElements);
     PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(pt));
-    
+
     // Verify all elements are correct type!
     for (unsigned i = 0; i < $2->size(); i++) {
       if (ETy != (*$2)[i]->getType())
-        GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
+        GEN_ERROR("Element #" + utostr(i) + " is not of type '" +
                      ETy->getDescription() +"' as required!\nIt is of type '" +
                      (*$2)[i]->getType()->getDescription() + "'.");
     }
@@ -2570,7 +2570,7 @@
   }
   | '[' ConstVector ']' { // Nonempty unsized arr
     const Type *ETy = (*$2)[0]->getType();
-    uint64_t NumElements = $2->size(); 
+    uint64_t NumElements = $2->size();
 
     if (!ETy->isFirstClassType())
       GEN_ERROR("Invalid array element type: " + ETy->getDescription());
@@ -2581,7 +2581,7 @@
     // Verify all elements are correct type!
     for (unsigned i = 0; i < $2->size(); i++) {
       if (ETy != (*$2)[i]->getType())
-        GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
+        GEN_ERROR("Element #" + utostr(i) + " is not of type '" +
                        ETy->getDescription() +"' as required!\nIt is of type '"+
                        (*$2)[i]->getType()->getDescription() + "'.");
     }
@@ -2687,7 +2687,7 @@
 ResolvedVal : Types ValueRef {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
-    $$ = getVal(*$1, $2); 
+    $$ = getVal(*$1, $2);
     delete $1;
     CHECK_FOR_ERROR
   }
@@ -2695,11 +2695,11 @@
 
 ReturnedVal : ResolvedVal {
     $$ = new std::vector<Value *>();
-    $$->push_back($1); 
+    $$->push_back($1);
     CHECK_FOR_ERROR
   }
   | ReturnedVal ',' ResolvedVal {
-    ($$=$1)->push_back($3); 
+    ($$=$1)->push_back($3);
     CHECK_FOR_ERROR
   };
 
@@ -2707,13 +2707,13 @@
     $$ = $1;
     CHECK_FOR_ERROR
   }
-  | FunctionHeader BasicBlock { // Do not allow functions with 0 basic blocks   
+  | FunctionHeader BasicBlock { // Do not allow functions with 0 basic blocks
     $$ = $1;
     CHECK_FOR_ERROR
   };
 
 
-// Basic blocks are terminated by branching instructions: 
+// Basic blocks are terminated by branching instructions:
 // br, br/cc, switch, ret
 //
 BasicBlock : InstructionList OptLocalAssign BBTerminatorInst {
@@ -2731,7 +2731,7 @@
   if (ValNum != (int)$2)
     GEN_ERROR("Result value number %" + utostr($2) +
               " is incorrect, expected %" + utostr((unsigned)ValNum));
-  
+
   $1->getInstList().push_back($3);
   $$ = $1;
   CHECK_FOR_ERROR
@@ -2758,7 +2758,7 @@
 
   };
 
-BBTerminatorInst : 
+BBTerminatorInst :
   RET ReturnedVal  { // Return with a result...
     ValueList &VL = *$2;
     assert(!VL.empty() && "Invalid ret operands!");
@@ -2788,7 +2788,7 @@
     CHECK_FOR_ERROR
     $$ = BranchInst::Create(tmpBB);
   }                                               // Conditional Branch...
-  | BR INTTYPE ValueRef ',' LABEL ValueRef ',' LABEL ValueRef {  
+  | BR INTTYPE ValueRef ',' LABEL ValueRef ',' LABEL ValueRef {
     if (cast<IntegerType>($2)->getBitWidth() != 1)
       GEN_ERROR("Branch condition must have type i1");
     BasicBlock* tmpBBA = getBBVal($6);
@@ -2844,7 +2844,7 @@
           GEN_ERROR("Short call syntax cannot be used with varargs");
         ParamTypes.push_back(Ty);
       }
-      
+
       if (!FunctionType::isValidReturnType(*$3))
         GEN_ERROR("Invalid result type for LLVM function");
 
@@ -2861,9 +2861,9 @@
     BasicBlock *Except = getBBVal($14);
     CHECK_FOR_ERROR
 
-    SmallVector<ParamAttrsWithIndex, 8> Attrs;
+    SmallVector<FnAttributeWithIndex, 8> Attrs;
     if ($8 != ParamAttr::None)
-      Attrs.push_back(ParamAttrsWithIndex::get(0, $8));
+      Attrs.push_back(FnAttributeWithIndex::get(0, $8));
 
     // Check the arguments
     ValueList Args;
@@ -2886,7 +2886,7 @@
                          (*I)->getDescription() + "'");
         Args.push_back(ArgI->Val);
         if (ArgI->Attrs != ParamAttr::None)
-          Attrs.push_back(ParamAttrsWithIndex::get(index, ArgI->Attrs));
+          Attrs.push_back(FnAttributeWithIndex::get(index, ArgI->Attrs));
       }
 
       if (Ty->isVarArg()) {
@@ -2894,7 +2894,7 @@
           for (; ArgI != ArgE; ++ArgI, ++index) {
             Args.push_back(ArgI->Val); // push the remaining varargs
             if (ArgI->Attrs != ParamAttr::None)
-              Attrs.push_back(ParamAttrsWithIndex::get(index, ArgI->Attrs));
+              Attrs.push_back(FnAttributeWithIndex::get(index, ArgI->Attrs));
           }
       } else if (I != E || ArgI != ArgE)
         GEN_ERROR("Invalid number of parameters detected");
@@ -2945,7 +2945,7 @@
 
     BasicBlock* tmpBB = getBBVal($5);
     CHECK_FOR_ERROR
-    $$->push_back(std::make_pair(V, tmpBB)); 
+    $$->push_back(std::make_pair(V, tmpBB));
   };
 
 Inst : OptLocalAssign InstVal {
@@ -2960,7 +2960,7 @@
 Inst : LocalNumber InstVal {
     CHECK_FOR_ERROR
     int ValNum = InsertValue($2);
-  
+
     if (ValNum != (int)$1)
       GEN_ERROR("Result value number %" + utostr($1) +
                 " is incorrect, expected %" + utostr((unsigned)ValNum));
@@ -3066,11 +3066,11 @@
 InstVal : ArithmeticOps Types ValueRef ',' ValueRef {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*$2)->getDescription());
-    if (!(*$2)->isInteger() && !(*$2)->isFloatingPoint() && 
+    if (!(*$2)->isInteger() && !(*$2)->isFloatingPoint() &&
         !isa<VectorType>((*$2).get()))
       GEN_ERROR(
         "Arithmetic operator requires integer, FP, or packed operands");
-    Value* val1 = getVal(*$2, $3); 
+    Value* val1 = getVal(*$2, $3);
     CHECK_FOR_ERROR
     Value* val2 = getVal(*$2, $5);
     CHECK_FOR_ERROR
@@ -3156,7 +3156,7 @@
     if (!CastInst::castIsValid($1, Val, DestTy))
       GEN_ERROR("invalid cast opcode for cast from '" +
                 Val->getType()->getDescription() + "' to '" +
-                DestTy->getDescription() + "'"); 
+                DestTy->getDescription() + "'");
     $$ = CastInst::Create($1, Val, DestTy);
     delete $4;
   }
@@ -3213,7 +3213,7 @@
     $$ = PHINode::Create(Ty);
     ((PHINode*)$$)->reserveOperandSpace($2->size());
     while ($2->begin() != $2->end()) {
-      if ($2->front().first->getType() != Ty) 
+      if ($2->front().first->getType() != Ty)
         GEN_ERROR("All elements of a PHI node must be of the same type");
       cast<PHINode>($$)->addIncoming($2->front().first, $2->front().second);
       $2->pop_front();
@@ -3221,7 +3221,7 @@
     delete $2;  // Free the list...
     CHECK_FOR_ERROR
   }
-  | OptTailCall OptCallingConv ResultTypes ValueRef '(' ParamList ')' 
+  | OptTailCall OptCallingConv ResultTypes ValueRef '(' ParamList ')'
     OptFuncAttrs {
 
     // Handle the short syntax
@@ -3259,10 +3259,10 @@
     }
 
     // Set up the ParamAttrs for the function
-    SmallVector<ParamAttrsWithIndex, 8> Attrs;
+    SmallVector<FnAttributeWithIndex, 8> Attrs;
     if ($8 != ParamAttr::None)
-      Attrs.push_back(ParamAttrsWithIndex::get(0, $8));
-    // Check the arguments 
+      Attrs.push_back(FnAttributeWithIndex::get(0, $8));
+    // Check the arguments
     ValueList Args;
     if ($6->empty()) {                                   // Has no arguments?
       // Make sure no arguments is a good thing!
@@ -3283,14 +3283,14 @@
                          (*I)->getDescription() + "'");
         Args.push_back(ArgI->Val);
         if (ArgI->Attrs != ParamAttr::None)
-          Attrs.push_back(ParamAttrsWithIndex::get(index, ArgI->Attrs));
+          Attrs.push_back(FnAttributeWithIndex::get(index, ArgI->Attrs));
       }
       if (Ty->isVarArg()) {
         if (I == E)
           for (; ArgI != ArgE; ++ArgI, ++index) {
             Args.push_back(ArgI->Val); // push the remaining varargs
             if (ArgI->Attrs != ParamAttr::None)
-              Attrs.push_back(ParamAttrsWithIndex::get(index, ArgI->Attrs));
+              Attrs.push_back(FnAttributeWithIndex::get(index, ArgI->Attrs));
           }
       } else if (I != E || ArgI != ArgE)
         GEN_ERROR("Invalid number of parameters detected");
@@ -3363,7 +3363,7 @@
   }
   | FREE ResolvedVal {
     if (!isa<PointerType>($2->getType()))
-      GEN_ERROR("Trying to free nonpointer type " + 
+      GEN_ERROR("Trying to free nonpointer type " +
                      $2->getType()->getDescription() + "");
     $$ = new FreeInst($2);
     CHECK_FOR_ERROR
@@ -3426,7 +3426,7 @@
     Value* tmpVal = getVal(*$2, $3);
     CHECK_FOR_ERROR
     $$ = GetElementPtrInst::Create(tmpVal, $4->begin(), $4->end());
-    delete $2; 
+    delete $2;
     delete $4;
   }
   | EXTRACTVALUE Types ValueRef ConstantIndexList {
@@ -3441,7 +3441,7 @@
     Value* tmpVal = getVal(*$2, $3);
     CHECK_FOR_ERROR
     $$ = ExtractValueInst::Create(tmpVal, $4->begin(), $4->end());
-    delete $2; 
+    delete $2;
     delete $4;
   }
   | INSERTVALUE Types ValueRef ',' Types ValueRef ConstantIndexList {
@@ -3457,7 +3457,7 @@
     Value* tmpVal = getVal(*$5, $6);
     CHECK_FOR_ERROR
     $$ = InsertValueInst::Create(aggVal, tmpVal, $7->begin(), $7->end());
-    delete $2; 
+    delete $2;
     delete $5;
     delete $7;
   };
@@ -3531,7 +3531,7 @@
   std::string errMsg = where + "error: " + std::string(ErrorMsg);
   if (yychar != YYEMPTY && yychar != 0) {
     errMsg += " while reading token: '";
-    errMsg += std::string(LLLgetTokenStart(), 
+    errMsg += std::string(LLLgetTokenStart(),
                           LLLgetTokenStart()+LLLgetTokenLength()) + "'";
   }
   GenerateError(errMsg);




From echristo at apple.com  Wed Sep 24 00:32:41 2008
From: echristo at apple.com (Eric Christopher)
Date: Wed, 24 Sep 2008 05:32:41 -0000
Subject: [llvm-commits] [llvm] r56546 -
	/llvm/trunk/lib/Transforms/Scalar/CodeGenPrepare.cpp
Message-ID: <200809240532.m8O5WfXE011735@zion.cs.uiuc.edu>

Author: echristo
Date: Wed Sep 24 00:32:41 2008
New Revision: 56546

URL: http://llvm.org/viewvc/llvm-project?rev=56546&view=rev
Log:
Fix fallout in CodeGenPrepare from 56526. Will likely need more work.

Modified:
    llvm/trunk/lib/Transforms/Scalar/CodeGenPrepare.cpp

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

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/CodeGenPrepare.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/CodeGenPrepare.cpp Wed Sep 24 00:32:41 2008
@@ -35,7 +35,7 @@
 #include "llvm/Support/GetElementPtrTypeIterator.h"
 using namespace llvm;
 
-namespace {  
+namespace {
   class VISIBILITY_HIDDEN CodeGenPrepare : public FunctionPass {
     /// TLI - Keep a pointer of a TargetLowering to consult for determining
     /// transformation profitability.
@@ -45,7 +45,7 @@
     explicit CodeGenPrepare(const TargetLowering *tli = 0)
       : FunctionPass(&ID), TLI(tli) {}
     bool runOnFunction(Function &F);
-    
+
   private:
     bool EliminateMostlyEmptyBlocks(Function &F);
     bool CanMergeBlocks(const BasicBlock *BB, const BasicBlock *DestBB) const;
@@ -71,11 +71,11 @@
 
 bool CodeGenPrepare::runOnFunction(Function &F) {
   bool EverMadeChange = false;
-  
+
   // First pass, eliminate blocks that contain only PHI nodes and an
   // unconditional branch.
   EverMadeChange |= EliminateMostlyEmptyBlocks(F);
-  
+
   bool MadeChange = true;
   while (MadeChange) {
     MadeChange = false;
@@ -87,7 +87,7 @@
 }
 
 /// EliminateMostlyEmptyBlocks - eliminate blocks that contain only PHI nodes
-/// and an unconditional branch.  Passes before isel (e.g. LSR/loopsimplify) 
+/// and an unconditional branch.  Passes before isel (e.g. LSR/loopsimplify)
 /// often split edges in ways that are non-optimal for isel.  Start by
 /// eliminating these blocks so we can split them the way we want them.
 bool CodeGenPrepare::EliminateMostlyEmptyBlocks(Function &F) {
@@ -100,7 +100,7 @@
     BranchInst *BI = dyn_cast<BranchInst>(BB->getTerminator());
     if (!BI || !BI->isUnconditional())
       continue;
-    
+
     // If the instruction before the branch isn't a phi node, then other stuff
     // is happening here.
     BasicBlock::iterator BBI = BI;
@@ -108,15 +108,15 @@
       --BBI;
       if (!isa<PHINode>(BBI)) continue;
     }
-    
+
     // Do not break infinite loops.
     BasicBlock *DestBB = BI->getSuccessor(0);
     if (DestBB == BB)
       continue;
-    
+
     if (!CanMergeBlocks(BB, DestBB))
       continue;
-    
+
     EliminateMostlyEmptyBlock(BB);
     MadeChange = true;
   }
@@ -138,8 +138,8 @@
       const Instruction *User = cast<Instruction>(*UI);
       if (User->getParent() != DestBB || !isa<PHINode>(User))
         return false;
-      // If User is inside DestBB block and it is a PHINode then check 
-      // incoming value. If incoming value is not from BB then this is 
+      // If User is inside DestBB block and it is a PHINode then check
+      // incoming value. If incoming value is not from BB then this is
       // a complex condition (e.g. preheaders) we want to avoid here.
       if (User->getParent() == DestBB) {
         if (const PHINode *UPN = dyn_cast<PHINode>(User))
@@ -152,13 +152,13 @@
       }
     }
   }
-  
+
   // If BB and DestBB contain any common predecessors, then the phi nodes in BB
   // and DestBB may have conflicting incoming values for the block.  If so, we
   // can't merge the block.
   const PHINode *DestBBPN = dyn_cast<PHINode>(DestBB->begin());
   if (!DestBBPN) return true;  // no conflict.
-  
+
   // Collect the preds of BB.
   SmallPtrSet<const BasicBlock*, 16> BBPreds;
   if (const PHINode *BBPN = dyn_cast<PHINode>(BB->begin())) {
@@ -168,7 +168,7 @@
   } else {
     BBPreds.insert(pred_begin(BB), pred_end(BB));
   }
-  
+
   // Walk the preds of DestBB.
   for (unsigned i = 0, e = DestBBPN->getNumIncomingValues(); i != e; ++i) {
     BasicBlock *Pred = DestBBPN->getIncomingBlock(i);
@@ -177,12 +177,12 @@
       while (const PHINode *PN = dyn_cast<PHINode>(BBI++)) {
         const Value *V1 = PN->getIncomingValueForBlock(Pred);
         const Value *V2 = PN->getIncomingValueForBlock(BB);
-        
+
         // If V2 is a phi node in BB, look up what the mapped value will be.
         if (const PHINode *V2PN = dyn_cast<PHINode>(V2))
           if (V2PN->getParent() == BB)
             V2 = V2PN->getIncomingValueForBlock(Pred);
-        
+
         // If there is a conflict, bail out.
         if (V1 != V2) return false;
       }
@@ -198,9 +198,9 @@
 void CodeGenPrepare::EliminateMostlyEmptyBlock(BasicBlock *BB) {
   BranchInst *BI = cast<BranchInst>(BB->getTerminator());
   BasicBlock *DestBB = BI->getSuccessor(0);
-  
+
   DOUT << "MERGING MOSTLY EMPTY BLOCKS - BEFORE:\n" << *BB << *DestBB;
-  
+
   // If the destination block has a single pred, then this is a trivial edge,
   // just collapse it.
   if (DestBB->getSinglePredecessor()) {
@@ -209,21 +209,21 @@
       PN->replaceAllUsesWith(PN->getIncomingValue(0));
       PN->eraseFromParent();
     }
-    
+
     // Splice all the PHI nodes from BB over to DestBB.
     DestBB->getInstList().splice(DestBB->begin(), BB->getInstList(),
                                  BB->begin(), BI);
-    
+
     // Anything that branched to BB now branches to DestBB.
     BB->replaceAllUsesWith(DestBB);
-    
+
     // Nuke BB.
     BB->eraseFromParent();
-    
+
     DOUT << "AFTER:\n" << *DestBB << "\n\n\n";
     return;
   }
-  
+
   // Otherwise, we have multiple predecessors of BB.  Update the PHIs in DestBB
   // to handle the new incoming edges it is about to have.
   PHINode *PN;
@@ -231,7 +231,7 @@
        (PN = dyn_cast<PHINode>(BBI)); ++BBI) {
     // Remove the incoming value for BB, and remember it.
     Value *InVal = PN->removeIncomingValue(BB, false);
-    
+
     // Two options: either the InVal is a phi node defined in BB or it is some
     // value that dominates BB.
     PHINode *InValPhi = dyn_cast<PHINode>(InVal);
@@ -252,12 +252,12 @@
       }
     }
   }
-  
+
   // The PHIs are now updated, change everything that refers to BB to use
   // DestBB and remove BB.
   BB->replaceAllUsesWith(DestBB);
   BB->eraseFromParent();
-  
+
   DOUT << "AFTER:\n" << *DestBB << "\n\n\n";
 }
 
@@ -272,17 +272,17 @@
   BasicBlock *Dest = TI->getSuccessor(SuccNum);
   assert(isa<PHINode>(Dest->begin()) &&
          "This should only be called if Dest has a PHI!");
-  
+
   // As a hack, never split backedges of loops.  Even though the copy for any
   // PHIs inserted on the backedge would be dead for exits from the loop, we
   // assume that the cost of *splitting* the backedge would be too high.
   if (Dest == TIBB)
     return;
-  
+
   /// TIPHIValues - This array is lazily computed to determine the values of
   /// PHIs in Dest that TI would provide.
   SmallVector<Value*, 32> TIPHIValues;
-  
+
   // Check to see if Dest has any blocks that can be used as a split edge for
   // this terminator.
   for (pred_iterator PI = pred_begin(Dest), E = pred_end(Dest); PI != E; ++PI) {
@@ -295,7 +295,7 @@
         // Cannot be the entry block; its label does not get emitted.
         Pred == &(Dest->getParent()->getEntryBlock()))
       continue;
-    
+
     // Finally, since we know that Dest has phi nodes in it, we have to make
     // sure that jumping to Pred will have the same affect as going to Dest in
     // terms of PHI values.
@@ -306,14 +306,14 @@
          (PN = dyn_cast<PHINode>(I)); ++I, ++PHINo) {
       if (PHINo == TIPHIValues.size())
         TIPHIValues.push_back(PN->getIncomingValueForBlock(TIBB));
-      
+
       // If the PHI entry doesn't work, we can't use this pred.
       if (TIPHIValues[PHINo] != PN->getIncomingValueForBlock(Pred)) {
         FoundMatch = false;
         break;
       }
     }
-    
+
     // If we found a workable predecessor, change TI to branch to Succ.
     if (FoundMatch) {
       Dest->removePredecessor(TIBB);
@@ -321,8 +321,8 @@
       return;
     }
   }
-  
-  SplitCriticalEdge(TI, SuccNum, P, true);  
+
+  SplitCriticalEdge(TI, SuccNum, P, true);
 }
 
 /// OptimizeNoopCopyExpression - If the specified cast instruction is a noop
@@ -332,10 +332,10 @@
 ///
 /// Return true if any changes are made.
 static bool OptimizeNoopCopyExpression(CastInst *CI, const TargetLowering &TLI){
-  // If this is a noop copy, 
+  // If this is a noop copy,
   MVT SrcVT = TLI.getValueType(CI->getOperand(0)->getType());
   MVT DstVT = TLI.getValueType(CI->getType());
-  
+
   // This is an fp<->int conversion?
   if (SrcVT.isInteger() != DstVT.isInteger())
     return false;
@@ -343,7 +343,7 @@
   // If this is an extension, it will be a zero or sign extension, which
   // isn't a noop.
   if (SrcVT.bitsLT(DstVT)) return false;
-  
+
   // If these values will be promoted, find out what they will be promoted
   // to.  This helps us consider truncates on PPC as noop copies when they
   // are.
@@ -351,22 +351,22 @@
     SrcVT = TLI.getTypeToTransformTo(SrcVT);
   if (TLI.getTypeAction(DstVT) == TargetLowering::Promote)
     DstVT = TLI.getTypeToTransformTo(DstVT);
-  
+
   // If, after promotion, these are the same types, this is a noop copy.
   if (SrcVT != DstVT)
     return false;
-  
+
   BasicBlock *DefBB = CI->getParent();
-  
+
   /// InsertedCasts - Only insert a cast in each block once.
   DenseMap<BasicBlock*, CastInst*> InsertedCasts;
-  
+
   bool MadeChange = false;
-  for (Value::use_iterator UI = CI->use_begin(), E = CI->use_end(); 
+  for (Value::use_iterator UI = CI->use_begin(), E = CI->use_end();
        UI != E; ) {
     Use &TheUse = UI.getUse();
     Instruction *User = cast<Instruction>(*UI);
-    
+
     // Figure out which BB this cast is used in.  For PHI's this is the
     // appropriate predecessor block.
     BasicBlock *UserBB = User->getParent();
@@ -374,39 +374,39 @@
       unsigned OpVal = UI.getOperandNo()/2;
       UserBB = PN->getIncomingBlock(OpVal);
     }
-    
+
     // Preincrement use iterator so we don't invalidate it.
     ++UI;
-    
+
     // If this user is in the same block as the cast, don't change the cast.
     if (UserBB == DefBB) continue;
-    
+
     // If we have already inserted a cast into this block, use it.
     CastInst *&InsertedCast = InsertedCasts[UserBB];
 
     if (!InsertedCast) {
       BasicBlock::iterator InsertPt = UserBB->getFirstNonPHI();
-      
-      InsertedCast = 
-        CastInst::Create(CI->getOpcode(), CI->getOperand(0), CI->getType(), "", 
+
+      InsertedCast =
+        CastInst::Create(CI->getOpcode(), CI->getOperand(0), CI->getType(), "",
                          InsertPt);
       MadeChange = true;
     }
-    
+
     // Replace a use of the cast with a use of the new cast.
     TheUse = InsertedCast;
   }
-  
+
   // If we removed all uses, nuke the cast.
   if (CI->use_empty()) {
     CI->eraseFromParent();
     MadeChange = true;
   }
-  
+
   return MadeChange;
 }
 
-/// OptimizeCmpExpression - sink the given CmpInst into user blocks to reduce 
+/// OptimizeCmpExpression - sink the given CmpInst into user blocks to reduce
 /// the number of virtual registers that must be created and coalesced.  This is
 /// a clear win except on targets with multiple condition code registers
 ///  (PowerPC), where it might lose; some adjustment may be wanted there.
@@ -415,49 +415,49 @@
 static bool OptimizeCmpExpression(CmpInst *CI){
 
   BasicBlock *DefBB = CI->getParent();
-  
+
   /// InsertedCmp - Only insert a cmp in each block once.
   DenseMap<BasicBlock*, CmpInst*> InsertedCmps;
-  
+
   bool MadeChange = false;
-  for (Value::use_iterator UI = CI->use_begin(), E = CI->use_end(); 
+  for (Value::use_iterator UI = CI->use_begin(), E = CI->use_end();
        UI != E; ) {
     Use &TheUse = UI.getUse();
     Instruction *User = cast<Instruction>(*UI);
-    
+
     // Preincrement use iterator so we don't invalidate it.
     ++UI;
-    
+
     // Don't bother for PHI nodes.
     if (isa<PHINode>(User))
       continue;
 
     // Figure out which BB this cmp is used in.
     BasicBlock *UserBB = User->getParent();
-    
+
     // If this user is in the same block as the cmp, don't change the cmp.
     if (UserBB == DefBB) continue;
-    
+
     // If we have already inserted a cmp into this block, use it.
     CmpInst *&InsertedCmp = InsertedCmps[UserBB];
 
     if (!InsertedCmp) {
       BasicBlock::iterator InsertPt = UserBB->getFirstNonPHI();
-      
-      InsertedCmp = 
-        CmpInst::Create(CI->getOpcode(), CI->getPredicate(), CI->getOperand(0), 
+
+      InsertedCmp =
+        CmpInst::Create(CI->getOpcode(), CI->getPredicate(), CI->getOperand(0),
                         CI->getOperand(1), "", InsertPt);
       MadeChange = true;
     }
-    
+
     // Replace a use of the cmp with a use of the new cmp.
     TheUse = InsertedCmp;
   }
-  
+
   // If we removed all uses, nuke the cmp.
   if (CI->use_empty())
     CI->eraseFromParent();
-  
+
   return MadeChange;
 }
 
@@ -465,10 +465,10 @@
 static void EraseDeadInstructions(Value *V) {
   Instruction *I = dyn_cast<Instruction>(V);
   if (!I || !I->use_empty()) return;
-  
+
   SmallPtrSet<Instruction*, 16> Insts;
   Insts.insert(I);
-  
+
   while (!Insts.empty()) {
     I = *Insts.begin();
     Insts.erase(I);
@@ -498,17 +498,17 @@
   if (AM.BaseGV)
     OS << (NeedPlus ? " + " : "")
        << "GV:%" << AM.BaseGV->getName(), NeedPlus = true;
-  
+
   if (AM.BaseOffs)
     OS << (NeedPlus ? " + " : "") << AM.BaseOffs, NeedPlus = true;
-  
+
   if (AM.BaseReg)
     OS << (NeedPlus ? " + " : "")
        << "Base:%" << AM.BaseReg->getName(), NeedPlus = true;
   if (AM.Scale)
     OS << (NeedPlus ? " + " : "")
        << AM.Scale << "*%" << AM.ScaledReg->getName(), NeedPlus = true;
-  
+
   return OS << "]";
 }
 
@@ -522,7 +522,7 @@
                                    const Type *AccessTy, ExtAddrMode &AddrMode,
                                    SmallVector<Instruction*, 16> &AddrModeInsts,
                                    const TargetLowering &TLI, unsigned Depth);
-  
+
 /// FindMaximalLegalAddressingMode - If we can, try to merge the computation of
 /// Addr into the specified addressing mode.  If Addr can't be added to AddrMode
 /// this returns false.  This assumes that Addr is either a pointer type or
@@ -532,7 +532,7 @@
                                    SmallVector<Instruction*, 16> &AddrModeInsts,
                                            const TargetLowering &TLI,
                                            unsigned Depth) {
-  
+
   // If this is a global variable, fold it into the addressing mode if possible.
   if (GlobalValue *GV = dyn_cast<GlobalValue>(Addr)) {
     if (AddrMode.BaseGV == 0) {
@@ -549,7 +549,7 @@
   } else if (isa<ConstantPointerNull>(Addr)) {
     return true;
   }
-  
+
   // Look through constant exprs and instructions.
   unsigned Opcode = ~0U;
   User *AddrInst = 0;
@@ -598,18 +598,18 @@
     // Restore the old addr mode info.
     AddrMode = BackupAddrMode;
     AddrModeInsts.resize(OldSize);
-    
+
     // Otherwise this was over-aggressive.  Try merging in the LHS then the RHS.
     if (FindMaximalLegalAddressingMode(AddrInst->getOperand(0), AccessTy,
                                        AddrMode, AddrModeInsts, TLI, Depth+1) &&
         FindMaximalLegalAddressingMode(AddrInst->getOperand(1), AccessTy,
                                        AddrMode, AddrModeInsts, TLI, Depth+1))
       return true;
-    
+
     // Otherwise we definitely can't merge the ADD in.
     AddrMode = BackupAddrMode;
     AddrModeInsts.resize(OldSize);
-    break;    
+    break;
   }
   case Instruction::Or: {
     ConstantInt *RHS = dyn_cast<ConstantInt>(AddrInst->getOperand(1));
@@ -626,7 +626,7 @@
     int64_t Scale = RHS->getSExtValue();
     if (Opcode == Instruction::Shl)
       Scale = 1 << Scale;
-    
+
     if (TryMatchingScaledValue(AddrInst->getOperand(0), Scale, AccessTy,
                                AddrMode, AddrModeInsts, TLI, Depth))
       return true;
@@ -637,7 +637,7 @@
     // one variable offset.
     int VariableOperand = -1;
     unsigned VariableScale = 0;
-    
+
     int64_t ConstantOffset = 0;
     const TargetData *TD = TLI.getTargetData();
     gep_type_iterator GTI = gep_type_begin(AddrInst);
@@ -657,7 +657,7 @@
             VariableOperand = -2;
             break;
           }
-          
+
           // Remember the variable index.
           VariableOperand = i;
           VariableScale = TypeSize;
@@ -693,11 +693,11 @@
         AddrMode.BaseReg = AddrInst->getOperand(0);
         SetBaseReg = true;
       }
-      
+
       // See if the scale amount is valid for this target.
       AddrMode.BaseOffs += ConstantOffset;
       if (TryMatchingScaledValue(AddrInst->getOperand(VariableOperand),
-                                 VariableScale, AccessTy, AddrMode, 
+                                 VariableScale, AccessTy, AddrMode,
                                  AddrModeInsts, TLI, Depth)) {
         if (!SetBaseReg) return true;
 
@@ -710,27 +710,27 @@
                                            Depth+1))
           return true;
         // Strange, shouldn't happen.  Restore the base reg and succeed the easy
-        // way.        
+        // way.
         AddrMode.HasBaseReg = true;
         AddrMode.BaseReg = AddrInst->getOperand(0);
         return true;
       }
-      
+
       AddrMode.BaseOffs -= ConstantOffset;
       if (SetBaseReg) {
         AddrMode.HasBaseReg = false;
         AddrMode.BaseReg = 0;
       }
     }
-    break;    
+    break;
   }
   }
-  
+
   if (Instruction *I = dyn_cast_or_null<Instruction>(AddrInst)) {
     assert(AddrModeInsts.back() == I && "Stack imbalance"); I = I;
     AddrModeInsts.pop_back();
   }
-  
+
   // Worse case, the target should support [reg] addressing modes. :)
   if (!AddrMode.HasBaseReg) {
     AddrMode.HasBaseReg = true;
@@ -741,7 +741,7 @@
     }
     AddrMode.HasBaseReg = false;
   }
-  
+
   // If the base register is already taken, see if we can do [r+r].
   if (AddrMode.Scale == 0) {
     AddrMode.Scale = 1;
@@ -766,14 +766,14 @@
   // need an available scale field.
   if (AddrMode.Scale != 0 && AddrMode.ScaledReg != ScaleReg)
     return false;
-  
+
   ExtAddrMode InputAddrMode = AddrMode;
-  
+
   // Add scale to turn X*4+X*3 -> X*7.  This could also do things like
   // [A+B + A*7] -> [B+A*8].
   AddrMode.Scale += Scale;
   AddrMode.ScaledReg = ScaleReg;
-  
+
   if (TLI.isLegalAddressingMode(AddrMode, AccessTy)) {
     // Okay, we decided that we can add ScaleReg+Scale to AddrMode.  Check now
     // to see if ScaleReg is actually X+C.  If so, we can turn this into adding
@@ -781,10 +781,10 @@
     BinaryOperator *BinOp = dyn_cast<BinaryOperator>(ScaleReg);
     if (BinOp && BinOp->getOpcode() == Instruction::Add &&
         isa<ConstantInt>(BinOp->getOperand(1)) && InputAddrMode.ScaledReg ==0) {
-      
+
       InputAddrMode.Scale = Scale;
       InputAddrMode.ScaledReg = BinOp->getOperand(0);
-      InputAddrMode.BaseOffs += 
+      InputAddrMode.BaseOffs +=
         cast<ConstantInt>(BinOp->getOperand(1))->getSExtValue()*Scale;
       if (TLI.isLegalAddressingMode(InputAddrMode, AccessTy)) {
         AddrModeInsts.push_back(BinOp);
@@ -796,11 +796,11 @@
     // Otherwise, not (x+c)*scale, just return what we have.
     return true;
   }
-  
+
   // Otherwise, back this attempt out.
   AddrMode.Scale -= Scale;
   if (AddrMode.Scale == 0) AddrMode.ScaledReg = 0;
-  
+
   return false;
 }
 
@@ -828,7 +828,7 @@
   bool Success = FindMaximalLegalAddressingMode(Addr, AccessTy, AddrMode,
                                                 AddrModeInsts, *TLI, 0);
   Success = Success; assert(Success && "Couldn't select *anything*?");
-  
+
   // Check to see if any of the instructions supersumed by this addr mode are
   // non-local to I's BB.
   bool AnyNonLocal = false;
@@ -838,18 +838,18 @@
       break;
     }
   }
-  
+
   // If all the instructions matched are already in this BB, don't do anything.
   if (!AnyNonLocal) {
     DEBUG(cerr << "CGP: Found      local addrmode: " << AddrMode << "\n");
     return false;
   }
-  
+
   // Insert this computation right after this user.  Since our caller is
   // scanning from the top of the BB to the bottom, reuse of the expr are
   // guaranteed to happen later.
   BasicBlock::iterator InsertPt = LdStInst;
-  
+
   // Now that we determined the addressing expression we want to use and know
   // that we have to sink it into this block.  Check to see if we have already
   // done this for some other load/store instr in this block.  If so, reuse the
@@ -862,7 +862,7 @@
   } else {
     DEBUG(cerr << "CGP: SINKING nonlocal addrmode: " << AddrMode << "\n");
     const Type *IntPtrTy = TLI->getTargetData()->getIntPtrType();
-    
+
     Value *Result = 0;
     // Start with the scale value.
     if (AddrMode.Scale) {
@@ -894,7 +894,7 @@
       else
         Result = V;
     }
-    
+
     // Add in the BaseGV if present.
     if (AddrMode.BaseGV) {
       Value *V = new PtrToIntInst(AddrMode.BaseGV, IntPtrTy, "sunkaddr",
@@ -904,7 +904,7 @@
       else
         Result = V;
     }
-    
+
     // Add in the Base Offset if present.
     if (AddrMode.BaseOffs) {
       Value *V = ConstantInt::get(IntPtrTy, AddrMode.BaseOffs);
@@ -919,14 +919,31 @@
     else
       SunkAddr = new IntToPtrInst(Result, Addr->getType(), "sunkaddr",InsertPt);
   }
-  
+
   LdStInst->replaceUsesOfWith(Addr, SunkAddr);
-  
+
   if (Addr->use_empty())
     EraseDeadInstructions(Addr);
   return true;
 }
 
+/// hasInlineAsmMemConstraint - Return true if the inline asm instruction being
+/// processed uses a memory 'm' constraint.
+static bool
+hasInlineAsmMemConstraint(std::vector<InlineAsm::ConstraintInfo> &CInfos,
+                          const TargetLowering *TLI) {
+  for (unsigned i = 0, e = CInfos.size(); i != e; ++i) {
+    InlineAsm::ConstraintInfo &CI = CInfos[i];
+    for (unsigned j = 0, ee = CI.Codes.size(); j != ee; ++j) {
+      TargetLowering::ConstraintType CType = TLI->getConstraintType(CI.Codes[j]);
+      if (CType == TargetLowering::C_Memory)
+        return true;
+    }
+  }
+
+  return false;
+}
+
 /// OptimizeInlineAsmInst - If there are any memory operands, use
 /// OptimizeLoadStoreInt to sink their address computing into the block when
 /// possible / profitable.
@@ -963,7 +980,8 @@
     }
 
     // Compute the constraint code and ConstraintType to use.
-    TLI->ComputeConstraintToUse(OpInfo, SDValue());
+    bool hasMemory = hasInlineAsmMemConstraint(ConstraintInfos, TLI);
+    TLI->ComputeConstraintToUse(OpInfo, SDValue(), hasMemory);
 
     if (OpInfo.ConstraintType == TargetLowering::C_Memory &&
         OpInfo.isIndirect) {
@@ -995,7 +1013,7 @@
     return false;
 
   bool DefIsLiveOut = false;
-  for (Value::use_iterator UI = I->use_begin(), E = I->use_end(); 
+  for (Value::use_iterator UI = I->use_begin(), E = I->use_end();
        UI != E; ++UI) {
     Instruction *User = cast<Instruction>(*UI);
 
@@ -1009,7 +1027,7 @@
     return false;
 
   // Make sure non of the uses are PHI nodes.
-  for (Value::use_iterator UI = Src->use_begin(), E = Src->use_end(); 
+  for (Value::use_iterator UI = Src->use_begin(), E = Src->use_end();
        UI != E; ++UI) {
     Instruction *User = cast<Instruction>(*UI);
     BasicBlock *UserBB = User->getParent();
@@ -1024,7 +1042,7 @@
   DenseMap<BasicBlock*, Instruction*> InsertedTruncs;
 
   bool MadeChange = false;
-  for (Value::use_iterator UI = Src->use_begin(), E = Src->use_end(); 
+  for (Value::use_iterator UI = Src->use_begin(), E = Src->use_end();
        UI != E; ++UI) {
     Use &TheUse = UI.getUse();
     Instruction *User = cast<Instruction>(*UI);
@@ -1038,7 +1056,7 @@
 
     if (!InsertedTrunc) {
       BasicBlock::iterator InsertPt = UserBB->getFirstNonPHI();
-      
+
       InsertedTrunc = new TruncInst(I, Src->getType(), "", InsertPt);
     }
 
@@ -1056,7 +1074,7 @@
 // selection.
 bool CodeGenPrepare::OptimizeBlock(BasicBlock &BB) {
   bool MadeChange = false;
-  
+
   // Split all critical edges where the dest block has a PHI and where the phi
   // has shared immediate operands.
   TerminatorInst *BBTI = BB.getTerminator();
@@ -1066,16 +1084,16 @@
           isCriticalEdge(BBTI, i, true))
         SplitEdgeNicely(BBTI, i, this);
   }
-  
-  
+
+
   // Keep track of non-local addresses that have been sunk into this block.
   // This allows us to avoid inserting duplicate code for blocks with multiple
   // load/stores of the same address.
   DenseMap<Value*, Value*> SunkAddrs;
-  
+
   for (BasicBlock::iterator BBI = BB.begin(), E = BB.end(); BBI != E; ) {
     Instruction *I = BBI++;
-    
+
     if (CastInst *CI = dyn_cast<CastInst>(I)) {
       // If the source of the cast is a constant, then this should have
       // already been constant folded.  The only reason NOT to constant fold
@@ -1085,7 +1103,7 @@
       // want to forward-subst the cast.
       if (isa<Constant>(CI->getOperand(0)))
         continue;
-      
+
       bool Change = false;
       if (TLI) {
         Change = OptimizeNoopCopyExpression(CI, *TLI);
@@ -1108,7 +1126,7 @@
     } else if (GetElementPtrInst *GEPI = dyn_cast<GetElementPtrInst>(I)) {
       if (GEPI->hasAllZeroIndices()) {
         /// The GEP operand must be a pointer, so must its result -> BitCast
-        Instruction *NC = new BitCastInst(GEPI->getOperand(0), GEPI->getType(), 
+        Instruction *NC = new BitCastInst(GEPI->getOperand(0), GEPI->getType(),
                                           GEPI->getName(), GEPI);
         GEPI->replaceAllUsesWith(NC);
         GEPI->eraseFromParent();
@@ -1119,7 +1137,7 @@
       // If we found an inline asm expession, and if the target knows how to
       // lower it to normal LLVM code, do so now.
       if (TLI && isa<InlineAsm>(CI->getCalledValue()))
-        if (const TargetAsmInfo *TAI = 
+        if (const TargetAsmInfo *TAI =
             TLI->getTargetMachine().getTargetAsmInfo()) {
           if (TAI->ExpandInlineAsm(CI))
             BBI = BB.begin();
@@ -1129,7 +1147,6 @@
         }
     }
   }
-    
+
   return MadeChange;
 }
-




From echristo at apple.com  Wed Sep 24 00:32:51 2008
From: echristo at apple.com (Eric Christopher)
Date: Tue, 23 Sep 2008 22:32:51 -0700
Subject: [llvm-commits] [llvm] r56526 - in /llvm/trunk:
	include/llvm/Target/TargetLowering.h
	lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
	lib/CodeGen/SelectionDAG/TargetLowering.cpp
	lib/Target/CellSPU/SPUISelLowering.cpp
	lib/Target/CellSPU/SPUISelLowering.h
	lib/Target/PowerPC/PPCISelLowering.cpp
	lib/Target/PowerPC/PPCISelLowering.h
	lib/Target/X86/X86ISelDAGToDAG.cpp
	lib/Target/X86/X86ISelLowering.cpp lib/Target/X86/X86ISelLowering.h
	test/CodeGen/X86/inline-asm-pic.ll
In-Reply-To: <200809240005.m8O05XRU001380@zion.cs.uiuc.edu>
References: <200809240005.m8O05XRU001380@zion.cs.uiuc.edu>
Message-ID: <527D3628-CC5F-45FF-A225-7AB904354E55@apple.com>


On Sep 23, 2008, at 5:05 PM, Evan Cheng wrote:

> Author: evancheng
> Date: Tue Sep 23 19:05:32 2008
> New Revision: 56526
>
> URL: http://llvm.org/viewvc/llvm-project?rev=56526&view=rev
> Log:
> Properly handle 'm' inline asm constraints. If a GV is being  
> selected for the addressing mode, it requires the same logic for PIC  
> relative addressing, etc.
>
> Added:
>    llvm/trunk/test/CodeGen/X86/inline-asm-pic.ll
> Modified:


Hey, this was failing to build for (at least) Daniel and I. I  
committed a patch that will work, but probably isn't ideal from a  
maintenance POV. Let me know what you'd like to do.

-eric


From evan.cheng at apple.com  Wed Sep 24 01:43:02 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Tue, 23 Sep 2008 23:43:02 -0700
Subject: [llvm-commits] [llvm] r56526 - in /llvm/trunk:
	include/llvm/Target/TargetLowering.h
	lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
	lib/CodeGen/SelectionDAG/TargetLowering.cpp
	lib/Target/CellSPU/SPUISelLowering.cpp	lib/Target/CellSPU/SPUISelLowering.h
	lib/Target/PowerPC/PPCISelLowering.cpp	lib/Target/PowerPC/PPCISelLowering.h
	lib/Target/X86/X86ISelDAGToDAG.cpp	lib/Target/X86/X86ISelLowering.cpp
	lib/Target/X86/X86ISelLowering.h	test/CodeGen/X86/inline-asm-pic.ll
In-Reply-To: <527D3628-CC5F-45FF-A225-7AB904354E55@apple.com>
References: <200809240005.m8O05XRU001380@zion.cs.uiuc.edu>
	<527D3628-CC5F-45FF-A225-7AB904354E55@apple.com>
Message-ID: <16FE0742-A7B4-4039-9344-408F81532559@apple.com>

Sorry, I forgot to check in one file. I'll fix.

Evan

On Sep 23, 2008, at 10:32 PM, Eric Christopher wrote:

>
> On Sep 23, 2008, at 5:05 PM, Evan Cheng wrote:
>
>> Author: evancheng
>> Date: Tue Sep 23 19:05:32 2008
>> New Revision: 56526
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=56526&view=rev
>> Log:
>> Properly handle 'm' inline asm constraints. If a GV is being
>> selected for the addressing mode, it requires the same logic for PIC
>> relative addressing, etc.
>>
>> Added:
>>   llvm/trunk/test/CodeGen/X86/inline-asm-pic.ll
>> Modified:
>
>
> Hey, this was failing to build for (at least) Daniel and I. I
> committed a patch that will work, but probably isn't ideal from a
> maintenance POV. Let me know what you'd like to do.
>
> -eric
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From echristo at apple.com  Wed Sep 24 01:46:57 2008
From: echristo at apple.com (Eric Christopher)
Date: Tue, 23 Sep 2008 23:46:57 -0700
Subject: [llvm-commits] [llvm] r56526 - in /llvm/trunk:
	include/llvm/Target/TargetLowering.h
	lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
	lib/CodeGen/SelectionDAG/TargetLowering.cpp
	lib/Target/CellSPU/SPUISelLowering.cpp	lib/Target/CellSPU/SPUISelLowering.h
	lib/Target/PowerPC/PPCISelLowering.cpp	lib/Target/PowerPC/PPCISelLowering.h
	lib/Target/X86/X86ISelDAGToDAG.cpp	lib/Target/X86/X86ISelLowering.cpp
	lib/Target/X86/X86ISelLowering.h	test/CodeGen/X86/inline-asm-pic.ll
In-Reply-To: <16FE0742-A7B4-4039-9344-408F81532559@apple.com>
References: <200809240005.m8O05XRU001380@zion.cs.uiuc.edu>
	<527D3628-CC5F-45FF-A225-7AB904354E55@apple.com>
	<16FE0742-A7B4-4039-9344-408F81532559@apple.com>
Message-ID: <EC2078C3-F4AF-4107-ADB3-33C963FA1E5B@apple.com>


On Sep 23, 2008, at 11:43 PM, Evan Cheng wrote:

> Sorry, I forgot to check in one file. I'll fix.

Excellent, that's what I thought.

thanks.

-eric


From evan.cheng at apple.com  Wed Sep 24 01:48:55 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Wed, 24 Sep 2008 06:48:55 -0000
Subject: [llvm-commits] [llvm] r56549 -
	/llvm/trunk/lib/Transforms/Scalar/CodeGenPrepare.cpp
Message-ID: <200809240648.m8O6mupQ013902@zion.cs.uiuc.edu>

Author: evancheng
Date: Wed Sep 24 01:48:55 2008
New Revision: 56549

URL: http://llvm.org/viewvc/llvm-project?rev=56549&view=rev
Log:
Commit CodeGenPrepare.cpp changes which was accidentially left out of 56526.

Modified:
    llvm/trunk/lib/Transforms/Scalar/CodeGenPrepare.cpp

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

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/CodeGenPrepare.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/CodeGenPrepare.cpp Wed Sep 24 01:48:55 2008
@@ -927,23 +927,6 @@
   return true;
 }
 
-/// hasInlineAsmMemConstraint - Return true if the inline asm instruction being
-/// processed uses a memory 'm' constraint.
-static bool
-hasInlineAsmMemConstraint(std::vector<InlineAsm::ConstraintInfo> &CInfos,
-                          const TargetLowering *TLI) {
-  for (unsigned i = 0, e = CInfos.size(); i != e; ++i) {
-    InlineAsm::ConstraintInfo &CI = CInfos[i];
-    for (unsigned j = 0, ee = CI.Codes.size(); j != ee; ++j) {
-      TargetLowering::ConstraintType CType = TLI->getConstraintType(CI.Codes[j]);
-      if (CType == TargetLowering::C_Memory)
-        return true;
-    }
-  }
-
-  return false;
-}
-
 /// OptimizeInlineAsmInst - If there are any memory operands, use
 /// OptimizeLoadStoreInt to sink their address computing into the block when
 /// possible / profitable.
@@ -980,8 +963,8 @@
     }
 
     // Compute the constraint code and ConstraintType to use.
-    bool hasMemory = hasInlineAsmMemConstraint(ConstraintInfos, TLI);
-    TLI->ComputeConstraintToUse(OpInfo, SDValue(), hasMemory);
+    TLI->ComputeConstraintToUse(OpInfo, SDValue(),
+                             OpInfo.ConstraintType == TargetLowering::C_Memory);
 
     if (OpInfo.ConstraintType == TargetLowering::C_Memory &&
         OpInfo.isIndirect) {




From isanbard at gmail.com  Wed Sep 24 02:11:26 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 24 Sep 2008 07:11:26 -0000
Subject: [llvm-commits] [llvm] r56550 - in /llvm/trunk:
 include/llvm/CodeGen/SelectionDAG.h
 lib/CodeGen/SelectionDAG/DAGCombiner.cpp
Message-ID: <200809240711.m8O7BQFF014541@zion.cs.uiuc.edu>

Author: void
Date: Wed Sep 24 02:11:26 2008
New Revision: 56550

URL: http://llvm.org/viewvc/llvm-project?rev=56550&view=rev
Log:
Refactor the constant folding code into it's own function. And call it from both
the SelectionDAG and DAGCombiner code. The only functionality change is that now
the DAG combiner is performing the constant folding for these operations instead
of being a no-op.

This is *not* in response to a bug, so there isn't a testcase.

Modified:
    llvm/trunk/include/llvm/CodeGen/SelectionDAG.h
    llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAG.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAG.h?rev=56550&r1=56549&r2=56550&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/SelectionDAG.h (original)
+++ llvm/trunk/include/llvm/CodeGen/SelectionDAG.h Wed Sep 24 02:11:26 2008
@@ -697,9 +697,15 @@
   /// at least that alignment.
   SDValue CreateStackTemporary(MVT VT, unsigned minAlign = 1);
   
+  /// FoldConstantArithmetic - 
+  SDValue FoldConstantArithmetic(unsigned Opcode,
+                                 MVT VT,
+                                 ConstantSDNode *Cst1,
+                                 ConstantSDNode *Cst2);
+
   /// FoldSetCC - Constant fold a setcc to true or false.
   SDValue FoldSetCC(MVT VT, SDValue N1,
-                      SDValue N2, ISD::CondCode Cond);
+                    SDValue N2, ISD::CondCode Cond);
   
   /// SignBitIsZero - Return true if the sign bit of Op is known to be zero.  We
   /// use this predicate to simplify operations downstream.

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Wed Sep 24 02:11:26 2008
@@ -960,7 +960,7 @@
     return N1;
   // fold (add c1, c2) -> c1+c2
   if (N0C && N1C)
-    return DAG.getConstant(N0C->getAPIntValue() + N1C->getAPIntValue(), VT);
+    return DAG.FoldConstantArithmetic(ISD::ADD, VT, N0C, N1C);
   // canonicalize constant to RHS
   if (N0C && !N1C)
     return DAG.getNode(ISD::ADD, VT, N1, N0);
@@ -1111,7 +1111,7 @@
     return DAG.getConstant(0, N->getValueType(0));
   // fold (sub c1, c2) -> c1-c2
   if (N0C && N1C)
-    return DAG.getNode(ISD::SUB, VT, N0, N1);
+    return DAG.FoldConstantArithmetic(ISD::SUB, VT, N0C, N1C);
   // fold (sub x, c) -> (add x, -c)
   if (N1C)
     return DAG.getNode(ISD::ADD, VT, N0,
@@ -1154,7 +1154,7 @@
     return DAG.getConstant(0, VT);
   // fold (mul c1, c2) -> c1*c2
   if (N0C && N1C)
-    return DAG.getNode(ISD::MUL, VT, N0, N1);
+    return DAG.FoldConstantArithmetic(ISD::MUL, VT, N0C, N1C);
   // canonicalize constant to RHS
   if (N0C && !N1C)
     return DAG.getNode(ISD::MUL, VT, N1, N0);
@@ -1236,7 +1236,7 @@
   
   // fold (sdiv c1, c2) -> c1/c2
   if (N0C && N1C && !N1C->isNullValue())
-    return DAG.getNode(ISD::SDIV, VT, N0, N1);
+    return DAG.FoldConstantArithmetic(ISD::SDIV, VT, N0C, N1C);
   // fold (sdiv X, 1) -> X
   if (N1C && N1C->getSignExtended() == 1LL)
     return N0;
@@ -1314,7 +1314,7 @@
   
   // fold (udiv c1, c2) -> c1/c2
   if (N0C && N1C && !N1C->isNullValue())
-    return DAG.getNode(ISD::UDIV, VT, N0, N1);
+    return DAG.FoldConstantArithmetic(ISD::UDIV, VT, N0C, N1C);
   // fold (udiv x, (1 << c)) -> x >>u c
   if (N1C && N1C->getAPIntValue().isPowerOf2())
     return DAG.getNode(ISD::SRL, VT, N0, 
@@ -1359,7 +1359,7 @@
   
   // fold (srem c1, c2) -> c1%c2
   if (N0C && N1C && !N1C->isNullValue())
-    return DAG.getNode(ISD::SREM, VT, N0, N1);
+    return DAG.FoldConstantArithmetic(ISD::SREM, VT, N0C, N1C);
   // If we know the sign bits of both operands are zero, strength reduce to a
   // urem instead.  Handles (X & 0x0FFFFFFF) %s 16 -> X&15
   if (!VT.isVector()) {
@@ -1400,7 +1400,7 @@
   
   // fold (urem c1, c2) -> c1%c2
   if (N0C && N1C && !N1C->isNullValue())
-    return DAG.getNode(ISD::UREM, VT, N0, N1);
+    return DAG.FoldConstantArithmetic(ISD::UREM, VT, N0C, N1C);
   // fold (urem x, pow2) -> (and x, pow2-1)
   if (N1C && !N1C->isNullValue() && N1C->getAPIntValue().isPowerOf2())
     return DAG.getNode(ISD::AND, VT, N0,
@@ -1625,7 +1625,7 @@
     return DAG.getConstant(0, VT);
   // fold (and c1, c2) -> c1&c2
   if (N0C && N1C)
-    return DAG.getNode(ISD::AND, VT, N0, N1);
+    return DAG.FoldConstantArithmetic(ISD::AND, VT, N0C, N1C);
   // canonicalize constant to RHS
   if (N0C && !N1C)
     return DAG.getNode(ISD::AND, VT, N1, N0);
@@ -1824,7 +1824,7 @@
     return DAG.getConstant(~0ULL, VT);
   // fold (or c1, c2) -> c1|c2
   if (N0C && N1C)
-    return DAG.getNode(ISD::OR, VT, N0, N1);
+    return DAG.FoldConstantArithmetic(ISD::OR, VT, N0C, N1C);
   // canonicalize constant to RHS
   if (N0C && !N1C)
     return DAG.getNode(ISD::OR, VT, N1, N0);
@@ -2117,7 +2117,7 @@
     return N1;
   // fold (xor c1, c2) -> c1^c2
   if (N0C && N1C)
-    return DAG.getNode(ISD::XOR, VT, N0, N1);
+    return DAG.FoldConstantArithmetic(ISD::XOR, VT, N0C, N1C);
   // canonicalize constant to RHS
   if (N0C && !N1C)
     return DAG.getNode(ISD::XOR, VT, N1, N0);
@@ -2295,7 +2295,7 @@
   
   // fold (shl c1, c2) -> c1<<c2
   if (N0C && N1C)
-    return DAG.getNode(ISD::SHL, VT, N0, N1);
+    return DAG.FoldConstantArithmetic(ISD::SHL, VT, N0C, N1C);
   // fold (shl 0, x) -> 0
   if (N0C && N0C->isNullValue())
     return N0;
@@ -2370,7 +2370,7 @@
   
   // fold (sra c1, c2) -> c1>>c2
   if (N0C && N1C)
-    return DAG.getNode(ISD::SRA, VT, N0, N1);
+    return DAG.FoldConstantArithmetic(ISD::SRA, VT, N0C, N1C);
   // fold (sra 0, x) -> 0
   if (N0C && N0C->isNullValue())
     return N0;
@@ -2476,7 +2476,7 @@
   
   // fold (srl c1, c2) -> c1 >>u c2
   if (N0C && N1C)
-    return DAG.getNode(ISD::SRL, VT, N0, N1);
+    return DAG.FoldConstantArithmetic(ISD::SRL, VT, N0C, N1C);
   // fold (srl 0, x) -> 0
   if (N0C && N0C->isNullValue())
     return N0;




From baldrick at free.fr  Wed Sep 24 02:35:32 2008
From: baldrick at free.fr (Duncan Sands)
Date: Wed, 24 Sep 2008 09:35:32 +0200
Subject: [llvm-commits]
 =?iso-8859-1?q?=5Bllvm=5D_r56511_-_in_/llvm/trunk?=
 =?iso-8859-1?q?=3A_include/llvm/_lib/AsmParser/_lib/Bitcode/Reader/_lib/B?=
 =?iso-8859-1?q?itcode/Writer/_lib/Target/X86/AsmPrinter/=09lib/Transforms?=
 =?iso-8859-1?q?/IPO/=09lib/Transforms/Scalar/_lib/Transforms/Utils/_lib/V?=
 =?iso-8859-1?q?MCore/?=
In-Reply-To: <09B40D7B-B6DE-4004-BE53-E15E1DF7028A@apple.com>
References: <200809232235.m8NMZJGn030760@zion.cs.uiuc.edu>
	<F58F62D0-7FCC-401B-9EE9-BDFA777EB125@apple.com>
	<09B40D7B-B6DE-4004-BE53-E15E1DF7028A@apple.com>
Message-ID: <200809240935.32759.baldrick@free.fr>

> Yep, I think we should migrate things like 'nounwind' to be function  
> attrs (index ~0U) instead of result attrs (index 0).  We need to stay  
> backwards compatible though.

It makes sense for a call to be nounwind even if the callee is a
function that might sometimes unwind (nounwind on the call means
that this particular call is known not to unwind).  Is this
possibility going to be lost?  In practice this functionality is
not being used any more (it used to be used by llvm-gcc for nothrow
regions), but it seems a pity to eliminate it because it makes
logical sense and might be useful to other front-ends.  Likewise
for readonly/readnone: I doubt any front-end is currently generating
readonly/readnone calls to functions that aren't readonly/readnone,
but it seems a pity to disallow this.

Ciao,

Duncan.

PS: Same goes for noinline, alwaysinline!


From baldrick at free.fr  Wed Sep 24 02:40:44 2008
From: baldrick at free.fr (Duncan Sands)
Date: Wed, 24 Sep 2008 09:40:44 +0200
Subject: [llvm-commits] [llvm] r56524 - in /llvm/trunk:
	include/llvm/Attributes.h include/llvm/Function.h
	lib/AsmParser/llvmAsmParser.cpp.cvs lib/AsmParser/llvmAsmParser.y
	lib/AsmParser/llvmAsmParser.y.cvs
	lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
	lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
	lib/Transforms/IPO/InlineAlways.cpp
	lib/Transforms/IPO/InlineSimple.cpp lib/Transforms/IPO/Inliner.cpp
	lib/Transforms/Scalar/LoopUnswitch.cpp
	lib/Transforms/Utils/InlineCost.cpp lib/VMCore/AsmWriter.cpp
In-Reply-To: <1F87C4E7-3F93-4433-B789-2DDFEFA67BF8@apple.com>
References: <200809232352.m8NNq597000931@zion.cs.uiuc.edu>
	<1F87C4E7-3F93-4433-B789-2DDFEFA67BF8@apple.com>
Message-ID: <200809240940.44175.baldrick@free.fr>

Hi,

> Eww, please introduce a new namespace.  Like "FnAttr::NoInline".  I  
> still don't understand how notes are different than attributes.  These  
> are just function attributes, no?

if I understand right, the difference between function attributes and
function notes, is that function attributes can go on calls too.  Then
as far as I can see noinline and inlinealways should be attributes,
and opt-size should be a note.  If codegen notes are introduced
(eg: compile this routine with a frame pointer) then they too would
only make sense as notes, not attributes.

On the other hand, for simplicity it might not be worth making this
distinction.

Ciao,

Duncan.


From echristo at apple.com  Wed Sep 24 03:23:31 2008
From: echristo at apple.com (Eric Christopher)
Date: Wed, 24 Sep 2008 01:23:31 -0700
Subject: [llvm-commits] [llvm] r56550 - in /llvm/trunk:
	include/llvm/CodeGen/SelectionDAG.h
	lib/CodeGen/SelectionDAG/DAGCombiner.cpp
In-Reply-To: <200809240711.m8O7BQFF014541@zion.cs.uiuc.edu>
References: <200809240711.m8O7BQFF014541@zion.cs.uiuc.edu>
Message-ID: <0AB0F042-C4E0-49E3-A10F-A0C6415F5832@apple.com>


On Sep 24, 2008, at 12:11 AM, Bill Wendling wrote:

> +  /// FoldConstantArithmetic -
> +  SDValue FoldConstantArithmetic(unsigned Opcode,
> +                                 MVT VT,
> +                                 ConstantSDNode *Cst1,
> +                                 ConstantSDNode *Cst2);
> +

Missing part of a checkin Bill? Currently has the build broken.

-eric


From echristo at apple.com  Wed Sep 24 03:30:49 2008
From: echristo at apple.com (Eric Christopher)
Date: Wed, 24 Sep 2008 08:30:49 -0000
Subject: [llvm-commits] [llvm] r56551 - in /llvm/trunk:
 include/llvm/CodeGen/SelectionDAG.h
 lib/CodeGen/SelectionDAG/DAGCombiner.cpp
Message-ID: <200809240830.m8O8UnQY025980@zion.cs.uiuc.edu>

Author: echristo
Date: Wed Sep 24 03:30:44 2008
New Revision: 56551

URL: http://llvm.org/viewvc/llvm-project?rev=56551&view=rev
Log:
Temporarily revert r56550 until missing commit can be added.

Modified:
    llvm/trunk/include/llvm/CodeGen/SelectionDAG.h
    llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAG.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAG.h?rev=56551&r1=56550&r2=56551&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/SelectionDAG.h (original)
+++ llvm/trunk/include/llvm/CodeGen/SelectionDAG.h Wed Sep 24 03:30:44 2008
@@ -697,15 +697,9 @@
   /// at least that alignment.
   SDValue CreateStackTemporary(MVT VT, unsigned minAlign = 1);
   
-  /// FoldConstantArithmetic - 
-  SDValue FoldConstantArithmetic(unsigned Opcode,
-                                 MVT VT,
-                                 ConstantSDNode *Cst1,
-                                 ConstantSDNode *Cst2);
-
   /// FoldSetCC - Constant fold a setcc to true or false.
   SDValue FoldSetCC(MVT VT, SDValue N1,
-                    SDValue N2, ISD::CondCode Cond);
+                      SDValue N2, ISD::CondCode Cond);
   
   /// SignBitIsZero - Return true if the sign bit of Op is known to be zero.  We
   /// use this predicate to simplify operations downstream.

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Wed Sep 24 03:30:44 2008
@@ -960,7 +960,7 @@
     return N1;
   // fold (add c1, c2) -> c1+c2
   if (N0C && N1C)
-    return DAG.FoldConstantArithmetic(ISD::ADD, VT, N0C, N1C);
+    return DAG.getConstant(N0C->getAPIntValue() + N1C->getAPIntValue(), VT);
   // canonicalize constant to RHS
   if (N0C && !N1C)
     return DAG.getNode(ISD::ADD, VT, N1, N0);
@@ -1111,7 +1111,7 @@
     return DAG.getConstant(0, N->getValueType(0));
   // fold (sub c1, c2) -> c1-c2
   if (N0C && N1C)
-    return DAG.FoldConstantArithmetic(ISD::SUB, VT, N0C, N1C);
+    return DAG.getNode(ISD::SUB, VT, N0, N1);
   // fold (sub x, c) -> (add x, -c)
   if (N1C)
     return DAG.getNode(ISD::ADD, VT, N0,
@@ -1154,7 +1154,7 @@
     return DAG.getConstant(0, VT);
   // fold (mul c1, c2) -> c1*c2
   if (N0C && N1C)
-    return DAG.FoldConstantArithmetic(ISD::MUL, VT, N0C, N1C);
+    return DAG.getNode(ISD::MUL, VT, N0, N1);
   // canonicalize constant to RHS
   if (N0C && !N1C)
     return DAG.getNode(ISD::MUL, VT, N1, N0);
@@ -1236,7 +1236,7 @@
   
   // fold (sdiv c1, c2) -> c1/c2
   if (N0C && N1C && !N1C->isNullValue())
-    return DAG.FoldConstantArithmetic(ISD::SDIV, VT, N0C, N1C);
+    return DAG.getNode(ISD::SDIV, VT, N0, N1);
   // fold (sdiv X, 1) -> X
   if (N1C && N1C->getSignExtended() == 1LL)
     return N0;
@@ -1314,7 +1314,7 @@
   
   // fold (udiv c1, c2) -> c1/c2
   if (N0C && N1C && !N1C->isNullValue())
-    return DAG.FoldConstantArithmetic(ISD::UDIV, VT, N0C, N1C);
+    return DAG.getNode(ISD::UDIV, VT, N0, N1);
   // fold (udiv x, (1 << c)) -> x >>u c
   if (N1C && N1C->getAPIntValue().isPowerOf2())
     return DAG.getNode(ISD::SRL, VT, N0, 
@@ -1359,7 +1359,7 @@
   
   // fold (srem c1, c2) -> c1%c2
   if (N0C && N1C && !N1C->isNullValue())
-    return DAG.FoldConstantArithmetic(ISD::SREM, VT, N0C, N1C);
+    return DAG.getNode(ISD::SREM, VT, N0, N1);
   // If we know the sign bits of both operands are zero, strength reduce to a
   // urem instead.  Handles (X & 0x0FFFFFFF) %s 16 -> X&15
   if (!VT.isVector()) {
@@ -1400,7 +1400,7 @@
   
   // fold (urem c1, c2) -> c1%c2
   if (N0C && N1C && !N1C->isNullValue())
-    return DAG.FoldConstantArithmetic(ISD::UREM, VT, N0C, N1C);
+    return DAG.getNode(ISD::UREM, VT, N0, N1);
   // fold (urem x, pow2) -> (and x, pow2-1)
   if (N1C && !N1C->isNullValue() && N1C->getAPIntValue().isPowerOf2())
     return DAG.getNode(ISD::AND, VT, N0,
@@ -1625,7 +1625,7 @@
     return DAG.getConstant(0, VT);
   // fold (and c1, c2) -> c1&c2
   if (N0C && N1C)
-    return DAG.FoldConstantArithmetic(ISD::AND, VT, N0C, N1C);
+    return DAG.getNode(ISD::AND, VT, N0, N1);
   // canonicalize constant to RHS
   if (N0C && !N1C)
     return DAG.getNode(ISD::AND, VT, N1, N0);
@@ -1824,7 +1824,7 @@
     return DAG.getConstant(~0ULL, VT);
   // fold (or c1, c2) -> c1|c2
   if (N0C && N1C)
-    return DAG.FoldConstantArithmetic(ISD::OR, VT, N0C, N1C);
+    return DAG.getNode(ISD::OR, VT, N0, N1);
   // canonicalize constant to RHS
   if (N0C && !N1C)
     return DAG.getNode(ISD::OR, VT, N1, N0);
@@ -2117,7 +2117,7 @@
     return N1;
   // fold (xor c1, c2) -> c1^c2
   if (N0C && N1C)
-    return DAG.FoldConstantArithmetic(ISD::XOR, VT, N0C, N1C);
+    return DAG.getNode(ISD::XOR, VT, N0, N1);
   // canonicalize constant to RHS
   if (N0C && !N1C)
     return DAG.getNode(ISD::XOR, VT, N1, N0);
@@ -2295,7 +2295,7 @@
   
   // fold (shl c1, c2) -> c1<<c2
   if (N0C && N1C)
-    return DAG.FoldConstantArithmetic(ISD::SHL, VT, N0C, N1C);
+    return DAG.getNode(ISD::SHL, VT, N0, N1);
   // fold (shl 0, x) -> 0
   if (N0C && N0C->isNullValue())
     return N0;
@@ -2370,7 +2370,7 @@
   
   // fold (sra c1, c2) -> c1>>c2
   if (N0C && N1C)
-    return DAG.FoldConstantArithmetic(ISD::SRA, VT, N0C, N1C);
+    return DAG.getNode(ISD::SRA, VT, N0, N1);
   // fold (sra 0, x) -> 0
   if (N0C && N0C->isNullValue())
     return N0;
@@ -2476,7 +2476,7 @@
   
   // fold (srl c1, c2) -> c1 >>u c2
   if (N0C && N1C)
-    return DAG.FoldConstantArithmetic(ISD::SRL, VT, N0C, N1C);
+    return DAG.getNode(ISD::SRL, VT, N0, N1);
   // fold (srl 0, x) -> 0
   if (N0C && N0C->isNullValue())
     return N0;




From baldrick at free.fr  Wed Sep 24 05:05:02 2008
From: baldrick at free.fr (Duncan Sands)
Date: Wed, 24 Sep 2008 12:05:02 +0200
Subject: [llvm-commits]
 =?iso-8859-1?q?=5Bllvm=5D_r55638=09-=09/llvm/trunk?=
 =?iso-8859-1?q?/include/llvm/Function=2Eh?=
In-Reply-To: <76ED3D4C-F77C-498F-973D-56E0906E2119@apple.com>
References: <200809021833.m82IXtBb013569@zion.cs.uiuc.edu>
	<200809222058.28125.baldrick@free.fr>
	<76ED3D4C-F77C-498F-973D-56E0906E2119@apple.com>
Message-ID: <200809241205.03372.baldrick@free.fr>

> > actually it is theoretically useful to be able to specify readonly  
> > on a
> > call to a function that is not readonly: it means that this particular
> > call doesn't read memory (presumably because the function is being
> > passed a special value for some parameter) even though general calls
> > to it might.
> 
> How do you distinguish that ?

Consider the example of the llvm.log intrinsic.  Suppose you want to
generate this intrinsic for all uses of the log builtin in llvm-gcc.
Since (depending on flags like -fno-math-errno, -ffast-math) the gcc
log builtin may or may not write to memory (errno), and may or may not
read from memory (rounding mode), this could be reflected by defining
llvm.log as:

double llvm.log(double %x, i1 writes_errno, i1 uses_rmode)

This intrinsic cannot be marked readonly or readnone because it
isn't for all inputs.

Now when generating calls to the intrinsic, llvm-gcc can check its
-fno-math-errno and -ffast-math flags and generate a variety of
calls to the llvm intrinsic, with differing attributes:

call double llvm.log(double %x, i1 1, i1 1) ; math-errno and not fast-math
call double llvm.log(double %x, i1 0, i1 1) readonly ; no errno but not fast-math
call double llvm.log(double %x, i1 0, i1 0) readnone ; no errno and no rounding mode

Now you can do LTO on modules compiled with different -f flags and
everything will work out automagically.

Of course this isn't how things are done right now, but they could be
done this way.  It might even be a good idea!  I hope this explains how 
it could be useful to have a readonly/readnone call to a function that
is not itself readonly/readnone.

Ciao,

Duncan.


From isanbard at gmail.com  Wed Sep 24 05:16:24 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 24 Sep 2008 10:16:24 -0000
Subject: [llvm-commits] [llvm] r56552 -
	/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
Message-ID: <200809241016.m8OAGPOB029857@zion.cs.uiuc.edu>

Author: void
Date: Wed Sep 24 05:16:24 2008
New Revision: 56552

URL: http://llvm.org/viewvc/llvm-project?rev=56552&view=rev
Log:
Forgot this part with my last patch. Sorry about the breakage.

Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Wed Sep 24 05:16:24 2008
@@ -2271,6 +2271,42 @@
   return SDValue(N, 0);
 }
 
+SDValue SelectionDAG::FoldConstantArithmetic(unsigned Opcode,
+                                             MVT VT,
+                                             ConstantSDNode *Cst1,
+                                             ConstantSDNode *Cst2) {
+  const APInt &C1 = Cst1->getAPIntValue(), &C2 = Cst2->getAPIntValue();
+
+  switch (Opcode) {
+  case ISD::ADD:  return getConstant(C1 + C2, VT);
+  case ISD::SUB:  return getConstant(C1 - C2, VT);
+  case ISD::MUL:  return getConstant(C1 * C2, VT);
+  case ISD::UDIV:
+    if (C2.getBoolValue()) return getConstant(C1.udiv(C2), VT);
+    break;
+  case ISD::UREM:
+    if (C2.getBoolValue()) return getConstant(C1.urem(C2), VT);
+    break;
+  case ISD::SDIV:
+    if (C2.getBoolValue()) return getConstant(C1.sdiv(C2), VT);
+    break;
+  case ISD::SREM:
+    if (C2.getBoolValue()) return getConstant(C1.srem(C2), VT);
+    break;
+  case ISD::AND:  return getConstant(C1 & C2, VT);
+  case ISD::OR:   return getConstant(C1 | C2, VT);
+  case ISD::XOR:  return getConstant(C1 ^ C2, VT);
+  case ISD::SHL:  return getConstant(C1 << C2, VT);
+  case ISD::SRL:  return getConstant(C1.lshr(C2), VT);
+  case ISD::SRA:  return getConstant(C1.ashr(C2), VT);
+  case ISD::ROTL: return getConstant(C1.rotl(C2), VT);
+  case ISD::ROTR: return getConstant(C1.rotr(C2), VT);
+  default: break;
+  }
+
+  return SDValue();
+}
+
 SDValue SelectionDAG::getNode(unsigned Opcode, MVT VT,
                               SDValue N1, SDValue N2) {
   ConstantSDNode *N1C = dyn_cast<ConstantSDNode>(N1.getNode());
@@ -2457,33 +2493,8 @@
 
   if (N1C) {
     if (N2C) {
-      const APInt &C1 = N1C->getAPIntValue(), &C2 = N2C->getAPIntValue();
-      switch (Opcode) {
-      case ISD::ADD: return getConstant(C1 + C2, VT);
-      case ISD::SUB: return getConstant(C1 - C2, VT);
-      case ISD::MUL: return getConstant(C1 * C2, VT);
-      case ISD::UDIV:
-        if (C2.getBoolValue()) return getConstant(C1.udiv(C2), VT);
-        break;
-      case ISD::UREM :
-        if (C2.getBoolValue()) return getConstant(C1.urem(C2), VT);
-        break;
-      case ISD::SDIV :
-        if (C2.getBoolValue()) return getConstant(C1.sdiv(C2), VT);
-        break;
-      case ISD::SREM :
-        if (C2.getBoolValue()) return getConstant(C1.srem(C2), VT);
-        break;
-      case ISD::AND  : return getConstant(C1 & C2, VT);
-      case ISD::OR   : return getConstant(C1 | C2, VT);
-      case ISD::XOR  : return getConstant(C1 ^ C2, VT);
-      case ISD::SHL  : return getConstant(C1 << C2, VT);
-      case ISD::SRL  : return getConstant(C1.lshr(C2), VT);
-      case ISD::SRA  : return getConstant(C1.ashr(C2), VT);
-      case ISD::ROTL : return getConstant(C1.rotl(C2), VT);
-      case ISD::ROTR : return getConstant(C1.rotr(C2), VT);
-      default: break;
-      }
+      SDValue SV = FoldConstantArithmetic(Opcode, VT, N1C, N2C);
+      if (SV.getNode()) return SV;
     } else {      // Cannonicalize constant to RHS if commutative
       if (isCommutativeBinOp(Opcode)) {
         std::swap(N1C, N2C);




From wendling at apple.com  Wed Sep 24 05:22:11 2008
From: wendling at apple.com (Bill Wendling)
Date: Wed, 24 Sep 2008 03:22:11 -0700
Subject: [llvm-commits] [llvm] r56550 - in /llvm/trunk:
	include/llvm/CodeGen/SelectionDAG.h
	lib/CodeGen/SelectionDAG/DAGCombiner.cpp
In-Reply-To: <0AB0F042-C4E0-49E3-A10F-A0C6415F5832@apple.com>
References: <200809240711.m8O7BQFF014541@zion.cs.uiuc.edu>
	<0AB0F042-C4E0-49E3-A10F-A0C6415F5832@apple.com>
Message-ID: <1363DFBA-A41F-4F4D-9C74-57140B2C8AFA@apple.com>

On Sep 24, 2008, at 1:23 AM, Eric Christopher wrote:

>
> On Sep 24, 2008, at 12:11 AM, Bill Wendling wrote:
>
>> +  /// FoldConstantArithmetic -
>> +  SDValue FoldConstantArithmetic(unsigned Opcode,
>> +                                 MVT VT,
>> +                                 ConstantSDNode *Cst1,
>> +                                 ConstantSDNode *Cst2);
>> +
>
> Missing part of a checkin Bill? Currently has the build broken.
>
Not sure how that slipped by. Fixed.

-bw



From isanbard at gmail.com  Wed Sep 24 05:25:02 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 24 Sep 2008 10:25:02 -0000
Subject: [llvm-commits] [llvm] r56553 - in /llvm/trunk:
 include/llvm/CodeGen/SelectionDAG.h
 lib/CodeGen/SelectionDAG/DAGCombiner.cpp
Message-ID: <200809241025.m8OAP3eS030105@zion.cs.uiuc.edu>

Author: void
Date: Wed Sep 24 05:25:02 2008
New Revision: 56553

URL: http://llvm.org/viewvc/llvm-project?rev=56553&view=rev
Log:
Reapplying r56550

Modified:
    llvm/trunk/include/llvm/CodeGen/SelectionDAG.h
    llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAG.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAG.h?rev=56553&r1=56552&r2=56553&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/SelectionDAG.h (original)
+++ llvm/trunk/include/llvm/CodeGen/SelectionDAG.h Wed Sep 24 05:25:02 2008
@@ -697,9 +697,15 @@
   /// at least that alignment.
   SDValue CreateStackTemporary(MVT VT, unsigned minAlign = 1);
   
+  /// FoldConstantArithmetic - 
+  SDValue FoldConstantArithmetic(unsigned Opcode,
+                                 MVT VT,
+                                 ConstantSDNode *Cst1,
+                                 ConstantSDNode *Cst2);
+
   /// FoldSetCC - Constant fold a setcc to true or false.
   SDValue FoldSetCC(MVT VT, SDValue N1,
-                      SDValue N2, ISD::CondCode Cond);
+                    SDValue N2, ISD::CondCode Cond);
   
   /// SignBitIsZero - Return true if the sign bit of Op is known to be zero.  We
   /// use this predicate to simplify operations downstream.

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Wed Sep 24 05:25:02 2008
@@ -960,7 +960,7 @@
     return N1;
   // fold (add c1, c2) -> c1+c2
   if (N0C && N1C)
-    return DAG.getConstant(N0C->getAPIntValue() + N1C->getAPIntValue(), VT);
+    return DAG.FoldConstantArithmetic(ISD::ADD, VT, N0C, N1C);
   // canonicalize constant to RHS
   if (N0C && !N1C)
     return DAG.getNode(ISD::ADD, VT, N1, N0);
@@ -1111,7 +1111,7 @@
     return DAG.getConstant(0, N->getValueType(0));
   // fold (sub c1, c2) -> c1-c2
   if (N0C && N1C)
-    return DAG.getNode(ISD::SUB, VT, N0, N1);
+    return DAG.FoldConstantArithmetic(ISD::SUB, VT, N0C, N1C);
   // fold (sub x, c) -> (add x, -c)
   if (N1C)
     return DAG.getNode(ISD::ADD, VT, N0,
@@ -1154,7 +1154,7 @@
     return DAG.getConstant(0, VT);
   // fold (mul c1, c2) -> c1*c2
   if (N0C && N1C)
-    return DAG.getNode(ISD::MUL, VT, N0, N1);
+    return DAG.FoldConstantArithmetic(ISD::MUL, VT, N0C, N1C);
   // canonicalize constant to RHS
   if (N0C && !N1C)
     return DAG.getNode(ISD::MUL, VT, N1, N0);
@@ -1236,7 +1236,7 @@
   
   // fold (sdiv c1, c2) -> c1/c2
   if (N0C && N1C && !N1C->isNullValue())
-    return DAG.getNode(ISD::SDIV, VT, N0, N1);
+    return DAG.FoldConstantArithmetic(ISD::SDIV, VT, N0C, N1C);
   // fold (sdiv X, 1) -> X
   if (N1C && N1C->getSignExtended() == 1LL)
     return N0;
@@ -1314,7 +1314,7 @@
   
   // fold (udiv c1, c2) -> c1/c2
   if (N0C && N1C && !N1C->isNullValue())
-    return DAG.getNode(ISD::UDIV, VT, N0, N1);
+    return DAG.FoldConstantArithmetic(ISD::UDIV, VT, N0C, N1C);
   // fold (udiv x, (1 << c)) -> x >>u c
   if (N1C && N1C->getAPIntValue().isPowerOf2())
     return DAG.getNode(ISD::SRL, VT, N0, 
@@ -1359,7 +1359,7 @@
   
   // fold (srem c1, c2) -> c1%c2
   if (N0C && N1C && !N1C->isNullValue())
-    return DAG.getNode(ISD::SREM, VT, N0, N1);
+    return DAG.FoldConstantArithmetic(ISD::SREM, VT, N0C, N1C);
   // If we know the sign bits of both operands are zero, strength reduce to a
   // urem instead.  Handles (X & 0x0FFFFFFF) %s 16 -> X&15
   if (!VT.isVector()) {
@@ -1400,7 +1400,7 @@
   
   // fold (urem c1, c2) -> c1%c2
   if (N0C && N1C && !N1C->isNullValue())
-    return DAG.getNode(ISD::UREM, VT, N0, N1);
+    return DAG.FoldConstantArithmetic(ISD::UREM, VT, N0C, N1C);
   // fold (urem x, pow2) -> (and x, pow2-1)
   if (N1C && !N1C->isNullValue() && N1C->getAPIntValue().isPowerOf2())
     return DAG.getNode(ISD::AND, VT, N0,
@@ -1625,7 +1625,7 @@
     return DAG.getConstant(0, VT);
   // fold (and c1, c2) -> c1&c2
   if (N0C && N1C)
-    return DAG.getNode(ISD::AND, VT, N0, N1);
+    return DAG.FoldConstantArithmetic(ISD::AND, VT, N0C, N1C);
   // canonicalize constant to RHS
   if (N0C && !N1C)
     return DAG.getNode(ISD::AND, VT, N1, N0);
@@ -1824,7 +1824,7 @@
     return DAG.getConstant(~0ULL, VT);
   // fold (or c1, c2) -> c1|c2
   if (N0C && N1C)
-    return DAG.getNode(ISD::OR, VT, N0, N1);
+    return DAG.FoldConstantArithmetic(ISD::OR, VT, N0C, N1C);
   // canonicalize constant to RHS
   if (N0C && !N1C)
     return DAG.getNode(ISD::OR, VT, N1, N0);
@@ -2117,7 +2117,7 @@
     return N1;
   // fold (xor c1, c2) -> c1^c2
   if (N0C && N1C)
-    return DAG.getNode(ISD::XOR, VT, N0, N1);
+    return DAG.FoldConstantArithmetic(ISD::XOR, VT, N0C, N1C);
   // canonicalize constant to RHS
   if (N0C && !N1C)
     return DAG.getNode(ISD::XOR, VT, N1, N0);
@@ -2295,7 +2295,7 @@
   
   // fold (shl c1, c2) -> c1<<c2
   if (N0C && N1C)
-    return DAG.getNode(ISD::SHL, VT, N0, N1);
+    return DAG.FoldConstantArithmetic(ISD::SHL, VT, N0C, N1C);
   // fold (shl 0, x) -> 0
   if (N0C && N0C->isNullValue())
     return N0;
@@ -2370,7 +2370,7 @@
   
   // fold (sra c1, c2) -> c1>>c2
   if (N0C && N1C)
-    return DAG.getNode(ISD::SRA, VT, N0, N1);
+    return DAG.FoldConstantArithmetic(ISD::SRA, VT, N0C, N1C);
   // fold (sra 0, x) -> 0
   if (N0C && N0C->isNullValue())
     return N0;
@@ -2476,7 +2476,7 @@
   
   // fold (srl c1, c2) -> c1 >>u c2
   if (N0C && N1C)
-    return DAG.getNode(ISD::SRL, VT, N0, N1);
+    return DAG.FoldConstantArithmetic(ISD::SRL, VT, N0C, N1C);
   // fold (srl 0, x) -> 0
   if (N0C && N0C->isNullValue())
     return N0;




From criswell at uiuc.edu  Wed Sep 24 10:07:32 2008
From: criswell at uiuc.edu (John Criswell)
Date: Wed, 24 Sep 2008 15:07:32 -0000
Subject: [llvm-commits] [poolalloc] r56555 -
	/poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp
Message-ID: <200809241507.m8OF7WRx009926@zion.cs.uiuc.edu>

Author: criswell
Date: Wed Sep 24 10:07:32 2008
New Revision: 56555

URL: http://llvm.org/viewvc/llvm-project?rev=56555&view=rev
Log:
Updated to the new LLVM API.

Modified:
    poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp

Modified: poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp?rev=56555&r1=56554&r2=56555&view=diff

==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp Wed Sep 24 10:07:32 2008
@@ -24,7 +24,7 @@
 #include "llvm/Instructions.h"
 #include "llvm/Module.h"
 #include "llvm/Constants.h"
-#include "llvm/ParameterAttributes.h"
+#include "llvm/Attributes.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
@@ -433,7 +433,7 @@
   if (!OldAttrs.isEmpty()) {
     PAListPtr NewAttrsVector;
     for (unsigned index = 0; index < OldAttrs.getNumSlots(); ++index) {
-      const ParamAttrsWithIndex & PAWI = OldAttrs.getSlot(index);
+      const FnAttributeWithIndex & PAWI = OldAttrs.getSlot(index);
       unsigned argIndex = PAWI.Index;
 
       // If it's not the return value, move the attribute to the next




From criswell at uiuc.edu  Wed Sep 24 10:08:18 2008
From: criswell at uiuc.edu (John Criswell)
Date: Wed, 24 Sep 2008 15:08:18 -0000
Subject: [llvm-commits] [poolalloc] r56556 -
	/poolalloc/trunk/lib/PoolAllocate/PASimple.cpp
Message-ID: <200809241508.m8OF8J4k009958@zion.cs.uiuc.edu>

Author: criswell
Date: Wed Sep 24 10:08:18 2008
New Revision: 56556

URL: http://llvm.org/viewvc/llvm-project?rev=56556&view=rev
Log:
Removed unneeded header file.
Removed code that promotes stack allocations to heap allocations.  There is
another pass in SAFECode which performs this transform more selectively.

Modified:
    poolalloc/trunk/lib/PoolAllocate/PASimple.cpp

Modified: poolalloc/trunk/lib/PoolAllocate/PASimple.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/PASimple.cpp?rev=56556&r1=56555&r2=56556&view=diff

==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/PASimple.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/PASimple.cpp Wed Sep 24 10:08:18 2008
@@ -24,7 +24,6 @@
 #include "llvm/Instructions.h"
 #include "llvm/Module.h"
 #include "llvm/Constants.h"
-#include "llvm/ParameterAttributes.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
@@ -192,17 +191,6 @@
         Value* args[] = {TheGlobalPool, AllocSize};
         Instruction* x = CallInst::Create(PoolAlloc, &args[0], &args[2], MI->getName(), ii);
         ii->replaceAllUsesWith(CastInst::createPointerCast(x, ii->getType(), "", ii));
-      } else if (AllocaInst * AI = dyn_cast<AllocaInst>(ii)) {
-#if 0
-        DSNode * Node = ECG.getNodeForValue(AI).getNode();
-        FInfo.PoolDescriptors.insert(std::make_pair(Node,TheGlobalPool));
-        toDelete.push_back(ii);
-        //Fixme: fixup size
-        Value* args[] = {TheGlobalPool, ii->getOperand(0)};
-        Instruction* x = CallInst::Create(PoolAlloc, &args[0], &args[2], AI->getName(), ii);
-        ToFree.push_back(x);
-        ii->replaceAllUsesWith(CastInst::createPointerCast(x, ii->getType(), "", ii));
-#endif
       } else if (CallInst * CI = dyn_cast<CallInst>(ii)) {
         CallSite CS(CI);
         Function *CF = CS.getCalledFunction();




From evan.cheng at apple.com  Wed Sep 24 11:25:56 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Wed, 24 Sep 2008 16:25:56 -0000
Subject: [llvm-commits] [llvm] r56557 - in /llvm/trunk:
 include/llvm/ExecutionEngine/ExecutionEngine.h
 lib/ExecutionEngine/ExecutionEngine.cpp lib/ExecutionEngine/JIT/JIT.cpp
Message-ID: <200809241625.m8OGPuqX012870@zion.cs.uiuc.edu>

Author: evancheng
Date: Wed Sep 24 11:25:55 2008
New Revision: 56557

URL: http://llvm.org/viewvc/llvm-project?rev=56557&view=rev
Log:
Add DisableGVCompilation which forces the JIT to assert when it tries to allocate space for a GlobalVariable.

Modified:
    llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h
    llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp
    llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp

Modified: llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h?rev=56557&r1=56556&r2=56557&view=diff

==============================================================================
--- llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h (original)
+++ llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h Wed Sep 24 11:25:55 2008
@@ -65,6 +65,7 @@
   const TargetData *TD;
   ExecutionEngineState state;
   bool LazyCompilationDisabled;
+  bool GVCompilationDisabled;
   bool SymbolSearchingDisabled;
 
 protected:
@@ -254,6 +255,16 @@
   bool isLazyCompilationDisabled() const {
     return LazyCompilationDisabled;
   }
+
+  /// DisableGVCompilation - If called, the JIT will abort if it's asked to allocate
+  /// space and populate a GlobalVariable.
+  void DisableGVCompilation(bool Disabled = true) {
+    GVCompilationDisabled = Disabled;
+  }
+  bool isGVCompilationDisabled() const {
+    return GVCompilationDisabled;
+  }
+
   /// DisableSymbolSearching - If called, the JIT will not try to lookup unknown
   /// symbols with dlsym.  A client can still use InstallLazyFunctionCreator to
   /// resolve symbols in a custom way.

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

==============================================================================
--- llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp Wed Sep 24 11:25:55 2008
@@ -40,6 +40,7 @@
 
 ExecutionEngine::ExecutionEngine(ModuleProvider *P) : LazyFunctionCreator(0) {
   LazyCompilationDisabled = false;
+  GVCompilationDisabled   = false;
   SymbolSearchingDisabled = false;
   Modules.push_back(P);
   assert(P && "ModuleProvider is null?");

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

==============================================================================
--- llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp Wed Sep 24 11:25:55 2008
@@ -552,6 +552,10 @@
     addGlobalMapping(GV, Ptr);
     }
   } else {
+    if (isGVCompilationDisabled()) {
+      cerr << "Compilation of GlobalVariable is disabled!\n";
+      abort();
+    }
     // If the global hasn't been emitted to memory yet, allocate space and
     // emit it into memory.  It goes in the same array as the generated
     // code, jump tables, etc.




From kremenek at apple.com  Wed Sep 24 12:18:41 2008
From: kremenek at apple.com (Ted Kremenek)
Date: Wed, 24 Sep 2008 17:18:41 -0000
Subject: [llvm-commits] [llvm] r56558 - /llvm/tags/checker/checker-97/
Message-ID: <200809241718.m8OHIgmw014680@zion.cs.uiuc.edu>

Author: kremenek
Date: Wed Sep 24 12:18:39 2008
New Revision: 56558

URL: http://llvm.org/viewvc/llvm-project?rev=56558&view=rev
Log:
Tagging checker-97.

Added:
    llvm/tags/checker/checker-97/
      - copied from r56557, llvm/trunk/



From dpatel at apple.com  Wed Sep 24 12:31:12 2008
From: dpatel at apple.com (Devang Patel)
Date: Wed, 24 Sep 2008 10:31:12 -0700
Subject: [llvm-commits] [llvm]
	r55638	-	/llvm/trunk/include/llvm/Function.h
In-Reply-To: <200809241205.03372.baldrick@free.fr>
References: <200809021833.m82IXtBb013569@zion.cs.uiuc.edu>
	<200809222058.28125.baldrick@free.fr>
	<76ED3D4C-F77C-498F-973D-56E0906E2119@apple.com>
	<200809241205.03372.baldrick@free.fr>
Message-ID: <FD8A86B1-33EB-4512-8B14-8B4C905B15F1@apple.com>


On Sep 24, 2008, at 3:05 AM, Duncan Sands wrote:

>>> actually it is theoretically useful to be able to specify readonly
>>> on a
>>> call to a function that is not readonly: it means that this  
>>> particular
>>> call doesn't read memory (presumably because the function is being
>>> passed a special value for some parameter) even though general calls
>>> to it might.
>>
>> How do you distinguish that ?
>
> Consider the example of the llvm.log intrinsic.  Suppose you want to
> generate this intrinsic for all uses of the log builtin in llvm-gcc.
> Since (depending on flags like -fno-math-errno, -ffast-math) the gcc
> log builtin may or may not write to memory (errno), and may or may not
> read from memory (rounding mode), this could be reflected by defining
> llvm.log as:
>
> double llvm.log(double %x, i1 writes_errno, i1 uses_rmode)
>
> This intrinsic cannot be marked readonly or readnone because it
> isn't for all inputs.
>
> Now when generating calls to the intrinsic, llvm-gcc can check its
> -fno-math-errno and -ffast-math flags and generate a variety of
> calls to the llvm intrinsic, with differing attributes:
>
> call double llvm.log(double %x, i1 1, i1 1) ; math-errno and not  
> fast-math
> call double llvm.log(double %x, i1 0, i1 1) readonly ; no errno but  
> not fast-math
> call double llvm.log(double %x, i1 0, i1 0) readnone ; no errno and  
> no rounding mode
>
> Now you can do LTO on modules compiled with different -f flags and
> everything will work out automagically.
>
> Of course this isn't how things are done right now, but they could be
> done this way.  It might even be a good idea!  I hope this explains  
> how
> it could be useful to have a readonly/readnone call to a function that
> is not itself readonly/readnone.


The pass that updates readonly and readone status can look at call  
llvm.log parameters and do the right thing.
-
Devang





From dpatel at apple.com  Wed Sep 24 13:39:34 2008
From: dpatel at apple.com (Devang Patel)
Date: Wed, 24 Sep 2008 11:39:34 -0700
Subject: [llvm-commits] [llvm] r56545 - in /llvm/trunk/lib/AsmParser:
	llvmAsmParser.cpp.cvs llvmAsmParser.h.cvs llvmAsmParser.y
	llvmAsmParser.y.cvs
In-Reply-To: <200809240455.m8O4tob3010734@zion.cs.uiuc.edu>
References: <200809240455.m8O4tob3010734@zion.cs.uiuc.edu>
Message-ID: <7F6C6293-374E-42A9-8873-3A2E4217B798@apple.com>


On Sep 23, 2008, at 9:55 PM, Eric Christopher wrote:

> Author: echristo
> Date: Tue Sep 23 23:55:49 2008
> New Revision: 56545
>
> URL: http://llvm.org/viewvc/llvm-project?rev=56545&view=rev
> Log:
> Fix fallout from revision r56535.


Thanks!
-
Devang





From baldrick at free.fr  Wed Sep 24 14:11:26 2008
From: baldrick at free.fr (Duncan Sands)
Date: Wed, 24 Sep 2008 21:11:26 +0200
Subject: [llvm-commits]
 =?iso-8859-1?q?=5Bllvm=5D_r55638=09-=09/llvm/trunk?=
 =?iso-8859-1?q?/include/llvm/Function=2Eh?=
In-Reply-To: <FD8A86B1-33EB-4512-8B14-8B4C905B15F1@apple.com>
References: <200809021833.m82IXtBb013569@zion.cs.uiuc.edu>
	<200809241205.03372.baldrick@free.fr>
	<FD8A86B1-33EB-4512-8B14-8B4C905B15F1@apple.com>
Message-ID: <200809242111.26563.baldrick@free.fr>

> The pass that updates readonly and readone status can look at call  
> llvm.log parameters and do the right thing.

Not if there are several calls to it with different parameters,
which may be the case with link time optimization.  Also, this
is a general mechanism - imagine it being used not for an llvm
intrinsic but for a routine from a runtime library; then llvm
wouldn't know about the special properties of the function.  But
that's ok, it doesn't have to!

Ciao,

Duncan.


From ofv at wanadoo.es  Wed Sep 24 14:27:55 2008
From: ofv at wanadoo.es (Oscar Fuentes)
Date: Wed, 24 Sep 2008 19:27:55 -0000
Subject: [llvm-commits] [llvm] r56565 - /llvm/trunk/CMakeLists.txt
Message-ID: <200809241927.m8OJRucr019437@zion.cs.uiuc.edu>

Author: ofv
Date: Wed Sep 24 14:27:54 2008
New Revision: 56565

URL: http://llvm.org/viewvc/llvm-project?rev=56565&view=rev
Log:
CMake: Disabled some warnings for MSVC.

Modified:
    llvm/trunk/CMakeLists.txt

Modified: llvm/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=56565&r1=56564&r2=56565&view=diff

==============================================================================
--- llvm/trunk/CMakeLists.txt (original)
+++ llvm/trunk/CMakeLists.txt Wed Sep 24 14:27:54 2008
@@ -85,6 +85,8 @@
   add_definitions( -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS )
   add_definitions( -D_SCL_SECURE_NO_WARNINGS -DCRT_NONSTDC_NO_WARNINGS )
   add_definitions( -D_SCL_SECURE_NO_DEPRECATE )
+  add_definitions( -wd4146 -wd4503 -wd4996 -wd4800 -wd4244 -wd4624 )
+  add_definitions( -wd4355 -wd4715 )
 endif( MSVC )
 
 include_directories( ${LLVM_BINARY_DIR}/include ${llvm_include_path})




From dpatel at apple.com  Wed Sep 24 15:12:41 2008
From: dpatel at apple.com (Devang Patel)
Date: Wed, 24 Sep 2008 13:12:41 -0700
Subject: [llvm-commits] [llvm]
	r55638	-	/llvm/trunk/include/llvm/Function.h
In-Reply-To: <200809242111.26563.baldrick@free.fr>
References: <200809021833.m82IXtBb013569@zion.cs.uiuc.edu>
	<200809241205.03372.baldrick@free.fr>
	<FD8A86B1-33EB-4512-8B14-8B4C905B15F1@apple.com>
	<200809242111.26563.baldrick@free.fr>
Message-ID: <1E87DEA3-DC60-4806-9E87-B8299D0B430F@apple.com>


On Sep 24, 2008, at 12:11 PM, Duncan Sands wrote:

>> The pass that updates readonly and readone status can look at call
>> llvm.log parameters and do the right thing.
>
> Not if there are several calls to it with different parameters,
> which may be the case with link time optimization.

Would it be possible for you to give an example here ? Thx.

>  Also, this
> is a general mechanism - imagine it being used not for an llvm
> intrinsic but for a routine from a runtime library; then llvm
> wouldn't know about the special properties of the function.  But
> that's ok, it doesn't have to!

Sorry for being dense. I do not understand.
If I am using a library function F then I want the optimizer to know  
whether F is readonly or not. I do not care whether llvm.log() called  
by F is readonly or not.

-
Devang





From isanbard at gmail.com  Wed Sep 24 16:01:54 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 24 Sep 2008 21:01:54 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r56566 - in /llvm-gcc-4.2/tags/Apple:
 llvmCore-2070.1/ llvmgcc42-2070.1/
Message-ID: <200809242101.m8OL1sbU022573@zion.cs.uiuc.edu>

Author: void
Date: Wed Sep 24 16:01:51 2008
New Revision: 56566

URL: http://llvm.org/viewvc/llvm-project?rev=56566&view=rev
Log:
Renmae to the correct tag name.

Added:
    llvm-gcc-4.2/tags/Apple/llvmgcc42-2070.1/
      - copied from r56565, llvm-gcc-4.2/tags/Apple/llvmCore-2070.1/
Removed:
    llvm-gcc-4.2/tags/Apple/llvmCore-2070.1/



From snaroff at apple.com  Wed Sep 24 12:23:29 2008
From: snaroff at apple.com (Steve Naroff)
Date: Wed, 24 Sep 2008 17:23:29 -0000
Subject: [llvm-commits] [llvm] r56561 -
	/llvm/trunk/win32/VMCore/VMCore.vcproj
Message-ID: <200809241723.m8OHNT4f014882@zion.cs.uiuc.edu>

Author: snaroff
Date: Wed Sep 24 12:23:28 2008
New Revision: 56561

URL: http://llvm.org/viewvc/llvm-project?rev=56561&view=rev
Log:
Add Attributes.cpp to the vcproj.

Modified:
    llvm/trunk/win32/VMCore/VMCore.vcproj

Modified: llvm/trunk/win32/VMCore/VMCore.vcproj
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/win32/VMCore/VMCore.vcproj?rev=56561&r1=56560&r2=56561&view=diff

==============================================================================
--- llvm/trunk/win32/VMCore/VMCore.vcproj (original)
+++ llvm/trunk/win32/VMCore/VMCore.vcproj Wed Sep 24 12:23:28 2008
@@ -310,6 +310,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\lib\VMCore\Attributes.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\lib\VMCore\AutoUpgrade.cpp"
 				>
 			</File>




From resistor at mac.com  Wed Sep 24 16:30:39 2008
From: resistor at mac.com (Owen Anderson)
Date: Wed, 24 Sep 2008 21:30:39 -0000
Subject: [llvm-commits] [llvm] r56567 -
	/llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp
Message-ID: <200809242130.m8OLUd8v023531@zion.cs.uiuc.edu>

Author: resistor
Date: Wed Sep 24 16:30:38 2008
New Revision: 56567

URL: http://llvm.org/viewvc/llvm-project?rev=56567&view=rev
Log:
Fix off-by-one error when updating live intervals.

Modified:
    llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp

Modified: llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp?rev=56567&r1=56566&r2=56567&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp (original)
+++ llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp Wed Sep 24 16:30:38 2008
@@ -822,7 +822,7 @@
                          LiveIntervals::getUseIndex(LI.getInstructionIndex(I)));
         
         LiveRange LR (LI.getMBBStartIdx(I->getParent()),
-                      LiveIntervals::getUseIndex(LI.getInstructionIndex(I)),
+                      LiveIntervals::getUseIndex(LI.getInstructionIndex(I))+1,
                       FirstVN);
         
         Int.addRange(LR);




From asl at math.spbu.ru  Wed Sep 24 17:11:26 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 24 Sep 2008 22:11:26 -0000
Subject: [llvm-commits] [llvm] r56569 -
	/llvm/trunk/lib/Target/PIC16/PIC16AsmPrinter.cpp
Message-ID: <200809242211.m8OMBQf4024800@zion.cs.uiuc.edu>

Author: asl
Date: Wed Sep 24 17:11:26 2008
New Revision: 56569

URL: http://llvm.org/viewvc/llvm-project?rev=56569&view=rev
Log:
Remove dead code for PIC16 (preparation to switch to new section handling stuff)

Modified:
    llvm/trunk/lib/Target/PIC16/PIC16AsmPrinter.cpp

Modified: llvm/trunk/lib/Target/PIC16/PIC16AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PIC16/PIC16AsmPrinter.cpp?rev=56569&r1=56568&r2=56569&view=diff

==============================================================================
--- llvm/trunk/lib/Target/PIC16/PIC16AsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/PIC16/PIC16AsmPrinter.cpp Wed Sep 24 17:11:26 2008
@@ -416,10 +416,7 @@
           (I->hasInternalLinkage() || I->hasWeakLinkage() ||
            I->hasLinkOnceLinkage() || I->hasCommonLinkage())) {
         if (Size == 0) Size = 1;   // .comm Foo, 0 is undefined, avoid it.
-        if (!NoZerosInBSS && TAI->getBSSSection())
-          SwitchToDataSection(M.getModuleIdentifier().c_str(), I);
-        else
-          SwitchToDataSection(TAI->getDataSection(), I);
+        SwitchToDataSection(M.getModuleIdentifier().c_str(), I);
         if (TAI->getLCOMMDirective() != NULL) {
           if (I->hasInternalLinkage()) {
             O << TAI->getLCOMMDirective() << name << "," << Size;
@@ -450,13 +447,6 @@
       // FALL THROUGH
 
     case GlobalValue::InternalLinkage: 
-      if (I->isConstant()) {
-        const ConstantArray *CVA = dyn_cast<ConstantArray>(C);
-        if (TAI->getCStringSection() && CVA && CVA->isCString()) {
-          SwitchToDataSection(TAI->getCStringSection(), I);
-          break;
-        }
-      }
       break;
 
     default:




From asl at math.spbu.ru  Wed Sep 24 17:11:43 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 24 Sep 2008 22:11:43 -0000
Subject: [llvm-commits] [llvm] r56570 -
	/llvm/trunk/lib/Target/CellSPU/SPUAsmPrinter.cpp
Message-ID: <200809242211.m8OMBhvK024819@zion.cs.uiuc.edu>

Author: asl
Date: Wed Sep 24 17:11:42 2008
New Revision: 56570

URL: http://llvm.org/viewvc/llvm-project?rev=56570&view=rev
Log:
SPU section handling is really huge mess. Replace remaining TAI calls for sections with explicit names in order not to block existing backends during section handling migration. SPU folks! Please consider using new section handling facility someday.

Modified:
    llvm/trunk/lib/Target/CellSPU/SPUAsmPrinter.cpp

Modified: llvm/trunk/lib/Target/CellSPU/SPUAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CellSPU/SPUAsmPrinter.cpp?rev=56570&r1=56569&r2=56570&view=diff

==============================================================================
--- llvm/trunk/lib/Target/CellSPU/SPUAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/CellSPU/SPUAsmPrinter.cpp Wed Sep 24 17:11:42 2008
@@ -486,7 +486,7 @@
 
 bool LinuxAsmPrinter::doInitialization(Module &M) {
   bool Result = AsmPrinter::doInitialization(M);
-  SwitchToTextSection(TAI->getTextSection());
+  SwitchToTextSection("\t.text");
   // Emit initial debug information.
   DW.BeginModule(&M);
   MMI = getAnalysisToUpdate<MachineModuleInfo>();
@@ -556,7 +556,7 @@
         if (I->isConstant()) {
           const ConstantArray *CVA = dyn_cast<ConstantArray>(C);
           if (TAI->getCStringSection() && CVA && CVA->isCString()) {
-            SwitchToDataSection(TAI->getCStringSection(), I);
+            SwitchToDataSection("\t.cstring", I);
             break;
           }
         }




From asl at math.spbu.ru  Wed Sep 24 17:12:10 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 24 Sep 2008 22:12:10 -0000
Subject: [llvm-commits] [llvm] r56571 - in /llvm/trunk:
 include/llvm/CodeGen/AsmPrinter.h include/llvm/Target/TargetAsmInfo.h
 lib/CodeGen/AsmPrinter/AsmPrinter.cpp
Message-ID: <200809242212.m8OMCA1o024841@zion.cs.uiuc.edu>

Author: asl
Date: Wed Sep 24 17:12:10 2008
New Revision: 56571

URL: http://llvm.org/viewvc/llvm-project?rev=56571&view=rev
Log:
Provide direct function to switch to Section

Modified:
    llvm/trunk/include/llvm/CodeGen/AsmPrinter.h
    llvm/trunk/include/llvm/Target/TargetAsmInfo.h
    llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp

Modified: llvm/trunk/include/llvm/CodeGen/AsmPrinter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/AsmPrinter.h?rev=56571&r1=56570&r2=56571&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/AsmPrinter.h (original)
+++ llvm/trunk/include/llvm/CodeGen/AsmPrinter.h Wed Sep 24 17:12:10 2008
@@ -32,6 +32,7 @@
   class MachineConstantPoolValue;
   class MachineModuleInfo;
   class Mangler;
+  class Section;
   class TargetAsmInfo;
   class Type;
   class raw_ostream;
@@ -127,7 +128,11 @@
     /// are the same.
     ///
     void SwitchToDataSection(const char *NewSection, const GlobalValue *GV = NULL);
-    
+
+    /// SwitchToSection - Switch to the specified section of the executable if
+    /// we are not already in it!
+    void SwitchToSection(const Section* NS);
+
     /// getGlobalLinkName - Returns the asm/link name of of the specified
     /// global variable.  Should be overridden by each target asm printer to
     /// generate the appropriate value.

Modified: llvm/trunk/include/llvm/Target/TargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetAsmInfo.h?rev=56571&r1=56570&r2=56571&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/TargetAsmInfo.h (original)
+++ llvm/trunk/include/llvm/Target/TargetAsmInfo.h Wed Sep 24 17:12:10 2008
@@ -114,6 +114,7 @@
     bool isNamed() const { return Flags & SectionFlags::Named; }
     unsigned getEntitySize() const { return (Flags >> 24) & 0xFF; }
     const std::string& getName() const { return Name; }
+    unsigned getFlags() const { return Flags; }
   };
 
   /// TargetAsmInfo - This class is intended to be used as a base class for asm

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp?rev=56571&r1=56570&r2=56571&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp Wed Sep 24 17:12:10 2008
@@ -105,6 +105,26 @@
   IsInTextSection = false;
 }
 
+/// SwitchToSection - Switch to the specified section of the executable if we
+/// are not already in it!
+void AsmPrinter::SwitchToSection(const Section* NS) {
+  const std::string& NewSection = NS->getName();
+
+  // If we're already in this section, we're done.
+  if (CurrentSection == NewSection) return;
+
+  // Close the current section, if applicable.
+  if (TAI->getSectionEndDirectiveSuffix() && !CurrentSection.empty())
+    O << CurrentSection << TAI->getSectionEndDirectiveSuffix() << '\n';
+
+  // FIXME: Make CurrentSection a Section* in the future
+  CurrentSection = NewSection;
+
+  if (!CurrentSection.empty())
+    O << CurrentSection << TAI->getDataSectionStartSuffix() << '\n';
+
+  IsInTextSection = (NS->getFlags() & SectionFlags::Code);
+}
 
 void AsmPrinter::getAnalysisUsage(AnalysisUsage &AU) const {
   MachineFunctionPass::getAnalysisUsage(AU);




From asl at math.spbu.ru  Wed Sep 24 17:13:08 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 24 Sep 2008 22:13:08 -0000
Subject: [llvm-commits] [llvm] r56572 - in /llvm/trunk:
 include/llvm/CodeGen/ lib/CodeGen/AsmPrinter/ lib/Target/ARM/AsmPrinter/
 lib/Target/Alpha/ lib/Target/CellSPU/ lib/Target/IA64/ lib/Target/Mips/
 lib/Target/PowerPC/AsmPrinter/ lib/Target/Sparc/ lib/Target/X86/AsmPrinter/
Message-ID: <200809242213.m8OMD8Ak024895@zion.cs.uiuc.edu>

Author: asl
Date: Wed Sep 24 17:13:07 2008
New Revision: 56572

URL: http://llvm.org/viewvc/llvm-project?rev=56572&view=rev
Log:
Drop obsolete hook and change all usage to new interface

Modified:
    llvm/trunk/include/llvm/CodeGen/AsmPrinter.h
    llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
    llvm/trunk/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
    llvm/trunk/lib/Target/Alpha/AlphaAsmPrinter.cpp
    llvm/trunk/lib/Target/CellSPU/SPUAsmPrinter.cpp
    llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp
    llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp
    llvm/trunk/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp
    llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp
    llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
    llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h
    llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
    llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h

Modified: llvm/trunk/include/llvm/CodeGen/AsmPrinter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/AsmPrinter.h?rev=56572&r1=56571&r2=56572&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/AsmPrinter.h (original)
+++ llvm/trunk/include/llvm/CodeGen/AsmPrinter.h Wed Sep 24 17:13:07 2008
@@ -184,12 +184,6 @@
                                        unsigned AsmVariant, 
                                        const char *ExtraCode);
     
-    /// getSectionForFunction - Return the section that we should emit the
-    /// specified function body into.  This defaults to 'TextSection'.  This
-    /// should most likely be overridden by the target to put linkonce/weak
-    /// functions into special sections.
-    virtual std::string getSectionForFunction(const Function &F) const;
-    
     /// SetupMachineFunction - This should be called when a new MachineFunction
     /// is being processed from runOnMachineFunction.
     void SetupMachineFunction(MachineFunction &MF);

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp?rev=56572&r1=56571&r2=56572&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp Wed Sep 24 17:13:07 2008
@@ -47,11 +47,6 @@
                     E = GCMetadataPrinters.end(); I != E; ++I)
     delete I->second;
 }
-    
-std::string AsmPrinter::getSectionForFunction(const Function &F) const {
-  return TAI->getTextSection();
-}
-
 
 /// SwitchToTextSection - Switch to the specified text section of the executable
 /// if we are not already in it!
@@ -331,7 +326,7 @@
     // function body itself, otherwise the label differences won't make sense.
     // We should also do if the section name is NULL or function is declared in
     // discardable section.
-    SwitchToTextSection(getSectionForFunction(*F).c_str(), F);
+    SwitchToTextSection(TAI->SectionForGlobal(F).c_str(), F);
   } else {
     SwitchToDataSection(JumpTableDataSection);
   }

Modified: llvm/trunk/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp?rev=56572&r1=56571&r2=56572&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp Wed Sep 24 17:13:07 2008
@@ -130,10 +130,6 @@
     bool doInitialization(Module &M);
     bool doFinalization(Module &M);
 
-    /// getSectionForFunction - Return the section that we should emit the
-    /// specified function body into.
-    virtual std::string getSectionForFunction(const Function &F) const;
-
     /// EmitMachineConstantPoolValue - Print a machine constantpool value to
     /// the .s file.
     virtual void EmitMachineConstantPoolValue(MachineConstantPoolValue *MCPV) {
@@ -179,11 +175,6 @@
 
 #include "ARMGenAsmWriter.inc"
 
-// Substitute old hook with new one temporary
-std::string ARMAsmPrinter::getSectionForFunction(const Function &F) const {
-  return TAI->SectionForGlobal(&F);
-}
-
 /// runOnMachineFunction - This uses the printInstruction()
 /// method to print assembly for each instruction.
 ///

Modified: llvm/trunk/lib/Target/Alpha/AlphaAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Alpha/AlphaAsmPrinter.cpp?rev=56572&r1=56571&r2=56572&view=diff

==============================================================================
--- llvm/trunk/lib/Target/Alpha/AlphaAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/Alpha/AlphaAsmPrinter.cpp Wed Sep 24 17:13:07 2008
@@ -149,7 +149,7 @@
 
   // Print out labels for the function.
   const Function *F = MF.getFunction();
-  SwitchToTextSection(getSectionForFunction(*F).c_str(), F);
+  SwitchToTextSection(TAI->SectionForGlobal(F).c_str(), F);
 
   EmitAlignment(4, F);
   switch (F->getLinkage()) {

Modified: llvm/trunk/lib/Target/CellSPU/SPUAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CellSPU/SPUAsmPrinter.cpp?rev=56572&r1=56571&r2=56572&view=diff

==============================================================================
--- llvm/trunk/lib/Target/CellSPU/SPUAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/CellSPU/SPUAsmPrinter.cpp Wed Sep 24 17:13:07 2008
@@ -297,9 +297,6 @@
       SPUAsmPrinter::getAnalysisUsage(AU);
     }
 
-    /// getSectionForFunction - Return the section that we should emit the
-    /// specified function body into.
-    virtual std::string getSectionForFunction(const Function &F) const;
   };
 } // end of anonymous namespace
 
@@ -406,19 +403,6 @@
   printInstruction(MI);
 }
 
-
-
-std::string LinuxAsmPrinter::getSectionForFunction(const Function &F) const {
-  switch (F.getLinkage()) {
-  default: assert(0 && "Unknown linkage type!");
-  case Function::ExternalLinkage:
-  case Function::InternalLinkage: return TAI->getTextSection();
-  case Function::WeakLinkage:
-  case Function::LinkOnceLinkage:
-    return ""; // Print nothing for the time being...
-  }
-}
-
 /// runOnMachineFunction - This uses the printMachineInstruction()
 /// method to print assembly for each instruction.
 ///
@@ -434,7 +418,7 @@
   // Print out labels for the function.
   const Function *F = MF.getFunction();
 
-  SwitchToTextSection(getSectionForFunction(*F).c_str(), F);
+  SwitchToTextSection(TAI->SectionForGlobal(F).c_str(), F);
   EmitAlignment(3, F);
 
   switch (F->getLinkage()) {

Modified: llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp?rev=56572&r1=56571&r2=56572&view=diff

==============================================================================
--- llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp Wed Sep 24 17:13:07 2008
@@ -106,8 +106,6 @@
       printOp(MI->getOperand(OpNo), true); // this is a br.call instruction
     }
 
-    std::string getSectionForFunction(const Function &F) const;
-
     void printMachineInstruction(const MachineInstr *MI);
     void printOp(const MachineOperand &MO, bool isBRCALLinsn= false);
     void printModuleLevelGV(const GlobalVariable* GVar);
@@ -121,12 +119,6 @@
 // Include the auto-generated portion of the assembly writer.
 #include "IA64GenAsmWriter.inc"
 
-
-// Substitute old hook with new one temporary
-std::string IA64AsmPrinter::getSectionForFunction(const Function &F) const {
-  return TAI->SectionForGlobal(&F);
-}
-
 /// runOnMachineFunction - This uses the printMachineInstruction()
 /// method to print assembly for each instruction.
 ///
@@ -138,7 +130,7 @@
   EmitConstantPool(MF.getConstantPool());
 
   const Function *F = MF.getFunction();
-  SwitchToTextSection(getSectionForFunction(*F).c_str(), F);
+  SwitchToTextSection(TAI->SectionForGlobal(F).c_str(), F);
 
   // Print out labels for the function.
   EmitAlignment(5);

Modified: llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp?rev=56572&r1=56571&r2=56572&view=diff

==============================================================================
--- llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp Wed Sep 24 17:13:07 2008
@@ -59,7 +59,6 @@
       return "Mips Assembly Printer";
     }
 
-    virtual std::string getSectionForFunction(const Function &F) const;
     bool PrintAsmOperand(const MachineInstr *MI, unsigned OpNo, 
                          unsigned AsmVariant, const char *ExtraCode);
     void printOperand(const MachineInstr *MI, int opNum);
@@ -219,11 +218,6 @@
   return NULL;
 }  
 
-// Substitute old hook with new one temporary
-std::string MipsAsmPrinter::getSectionForFunction(const Function &F) const {
-  return TAI->SectionForGlobal(&F);
-}
-
 /// Emit the directives used by GAS on the start of functions
 void MipsAsmPrinter::
 emitFunctionStart(MachineFunction &MF)

Modified: llvm/trunk/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp?rev=56572&r1=56571&r2=56572&view=diff

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp Wed Sep 24 17:13:07 2008
@@ -315,9 +315,6 @@
       PPCAsmPrinter::getAnalysisUsage(AU);
     }
 
-    /// getSectionForFunction - Return the section that we should emit the
-    /// specified function body into.
-    virtual std::string getSectionForFunction(const Function &F) const;
     void printModuleLevelGV(const GlobalVariable* GVar);
   };
 
@@ -347,9 +344,6 @@
       PPCAsmPrinter::getAnalysisUsage(AU);
     }
 
-    /// getSectionForFunction - Return the section that we should emit the
-    /// specified function body into.
-    virtual std::string getSectionForFunction(const Function &F) const;
     void printModuleLevelGV(const GlobalVariable* GVar);
   };
 } // end of anonymous namespace
@@ -577,7 +571,7 @@
 
   // Print out labels for the function.
   const Function *F = MF.getFunction();
-  SwitchToTextSection(getSectionForFunction(*F).c_str(), F);
+  SwitchToTextSection(TAI->SectionForGlobal(F).c_str(), F);
 
   switch (F->getLinkage()) {
   default: assert(0 && "Unknown linkage type!");
@@ -753,14 +747,6 @@
   return AsmPrinter::doFinalization(M);
 }
 
-std::string PPCLinuxAsmPrinter::getSectionForFunction(const Function &F) const {
-  return TAI->SectionForGlobal(&F);
-}
-
-std::string PPCDarwinAsmPrinter::getSectionForFunction(const Function &F) const {
-  return TAI->SectionForGlobal(&F);
-}
-
 /// runOnMachineFunction - This uses the printMachineInstruction()
 /// method to print assembly for each instruction.
 ///
@@ -773,7 +759,7 @@
 
   // Print out labels for the function.
   const Function *F = MF.getFunction();
-  SwitchToTextSection(getSectionForFunction(*F).c_str(), F);
+  SwitchToTextSection(TAI->SectionForGlobal(F).c_str(), F);
 
   switch (F->getLinkage()) {
   default: assert(0 && "Unknown linkage type!");

Modified: llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp?rev=56572&r1=56571&r2=56572&view=diff

==============================================================================
--- llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp Wed Sep 24 17:13:07 2008
@@ -63,7 +63,6 @@
 
     bool printInstruction(const MachineInstr *MI);  // autogenerated.
     bool runOnMachineFunction(MachineFunction &F);
-    std::string getSectionForFunction(const Function &F) const;
     bool doInitialization(Module &M);
     bool doFinalization(Module &M);
   };
@@ -81,11 +80,6 @@
   return new SparcAsmPrinter(o, tm, tm.getTargetAsmInfo());
 }
 
-// Substitute old hook with new one temporary
-std::string SparcAsmPrinter::getSectionForFunction(const Function &F) const {
-  return TAI->SectionForGlobal(&F);
-}
-
 /// runOnMachineFunction - This uses the printInstruction()
 /// method to print assembly for each instruction.
 ///
@@ -105,7 +99,7 @@
 
   // Print out the label for the function.
   const Function *F = MF.getFunction();
-  SwitchToTextSection(getSectionForFunction(*F).c_str(), F);
+  SwitchToTextSection(TAI->SectionForGlobal(F).c_str(), F);
   EmitAlignment(4, F);
   O << "\t.globl\t" << CurrentFnName << '\n';
 

Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp?rev=56572&r1=56571&r2=56572&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp Wed Sep 24 17:13:07 2008
@@ -146,11 +146,6 @@
   }
 }
 
-// Substitute old hook with new one temporary
-std::string X86ATTAsmPrinter::getSectionForFunction(const Function &F) const {
-  return TAI->SectionForGlobal(&F);
-}
-
 void X86ATTAsmPrinter::emitFunctionHeader(const MachineFunction &MF) {
   const Function *F = MF.getFunction();
   std::string SectionName = TAI->SectionForGlobal(F);

Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h?rev=56572&r1=56571&r2=56572&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h Wed Sep 24 17:13:07 2008
@@ -124,10 +124,6 @@
 
   bool runOnMachineFunction(MachineFunction &F);
 
-  /// getSectionForFunction - Return the section that we should emit the
-  /// specified function body into.
-  virtual std::string getSectionForFunction(const Function &F) const;
-
   void emitFunctionHeader(const MachineFunction &MF);
 
   // Necessary for Darwin to print out the apprioriate types of linker stubs

Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp?rev=56572&r1=56571&r2=56572&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp Wed Sep 24 17:13:07 2008
@@ -117,12 +117,6 @@
   }
 }
 
-
-std::string X86IntelAsmPrinter::getSectionForFunction(const Function &F) const {
-  // Intel asm always emits functions to _text.
-  return "_text";
-}
-
 /// runOnMachineFunction - This uses the printMachineInstruction()
 /// method to print assembly for each instruction.
 ///
@@ -144,7 +138,7 @@
 
   decorateName(CurrentFnName, F);
 
-  SwitchToTextSection(getSectionForFunction(*F).c_str(), F);
+  SwitchToTextSection("_text", F);
 
   unsigned FnAlign = OptimizeForSize ? 1 : 4;
   if (!F->isDeclaration() && F->hasNote(FnAttr::OptimizeForSize))

Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h?rev=56572&r1=56571&r2=56572&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h Wed Sep 24 17:13:07 2008
@@ -131,10 +131,6 @@
 
   void decorateName(std::string& Name, const GlobalValue* GV);
 
-  /// getSectionForFunction - Return the section that we should emit the
-  /// specified function body into.
-  virtual std::string getSectionForFunction(const Function &F) const;
-
   virtual void EmitString(const ConstantArray *CVA) const;
 
   // Necessary for dllexport support




From asl at math.spbu.ru  Wed Sep 24 17:14:23 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 24 Sep 2008 22:14:23 -0000
Subject: [llvm-commits] [llvm] r56573 - in /llvm/trunk:
 include/llvm/Target/TargetAsmInfo.h lib/CodeGen/AsmPrinter/AsmPrinter.cpp
 lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
 lib/Target/Alpha/AlphaAsmPrinter.cpp lib/Target/CellSPU/SPUAsmPrinter.cpp
 lib/Target/IA64/IA64AsmPrinter.cpp lib/Target/Mips/MipsAsmPrinter.cpp
 lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp
 lib/Target/Sparc/SparcAsmPrinter.cpp lib/Target/TargetAsmInfo.cpp
 lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
Message-ID: <200809242214.m8OMEOWU024959@zion.cs.uiuc.edu>

Author: asl
Date: Wed Sep 24 17:14:23 2008
New Revision: 56573

URL: http://llvm.org/viewvc/llvm-project?rev=56573&view=rev
Log:
Move actual section printing stuff to AsmPrinter from TAI reducing heap traffic.

Modified:
    llvm/trunk/include/llvm/Target/TargetAsmInfo.h
    llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
    llvm/trunk/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
    llvm/trunk/lib/Target/Alpha/AlphaAsmPrinter.cpp
    llvm/trunk/lib/Target/CellSPU/SPUAsmPrinter.cpp
    llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp
    llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp
    llvm/trunk/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp
    llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp
    llvm/trunk/lib/Target/TargetAsmInfo.cpp
    llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp

Modified: llvm/trunk/include/llvm/Target/TargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetAsmInfo.h?rev=56573&r1=56572&r2=56573&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/TargetAsmInfo.h (original)
+++ llvm/trunk/include/llvm/Target/TargetAsmInfo.h Wed Sep 24 17:14:23 2008
@@ -113,6 +113,7 @@
   public:
     bool isNamed() const { return Flags & SectionFlags::Named; }
     unsigned getEntitySize() const { return (Flags >> 24) & 0xFF; }
+
     const std::string& getName() const { return Name; }
     unsigned getFlags() const { return Flags; }
   };
@@ -573,7 +574,7 @@
 
     /// SectionForGlobal - This hooks returns proper section name for given
     /// global with all necessary flags and marks.
-    virtual std::string SectionForGlobal(const GlobalValue *GV) const;
+    virtual const Section* SectionForGlobal(const GlobalValue *GV) const;
 
     // Helper methods for SectionForGlobal
     virtual std::string UniqueSectionForGlobal(const GlobalValue* GV,

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp?rev=56573&r1=56572&r2=56573&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp Wed Sep 24 17:14:23 2008
@@ -115,8 +115,18 @@
   // FIXME: Make CurrentSection a Section* in the future
   CurrentSection = NewSection;
 
-  if (!CurrentSection.empty())
-    O << CurrentSection << TAI->getDataSectionStartSuffix() << '\n';
+  if (!CurrentSection.empty()) {
+    // If section is named we need to switch into it via special '.section'
+    // directive and also append funky flags. Otherwise - section name is just
+    // some magic assembler directive.
+    if (NS->isNamed())
+      O << TAI->getSwitchToSectionDirective()
+        << CurrentSection
+        << TAI->getSectionFlags(NS->getFlags());
+    else
+      O << CurrentSection;
+    O << TAI->getDataSectionStartSuffix() << '\n';
+  }
 
   IsInTextSection = (NS->getFlags() & SectionFlags::Code);
 }
@@ -326,7 +336,7 @@
     // function body itself, otherwise the label differences won't make sense.
     // We should also do if the section name is NULL or function is declared in
     // discardable section.
-    SwitchToTextSection(TAI->SectionForGlobal(F).c_str(), F);
+    SwitchToSection(TAI->SectionForGlobal(F));
   } else {
     SwitchToDataSection(JumpTableDataSection);
   }

Modified: llvm/trunk/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp?rev=56573&r1=56572&r2=56573&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp Wed Sep 24 17:14:23 2008
@@ -846,7 +846,6 @@
     return;
   }
 
-  std::string SectionName = TAI->SectionForGlobal(GVar);
   std::string name = Mang->getValueName(GVar);
   Constant *C = GVar->getInitializer();
   const Type *Type = C->getType();
@@ -858,7 +857,7 @@
   if (Subtarget->isTargetELF())
     O << "\t.type " << name << ",%object\n";
 
-  SwitchToDataSection(SectionName.c_str());
+  SwitchToSection(TAI->SectionForGlobal(GVar));
 
   if (C->isNullValue() && !GVar->hasSection() && !GVar->isThreadLocal()) {
     // FIXME: This seems to be pretty darwin-specific

Modified: llvm/trunk/lib/Target/Alpha/AlphaAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Alpha/AlphaAsmPrinter.cpp?rev=56573&r1=56572&r2=56573&view=diff

==============================================================================
--- llvm/trunk/lib/Target/Alpha/AlphaAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/Alpha/AlphaAsmPrinter.cpp Wed Sep 24 17:14:23 2008
@@ -149,7 +149,7 @@
 
   // Print out labels for the function.
   const Function *F = MF.getFunction();
-  SwitchToTextSection(TAI->SectionForGlobal(F).c_str(), F);
+  SwitchToSection(TAI->SectionForGlobal(F));
 
   EmitAlignment(4, F);
   switch (F->getLinkage()) {
@@ -214,14 +214,13 @@
   if (EmitSpecialLLVMGlobal(GVar))
     return;
 
-  std::string SectionName = TAI->SectionForGlobal(GVar);
   std::string name = Mang->getValueName(GVar);
   Constant *C = GVar->getInitializer();
   unsigned Size = TD->getABITypeSize(C->getType());
   unsigned Align = TD->getPreferredAlignmentLog(GVar);
 
   // 0: Switch to section
-  SwitchToDataSection(SectionName.c_str());
+  SwitchToSection(TAI->SectionForGlobal(GVar));
 
   // 1: Check visibility
   printVisibility(name, GVar->getVisibility());

Modified: llvm/trunk/lib/Target/CellSPU/SPUAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CellSPU/SPUAsmPrinter.cpp?rev=56573&r1=56572&r2=56573&view=diff

==============================================================================
--- llvm/trunk/lib/Target/CellSPU/SPUAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/CellSPU/SPUAsmPrinter.cpp Wed Sep 24 17:14:23 2008
@@ -418,7 +418,7 @@
   // Print out labels for the function.
   const Function *F = MF.getFunction();
 
-  SwitchToTextSection(TAI->SectionForGlobal(F).c_str(), F);
+  SwitchToSection(TAI->SectionForGlobal(F));
   EmitAlignment(3, F);
 
   switch (F->getLinkage()) {

Modified: llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp?rev=56573&r1=56572&r2=56573&view=diff

==============================================================================
--- llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp Wed Sep 24 17:14:23 2008
@@ -130,7 +130,7 @@
   EmitConstantPool(MF.getConstantPool());
 
   const Function *F = MF.getFunction();
-  SwitchToTextSection(TAI->SectionForGlobal(F).c_str(), F);
+  SwitchToSection(TAI->SectionForGlobal(F));
 
   // Print out labels for the function.
   EmitAlignment(5);
@@ -264,7 +264,6 @@
     return;
 
   O << "\n\n";
-  std::string SectionName = TAI->SectionForGlobal(GVar);
   std::string name = Mang->getValueName(GVar);
   Constant *C = GVar->getInitializer();
   unsigned Size = TD->getABITypeSize(C->getType());
@@ -272,7 +271,7 @@
 
   printVisibility(name, GVar->getVisibility());
 
-  SwitchToDataSection(SectionName.c_str());
+  SwitchToSection(TAI->SectionForGlobal(GVar));
 
   if (C->isNullValue() && !GVar->hasSection()) {
     if (!GVar->isThreadLocal() &&

Modified: llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp?rev=56573&r1=56572&r2=56573&view=diff

==============================================================================
--- llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp Wed Sep 24 17:14:23 2008
@@ -224,7 +224,7 @@
 {
   // Print out the label for the function.
   const Function *F = MF.getFunction();
-  SwitchToTextSection(TAI->SectionForGlobal(F).c_str());
+  SwitchToSection(TAI->SectionForGlobal(F));
 
   // 2 bits aligned
   EmitAlignment(2, F);
@@ -479,7 +479,6 @@
     return;
 
   O << "\n\n";
-  std::string SectionName = TAI->SectionForGlobal(GVar);
   std::string name = Mang->getValueName(GVar);
   Constant *C = GVar->getInitializer();
   const Type *CTy = C->getType();
@@ -501,7 +500,7 @@
 
   printVisibility(name, GVar->getVisibility());
 
-  SwitchToDataSection(SectionName.c_str());
+  SwitchToSection(TAI->SectionForGlobal(GVar));
 
   if (C->isNullValue() && !GVar->hasSection()) {
     if (!GVar->isThreadLocal() &&

Modified: llvm/trunk/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp?rev=56573&r1=56572&r2=56573&view=diff

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp Wed Sep 24 17:14:23 2008
@@ -571,7 +571,7 @@
 
   // Print out labels for the function.
   const Function *F = MF.getFunction();
-  SwitchToTextSection(TAI->SectionForGlobal(F).c_str(), F);
+  SwitchToSection(TAI->SectionForGlobal(F));
 
   switch (F->getLinkage()) {
   default: assert(0 && "Unknown linkage type!");
@@ -662,7 +662,6 @@
     return;
 
   std::string name = Mang->getValueName(GVar);
-  std::string SectionName = TAI->SectionForGlobal(GVar);
 
   printVisibility(name, GVar->getVisibility());
 
@@ -671,7 +670,7 @@
   unsigned Size = TD->getABITypeSize(Type);
   unsigned Align = TD->getPreferredAlignmentLog(GVar);
 
-  SwitchToDataSection(SectionName.c_str());
+  SwitchToSection(TAI->SectionForGlobal(GVar));
 
   if (C->isNullValue() && /* FIXME: Verify correct */
       !GVar->hasSection() &&
@@ -759,7 +758,7 @@
 
   // Print out labels for the function.
   const Function *F = MF.getFunction();
-  SwitchToTextSection(TAI->SectionForGlobal(F).c_str(), F);
+  SwitchToSection(TAI->SectionForGlobal(F));
 
   switch (F->getLinkage()) {
   default: assert(0 && "Unknown linkage type!");
@@ -888,7 +887,6 @@
   }
 
   std::string name = Mang->getValueName(GVar);
-  std::string SectionName = TAI->SectionForGlobal(GVar);
 
   printVisibility(name, GVar->getVisibility());
 
@@ -897,7 +895,7 @@
   unsigned Size = TD->getABITypeSize(Type);
   unsigned Align = TD->getPreferredAlignmentLog(GVar);
 
-  SwitchToDataSection(SectionName.c_str());
+  SwitchToSection(TAI->SectionForGlobal(GVar));
 
   if (C->isNullValue() && /* FIXME: Verify correct */
       !GVar->hasSection() &&

Modified: llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp?rev=56573&r1=56572&r2=56573&view=diff

==============================================================================
--- llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp Wed Sep 24 17:14:23 2008
@@ -99,7 +99,7 @@
 
   // Print out the label for the function.
   const Function *F = MF.getFunction();
-  SwitchToTextSection(TAI->SectionForGlobal(F).c_str(), F);
+  SwitchToSection(TAI->SectionForGlobal(F));
   EmitAlignment(4, F);
   O << "\t.globl\t" << CurrentFnName << '\n';
 
@@ -242,7 +242,6 @@
     return;
 
   O << "\n\n";
-  std::string SectionName = TAI->SectionForGlobal(GVar);
   std::string name = Mang->getValueName(GVar);
   Constant *C = GVar->getInitializer();
   unsigned Size = TD->getABITypeSize(C->getType());
@@ -250,7 +249,7 @@
 
   printVisibility(name, GVar->getVisibility());
 
-  SwitchToDataSection(SectionName.c_str());
+  SwitchToSection(TAI->SectionForGlobal(GVar));
 
   if (C->isNullValue() && !GVar->hasSection()) {
     if (!GVar->isThreadLocal() &&

Modified: llvm/trunk/lib/Target/TargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetAsmInfo.cpp?rev=56573&r1=56572&r2=56573&view=diff

==============================================================================
--- llvm/trunk/lib/Target/TargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/TargetAsmInfo.cpp Wed Sep 24 17:14:23 2008
@@ -272,7 +272,7 @@
   return Flags;
 }
 
-std::string
+const Section*
 TargetAsmInfo::SectionForGlobal(const GlobalValue *GV) const {
   const Section* S;
   // Select section name
@@ -286,13 +286,7 @@
     S = SelectSectionForGlobal(GV);
   }
 
-  if (!S->isNamed())
-    return S->Name;
-
-  // If section is named we need to switch into it via special '.section'
-  // directive and also append funky flags. Otherwise - section name is just
-  // some magic assembler directive.
-  return getSwitchToSectionDirective() + S->Name + getSectionFlags(S->Flags);
+  return S;
 }
 
 // Lame default implementation. Calculate the section name for global.

Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp?rev=56573&r1=56572&r2=56573&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp Wed Sep 24 17:14:23 2008
@@ -148,11 +148,10 @@
 
 void X86ATTAsmPrinter::emitFunctionHeader(const MachineFunction &MF) {
   const Function *F = MF.getFunction();
-  std::string SectionName = TAI->SectionForGlobal(F);
 
   decorateName(CurrentFnName, F);
 
-  SwitchToTextSection(SectionName.c_str());
+  SwitchToSection(TAI->SectionForGlobal(F));
 
   unsigned FnAlign = OptimizeForSize ? 1 : 4;
   if (!F->isDeclaration() && F->hasNote(FnAttr::OptimizeForSize))
@@ -766,7 +765,6 @@
     return;
   }
 
-  std::string SectionName = TAI->SectionForGlobal(GVar);
   std::string name = Mang->getValueName(GVar);
   Constant *C = GVar->getInitializer();
   const Type *Type = C->getType();
@@ -778,7 +776,7 @@
   if (Subtarget->isTargetELF())
     O << "\t.type\t" << name << ", at object\n";
 
-  SwitchToDataSection(SectionName.c_str());
+  SwitchToSection(TAI->SectionForGlobal(GVar));
 
   if (C->isNullValue() && !GVar->hasSection()) {
     // FIXME: This seems to be pretty darwin-specific




From asl at math.spbu.ru  Wed Sep 24 17:15:21 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 24 Sep 2008 22:15:21 -0000
Subject: [llvm-commits] [llvm] r56574 - in /llvm/trunk:
 include/llvm/CodeGen/AsmPrinter.h include/llvm/Target/TargetAsmInfo.h
 lib/CodeGen/AsmPrinter/AsmPrinter.cpp
 lib/CodeGen/AsmPrinter/DwarfWriter.cpp
 lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp
 lib/Target/DarwinTargetAsmInfo.cpp lib/Target/ELFTargetAsmInfo.cpp
 lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp
 lib/Target/TargetAsmInfo.cpp lib/Target/X86/X86TargetAsmInfo.cpp
Message-ID: <200809242215.m8OMFL6r025033@zion.cs.uiuc.edu>

Author: asl
Date: Wed Sep 24 17:15:21 2008
New Revision: 56574

URL: http://llvm.org/viewvc/llvm-project?rev=56574&view=rev
Log:
Get rid of duplicate char*/Section* TextSection

Modified:
    llvm/trunk/include/llvm/CodeGen/AsmPrinter.h
    llvm/trunk/include/llvm/Target/TargetAsmInfo.h
    llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
    llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
    llvm/trunk/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp
    llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp
    llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp
    llvm/trunk/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp
    llvm/trunk/lib/Target/TargetAsmInfo.cpp
    llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp

Modified: llvm/trunk/include/llvm/CodeGen/AsmPrinter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/AsmPrinter.h?rev=56574&r1=56573&r2=56574&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/AsmPrinter.h (original)
+++ llvm/trunk/include/llvm/CodeGen/AsmPrinter.h Wed Sep 24 17:15:21 2008
@@ -92,6 +92,7 @@
     /// CurrentSection - The current section we are emitting to.  This is
     /// controlled and used by the SwitchSection method.
     std::string CurrentSection;
+    const Section* CurrentSection_;
 
     /// IsInTextSection - True if the current section we are emitting to is a
     /// text section.

Modified: llvm/trunk/include/llvm/Target/TargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetAsmInfo.h?rev=56574&r1=56573&r2=56574&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/TargetAsmInfo.h (original)
+++ llvm/trunk/include/llvm/Target/TargetAsmInfo.h Wed Sep 24 17:15:21 2008
@@ -131,8 +131,7 @@
 
     /// TextSection - Section directive for standard text.
     ///
-    const char *TextSection;              // Defaults to ".text".
-    const Section *TextSection_;
+    const Section *TextSection;              // Defaults to ".text".
 
     /// DataSection - Section directive for standard data.
     ///
@@ -599,12 +598,9 @@
 
     // Accessors.
     //
-    const char *getTextSection() const {
+    const Section *getTextSection() const {
       return TextSection;
     }
-    const Section *getTextSection_() const {
-      return TextSection_;
-    }
     const char *getDataSection() const {
       return DataSection;
     }

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp?rev=56574&r1=56573&r2=56574&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp Wed Sep 24 17:15:21 2008
@@ -114,6 +114,7 @@
 
   // FIXME: Make CurrentSection a Section* in the future
   CurrentSection = NewSection;
+  CurrentSection_ = NS;
 
   if (!CurrentSection.empty()) {
     // If section is named we need to switch into it via special '.section'
@@ -174,7 +175,7 @@
 
   if (TAI->getSetDirective()) {
     if (!M.alias_empty())
-      SwitchToTextSection(TAI->getTextSection());
+      SwitchToSection(TAI->getTextSection());
 
     O << '\n';
     for (Module::const_alias_iterator I = M.alias_begin(), E = M.alias_end();

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp?rev=56574&r1=56573&r2=56574&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Wed Sep 24 17:15:21 2008
@@ -1152,7 +1152,7 @@
 
   /// SectionMap - Provides a unique id per text section.
   ///
-  UniqueVector<std::string> SectionMap;
+  UniqueVector<const Section*> SectionMap;
 
   /// SectionSourceLines - Tracks line numbers per text section.
   ///
@@ -2062,7 +2062,7 @@
     Asm->SwitchToDataSection(TAI->getDwarfRangesSection());
     EmitLabel("section_ranges", 0);
 
-    Asm->SwitchToTextSection(TAI->getTextSection());
+    Asm->SwitchToSection(TAI->getTextSection());
     EmitLabel("text_begin", 0);
     Asm->SwitchToDataSection(TAI->getDataSection());
     EmitLabel("data_begin", 0);
@@ -2353,9 +2353,10 @@
       // Isolate current sections line info.
       const std::vector<SourceLineInfo> &LineInfos = SectionSourceLines[j];
 
-      if (VerboseAsm)
-        Asm->EOL(std::string("Section ") + SectionMap[j + 1]);
-      else
+      if (VerboseAsm) {
+        const Section* S = SectionMap[j + 1];
+        Asm->EOL(std::string("Section ") + S->getName());
+      } else
         Asm->EOL();
 
       // Dwarf assumes we start with first line of first source file.
@@ -2747,14 +2748,14 @@
     if (!ShouldEmitDwarf()) return;
 
     // Standard sections final addresses.
-    Asm->SwitchToTextSection(TAI->getTextSection());
+    Asm->SwitchToSection(TAI->getTextSection());
     EmitLabel("text_end", 0);
     Asm->SwitchToDataSection(TAI->getDataSection());
     EmitLabel("data_end", 0);
 
     // End text sections.
     for (unsigned i = 1, N = SectionMap.size(); i <= N; ++i) {
-      Asm->SwitchToTextSection(SectionMap[i].c_str());
+      Asm->SwitchToSection(SectionMap[i]);
       EmitLabel("section_end", i);
     }
 
@@ -2832,7 +2833,7 @@
 
     if (!LineInfos.empty()) {
       // Get section line info.
-      unsigned ID = SectionMap.insert(Asm->CurrentSection);
+      unsigned ID = SectionMap.insert(Asm->CurrentSection_);
       if (SectionSourceLines.size() < ID) SectionSourceLines.resize(ID);
       std::vector<SourceLineInfo> &SectionLineInfos = SectionSourceLines[ID-1];
       // Append the function info to section info.

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp?rev=56574&r1=56573&r2=56574&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp Wed Sep 24 17:15:21 2008
@@ -62,7 +62,7 @@
 
 void OcamlGCMetadataPrinter::beginAssembly(raw_ostream &OS, AsmPrinter &AP,
                                            const TargetAsmInfo &TAI) {
-  AP.SwitchToTextSection(TAI.getTextSection());
+  AP.SwitchToSection(TAI.getTextSection());
   EmitCamlGlobal(getModule(), OS, AP, TAI, "code_begin");
   
   AP.SwitchToDataSection(TAI.getDataSection());
@@ -97,7 +97,7 @@
     AddressAlignLog = 3;
   }
 
-  AP.SwitchToTextSection(TAI.getTextSection());
+  AP.SwitchToSection(TAI.getTextSection());
   EmitCamlGlobal(getModule(), OS, AP, TAI, "code_end");
   
   AP.SwitchToDataSection(TAI.getDataSection());

Modified: llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp?rev=56574&r1=56573&r2=56574&view=diff

==============================================================================
--- llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp Wed Sep 24 17:15:21 2008
@@ -82,7 +82,7 @@
     if (isWeak)
       return TextCoalSection;
     else
-      return getTextSection_();
+      return getTextSection();
    case SectionKind::Data:
    case SectionKind::ThreadData:
    case SectionKind::BSS:

Modified: llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp?rev=56574&r1=56573&r2=56574&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp Wed Sep 24 17:15:21 2008
@@ -27,7 +27,6 @@
 ELFTargetAsmInfo::ELFTargetAsmInfo(const TargetMachine &TM) {
   ETM = &TM;
 
-  TextSection_ = getUnnamedSection("\t.text", SectionFlags::Code);
   DataSection_ = getUnnamedSection("\t.data", SectionFlags::Writeable);
   BSSSection_  = getUnnamedSection("\t.bss",
                                    SectionFlags::Writeable | SectionFlags::BSS);
@@ -49,7 +48,7 @@
      case Function::InternalLinkage:
      case Function::DLLExportLinkage:
      case Function::ExternalLinkage:
-      return getTextSection_();
+      return getTextSection();
      case Function::WeakLinkage:
      case Function::LinkOnceLinkage:
       std::string Name = UniqueSectionForGlobal(GV, Kind);

Modified: llvm/trunk/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp?rev=56574&r1=56573&r2=56574&view=diff

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp Wed Sep 24 17:15:21 2008
@@ -637,7 +637,7 @@
   // GNU as handles section names wrapped in quotes
   Mang->setUseQuotes(true);
 
-  SwitchToTextSection(TAI->getTextSection());
+  SwitchToSection(TAI->getTextSection());
 
   return Result;
 }
@@ -864,7 +864,7 @@
     SwitchToTextSection("\t.section __TEXT,__symbol_stub1,symbol_stubs,"
                         "pure_instructions,16");
   }
-  SwitchToTextSection(TAI->getTextSection());
+  SwitchToSection(TAI->getTextSection());
 
   return Result;
 }

Modified: llvm/trunk/lib/Target/TargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetAsmInfo.cpp?rev=56574&r1=56573&r2=56574&view=diff

==============================================================================
--- llvm/trunk/lib/Target/TargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/TargetAsmInfo.cpp Wed Sep 24 17:15:21 2008
@@ -26,8 +26,7 @@
 using namespace llvm;
 
 TargetAsmInfo::TargetAsmInfo() :
-  TextSection("\t.text"),
-  TextSection_(0),
+  TextSection(0),
   DataSection("\t.data"),
   DataSection_(0),
   BSSSection("\t.bss"),
@@ -126,7 +125,7 @@
   DwarfEHFrameSection(".eh_frame"),
   DwarfExceptionSection(".gcc_except_table"),
   AsmTransCBE(0) {
-  TextSection_ = getUnnamedSection(TextSection);
+  TextSection = getUnnamedSection("\t.text", SectionFlags::Code);
   DataSection_ = getUnnamedSection(DataSection);
 }
 
@@ -300,7 +299,7 @@
     return getNamedSection(Name.c_str(), Flags);
   } else {
     if (Kind == SectionKind::Text)
-      return getTextSection_();
+      return getTextSection();
     else if (isBSS(Kind) && getBSSSection_())
       return getBSSSection_();
     else if (getReadOnlySection_() && SectionKind::isReadOnly(Kind))

Modified: llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp?rev=56574&r1=56573&r2=56574&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp Wed Sep 24 17:15:21 2008
@@ -433,7 +433,7 @@
   Data64bitsDirective = "\tdq\t";
   HasDotTypeDotSizeDirective = false;
 
-  TextSection = "_text";
+  TextSection = getUnnamedSection("_text", SectionFlags::Code);
   DataSection = "_data";
   JumpTableDataSection = NULL;
   SwitchToSectionDirective = "";




From asl at math.spbu.ru  Wed Sep 24 17:16:16 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 24 Sep 2008 22:16:16 -0000
Subject: [llvm-commits] [llvm] r56575 - in /llvm/trunk:
 include/llvm/Target/TargetAsmInfo.h lib/CodeGen/AsmPrinter/DwarfWriter.cpp
 lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp
 lib/Target/ARM/ARMTargetAsmInfo.cpp lib/Target/DarwinTargetAsmInfo.cpp
 lib/Target/ELFTargetAsmInfo.cpp lib/Target/TargetAsmInfo.cpp
 lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
 lib/Target/X86/X86TargetAsmInfo.cpp
Message-ID: <200809242216.m8OMGHIH025079@zion.cs.uiuc.edu>

Author: asl
Date: Wed Sep 24 17:16:16 2008
New Revision: 56575

URL: http://llvm.org/viewvc/llvm-project?rev=56575&view=rev
Log:
Get rid of duplicate char*/Section* DataSection

Modified:
    llvm/trunk/include/llvm/Target/TargetAsmInfo.h
    llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
    llvm/trunk/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp
    llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp
    llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp
    llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp
    llvm/trunk/lib/Target/TargetAsmInfo.cpp
    llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
    llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp

Modified: llvm/trunk/include/llvm/Target/TargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetAsmInfo.h?rev=56575&r1=56574&r2=56575&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/TargetAsmInfo.h (original)
+++ llvm/trunk/include/llvm/Target/TargetAsmInfo.h Wed Sep 24 17:16:16 2008
@@ -131,12 +131,11 @@
 
     /// TextSection - Section directive for standard text.
     ///
-    const Section *TextSection;              // Defaults to ".text".
+    const Section *TextSection;           // Defaults to ".text".
 
     /// DataSection - Section directive for standard data.
     ///
-    const char *DataSection;              // Defaults to ".data".
-    const Section *DataSection_;
+    const Section *DataSection;           // Defaults to ".data".
 
     /// BSSSection - Section directive for uninitialized data.  Null if this
     /// target doesn't support a BSS section.
@@ -601,12 +600,9 @@
     const Section *getTextSection() const {
       return TextSection;
     }
-    const char *getDataSection() const {
+    const Section *getDataSection() const {
       return DataSection;
     }
-    const Section *getDataSection_() const {
-      return DataSection_;
-    }
     const char *getBSSSection() const {
       return BSSSection;
     }

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp?rev=56575&r1=56574&r2=56575&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Wed Sep 24 17:16:16 2008
@@ -2064,7 +2064,7 @@
 
     Asm->SwitchToSection(TAI->getTextSection());
     EmitLabel("text_begin", 0);
-    Asm->SwitchToDataSection(TAI->getDataSection());
+    Asm->SwitchToSection(TAI->getDataSection());
     EmitLabel("data_begin", 0);
   }
 
@@ -2750,7 +2750,7 @@
     // Standard sections final addresses.
     Asm->SwitchToSection(TAI->getTextSection());
     EmitLabel("text_end", 0);
-    Asm->SwitchToDataSection(TAI->getDataSection());
+    Asm->SwitchToSection(TAI->getDataSection());
     EmitLabel("data_end", 0);
 
     // End text sections.

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp?rev=56575&r1=56574&r2=56575&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp Wed Sep 24 17:16:16 2008
@@ -65,7 +65,7 @@
   AP.SwitchToSection(TAI.getTextSection());
   EmitCamlGlobal(getModule(), OS, AP, TAI, "code_begin");
   
-  AP.SwitchToDataSection(TAI.getDataSection());
+  AP.SwitchToSection(TAI.getDataSection());
   EmitCamlGlobal(getModule(), OS, AP, TAI, "data_begin");
 }
 
@@ -100,13 +100,13 @@
   AP.SwitchToSection(TAI.getTextSection());
   EmitCamlGlobal(getModule(), OS, AP, TAI, "code_end");
   
-  AP.SwitchToDataSection(TAI.getDataSection());
+  AP.SwitchToSection(TAI.getDataSection());
   EmitCamlGlobal(getModule(), OS, AP, TAI, "data_end");
   
   OS << AddressDirective << 0; // FIXME: Why does ocaml emit this??
   AP.EOL();
   
-  AP.SwitchToDataSection(TAI.getDataSection());
+  AP.SwitchToSection(TAI.getDataSection());
   EmitCamlGlobal(getModule(), OS, AP, TAI, "frametable");
   
   for (iterator I = begin(), IE = end(); I != IE; ++I) {

Modified: llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp?rev=56575&r1=56574&r2=56575&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp Wed Sep 24 17:16:16 2008
@@ -48,7 +48,6 @@
   AlignmentIsInBytes = false;
   Data64bitsDirective = 0;
   CommentString = "@";
-  DataSection = "\t.data";
   ConstantPoolSection = "\t.text\n";
   COMMDirectiveTakesAlignment = false;
   InlineAsmStart = "@ InlineAsm Start";

Modified: llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp?rev=56575&r1=56574&r2=56575&view=diff

==============================================================================
--- llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp Wed Sep 24 17:16:16 2008
@@ -90,7 +90,7 @@
     if (cast<GlobalVariable>(GV)->isConstant())
       return (isWeak ? ConstDataCoalSection : ConstDataSection);
     else
-      return (isWeak ? DataCoalSection : getDataSection_());
+      return (isWeak ? DataCoalSection : getDataSection());
    case SectionKind::ROData:
     return (isWeak ? ConstDataCoalSection :
             (isNonStatic ? ConstDataSection : getReadOnlySection_()));

Modified: llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp?rev=56575&r1=56574&r2=56575&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp Wed Sep 24 17:16:16 2008
@@ -27,7 +27,6 @@
 ELFTargetAsmInfo::ELFTargetAsmInfo(const TargetMachine &TM) {
   ETM = &TM;
 
-  DataSection_ = getUnnamedSection("\t.data", SectionFlags::Writeable);
   BSSSection_  = getUnnamedSection("\t.bss",
                                    SectionFlags::Writeable | SectionFlags::BSS);
   ReadOnlySection_ = getNamedSection("\t.rodata", SectionFlags::None);
@@ -64,7 +63,7 @@
       switch (Kind) {
        case SectionKind::Data:
        case SectionKind::SmallData:
-        return getDataSection_();
+        return getDataSection();
        case SectionKind::BSS:
        case SectionKind::SmallBSS:
         // ELF targets usually have BSS sections

Modified: llvm/trunk/lib/Target/TargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetAsmInfo.cpp?rev=56575&r1=56574&r2=56575&view=diff

==============================================================================
--- llvm/trunk/lib/Target/TargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/TargetAsmInfo.cpp Wed Sep 24 17:16:16 2008
@@ -27,8 +27,7 @@
 
 TargetAsmInfo::TargetAsmInfo() :
   TextSection(0),
-  DataSection("\t.data"),
-  DataSection_(0),
+  DataSection(0),
   BSSSection("\t.bss"),
   BSSSection_(0),
   ReadOnlySection(0),
@@ -126,7 +125,7 @@
   DwarfExceptionSection(".gcc_except_table"),
   AsmTransCBE(0) {
   TextSection = getUnnamedSection("\t.text", SectionFlags::Code);
-  DataSection_ = getUnnamedSection(DataSection);
+  DataSection = getUnnamedSection("\t.data", SectionFlags::Writeable);
 }
 
 TargetAsmInfo::~TargetAsmInfo() {
@@ -306,14 +305,14 @@
       return getReadOnlySection_();
   }
 
-  return getDataSection_();
+  return getDataSection();
 }
 
 // Lame default implementation. Calculate the section name for machine const.
 const Section*
 TargetAsmInfo::SelectSectionForMachineConst(const Type *Ty) const {
   // FIXME: Support data.rel stuff someday
-  return getDataSection_();
+  return getDataSection();
 }
 
 std::string

Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp?rev=56575&r1=56574&r2=56575&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp Wed Sep 24 17:16:16 2008
@@ -481,7 +481,7 @@
       O << "\tpublic " << name << "\n";
       // FALL THROUGH
     case GlobalValue::InternalLinkage:
-      SwitchToDataSection(TAI->getDataSection(), I);
+      SwitchToSection(TAI->getDataSection());
       break;
     default:
       assert(0 && "Unknown linkage type!");

Modified: llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp?rev=56575&r1=56574&r2=56575&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp Wed Sep 24 17:16:16 2008
@@ -434,7 +434,8 @@
   HasDotTypeDotSizeDirective = false;
 
   TextSection = getUnnamedSection("_text", SectionFlags::Code);
-  DataSection = "_data";
+  DataSection = getUnnamedSection("_data", SectionFlags::Writeable);
+
   JumpTableDataSection = NULL;
   SwitchToSectionDirective = "";
   TextSectionStartSuffix = "\tsegment 'CODE'";




From asl at math.spbu.ru  Wed Sep 24 17:16:33 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 24 Sep 2008 22:16:33 -0000
Subject: [llvm-commits] [llvm] r56576 - in /llvm/trunk/lib/Target:
 DarwinTargetAsmInfo.cpp ELFTargetAsmInfo.cpp
Message-ID: <200809242216.m8OMGX4I025099@zion.cs.uiuc.edu>

Author: asl
Date: Wed Sep 24 17:16:33 2008
New Revision: 56576

URL: http://llvm.org/viewvc/llvm-project?rev=56576&view=rev
Log:
Cleanup, no functionality change

Modified:
    llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp
    llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp

Modified: llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp?rev=56576&r1=56575&r2=56576&view=diff

==============================================================================
--- llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp Wed Sep 24 17:16:33 2008
@@ -82,7 +82,7 @@
     if (isWeak)
       return TextCoalSection;
     else
-      return getTextSection();
+      return TextSection;
    case SectionKind::Data:
    case SectionKind::ThreadData:
    case SectionKind::BSS:
@@ -90,7 +90,7 @@
     if (cast<GlobalVariable>(GV)->isConstant())
       return (isWeak ? ConstDataCoalSection : ConstDataSection);
     else
-      return (isWeak ? DataCoalSection : getDataSection());
+      return (isWeak ? DataCoalSection : DataSection);
    case SectionKind::ROData:
     return (isWeak ? ConstDataCoalSection :
             (isNonStatic ? ConstDataSection : getReadOnlySection_()));

Modified: llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp?rev=56576&r1=56575&r2=56576&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp Wed Sep 24 17:16:33 2008
@@ -47,7 +47,7 @@
      case Function::InternalLinkage:
      case Function::DLLExportLinkage:
      case Function::ExternalLinkage:
-      return getTextSection();
+      return TextSection;
      case Function::WeakLinkage:
      case Function::LinkOnceLinkage:
       std::string Name = UniqueSectionForGlobal(GV, Kind);
@@ -63,7 +63,7 @@
       switch (Kind) {
        case SectionKind::Data:
        case SectionKind::SmallData:
-        return getDataSection();
+        return DataSection;
        case SectionKind::BSS:
        case SectionKind::SmallBSS:
         // ELF targets usually have BSS sections




From asl at math.spbu.ru  Wed Sep 24 17:17:06 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 24 Sep 2008 22:17:06 -0000
Subject: [llvm-commits] [llvm] r56577 - in /llvm/trunk:
 include/llvm/Target/TargetAsmInfo.h lib/Target/ARM/ARMTargetAsmInfo.cpp
 lib/Target/ELFTargetAsmInfo.cpp lib/Target/TargetAsmInfo.cpp
Message-ID: <200809242217.m8OMH7Bh025133@zion.cs.uiuc.edu>

Author: asl
Date: Wed Sep 24 17:17:06 2008
New Revision: 56577

URL: http://llvm.org/viewvc/llvm-project?rev=56577&view=rev
Log:
Get rid of duplicate char*/Section* stuff for TLS sections

Modified:
    llvm/trunk/include/llvm/Target/TargetAsmInfo.h
    llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp
    llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp
    llvm/trunk/lib/Target/TargetAsmInfo.cpp

Modified: llvm/trunk/include/llvm/Target/TargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetAsmInfo.h?rev=56577&r1=56576&r2=56577&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/TargetAsmInfo.h (original)
+++ llvm/trunk/include/llvm/Target/TargetAsmInfo.h Wed Sep 24 17:17:06 2008
@@ -166,14 +166,12 @@
 
     /// TLSDataSection - Section directive for Thread Local data.
     ///
-    const char *TLSDataSection;// Defaults to ".section .tdata,"awT", at progbits".
-    const Section *TLSDataSection_;
+    const Section *TLSDataSection;        // Defaults to ".tdata".
 
     /// TLSBSSSection - Section directive for Thread Local uninitialized data.
     /// Null if this target doesn't support a BSS section.
     ///
-    const char *TLSBSSSection;// Default to ".section .tbss,"awT", at nobits".
-    const Section *TLSBSSSection_;
+    const Section *TLSBSSSection;         // Defaults to ".tbss".
 
     /// ZeroFillDirective - Directive for emitting a global to the ZeroFill
     /// section on this target.  Null if this target doesn't support zerofill.
@@ -624,18 +622,12 @@
     const Section *getSmallRODataSection() const {
       return SmallRODataSection;
     }
-    const char *getTLSDataSection() const {
+    const Section *getTLSDataSection() const {
       return TLSDataSection;
     }
-    const Section *getTLSDataSection_() const {
-      return TLSDataSection_;
-    }
-    const char *getTLSBSSSection() const {
+    const Section *getTLSBSSSection() const {
       return TLSBSSSection;
     }
-    const Section *getTLSBSSSection_() const {
-      return TLSBSSSection_;
-    }
     const char *getZeroFillDirective() const {
       return ZeroFillDirective;
     }

Modified: llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp?rev=56577&r1=56576&r2=56577&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp Wed Sep 24 17:17:06 2008
@@ -141,8 +141,6 @@
     StaticCtorsSection = "\t.section .ctors,\"aw\",%progbits";
     StaticDtorsSection = "\t.section .dtors,\"aw\",%progbits";
   }
-  TLSDataSection = "\t.section .tdata,\"awT\",%progbits";
-  TLSBSSSection = "\t.section .tbss,\"awT\",%nobits";
 }
 
 /// Count the number of comma-separated arguments.

Modified: llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp?rev=56577&r1=56576&r2=56577&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp Wed Sep 24 17:17:06 2008
@@ -30,9 +30,9 @@
   BSSSection_  = getUnnamedSection("\t.bss",
                                    SectionFlags::Writeable | SectionFlags::BSS);
   ReadOnlySection_ = getNamedSection("\t.rodata", SectionFlags::None);
-  TLSDataSection_ = getNamedSection("\t.tdata",
-                                    SectionFlags::Writeable | SectionFlags::TLS);
-  TLSBSSSection_ = getNamedSection("\t.tbss",
+  TLSDataSection = getNamedSection("\t.tdata",
+                                   SectionFlags::Writeable | SectionFlags::TLS);
+  TLSBSSSection = getNamedSection("\t.tbss",
                 SectionFlags::Writeable | SectionFlags::TLS | SectionFlags::BSS);
 
 }
@@ -77,9 +77,9 @@
         return MergeableConstSection(GVar);
        case SectionKind::ThreadData:
         // ELF targets usually support TLS stuff
-        return getTLSDataSection_();
+        return TLSDataSection;
        case SectionKind::ThreadBSS:
-        return getTLSBSSSection_();
+        return TLSBSSSection;
        default:
         assert(0 && "Unsuported section kind for global");
       }

Modified: llvm/trunk/lib/Target/TargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetAsmInfo.cpp?rev=56577&r1=56576&r2=56577&view=diff

==============================================================================
--- llvm/trunk/lib/Target/TargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/TargetAsmInfo.cpp Wed Sep 24 17:17:06 2008
@@ -35,10 +35,8 @@
   SmallDataSection(0),
   SmallBSSSection(0),
   SmallRODataSection(0),
-  TLSDataSection("\t.section .tdata,\"awT\", at progbits"),
-  TLSDataSection_(0),
-  TLSBSSSection("\t.section .tbss,\"awT\", at nobits"),
-  TLSBSSSection_(0),
+  TLSDataSection(0),
+  TLSBSSSection(0),
   ZeroFillDirective(0),
   NonexecutableStackDirective(0),
   NeedsSet(false),




From asl at math.spbu.ru  Wed Sep 24 17:17:27 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 24 Sep 2008 22:17:27 -0000
Subject: [llvm-commits] [llvm] r56578 - in /llvm/trunk/lib/Target:
 DarwinTargetAsmInfo.cpp ELFTargetAsmInfo.cpp
Message-ID: <200809242217.m8OMHSXR025154@zion.cs.uiuc.edu>

Author: asl
Date: Wed Sep 24 17:17:27 2008
New Revision: 56578

URL: http://llvm.org/viewvc/llvm-project?rev=56578&view=rev
Log:
Cleanup

Modified:
    llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp
    llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp

Modified: llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp?rev=56578&r1=56577&r2=56578&view=diff

==============================================================================
--- llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp Wed Sep 24 17:17:27 2008
@@ -128,7 +128,7 @@
 
 const Section*
 DarwinTargetAsmInfo::MergeableConstSection(const GlobalVariable *GV) const {
-  Constant *C = cast<GlobalVariable>(GV)->getInitializer();
+  Constant *C = GV->getInitializer();
 
   return MergeableConstSection(C->getType());
 }

Modified: llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp?rev=56578&r1=56577&r2=56578&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp Wed Sep 24 17:17:27 2008
@@ -96,7 +96,7 @@
 
 const Section*
 ELFTargetAsmInfo::MergeableConstSection(const GlobalVariable *GV) const {
-  Constant *C = cast<GlobalVariable>(GV)->getInitializer();
+  Constant *C = GV->getInitializer();
   return MergeableConstSection(C->getType());
 }
 




From asl at math.spbu.ru  Wed Sep 24 17:18:00 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 24 Sep 2008 22:18:00 -0000
Subject: [llvm-commits] [llvm] r56579 - in /llvm/trunk:
 include/llvm/CodeGen/AsmPrinter.h lib/CodeGen/AsmPrinter/AsmPrinter.cpp
Message-ID: <200809242218.m8OMI0Ce025187@zion.cs.uiuc.edu>

Author: asl
Date: Wed Sep 24 17:17:59 2008
New Revision: 56579

URL: http://llvm.org/viewvc/llvm-project?rev=56579&view=rev
Log:
Use generic section-handling stuff to emit constant pool entries

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

Modified: llvm/trunk/include/llvm/CodeGen/AsmPrinter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/AsmPrinter.h?rev=56579&r1=56578&r2=56579&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/AsmPrinter.h (original)
+++ llvm/trunk/include/llvm/CodeGen/AsmPrinter.h Wed Sep 24 17:17:59 2008
@@ -366,8 +366,6 @@
     const GlobalValue *findGlobalValue(const Constant* CV);
     void EmitLLVMUsedList(Constant *List);
     void EmitXXStructorList(Constant *List);
-    void EmitConstantPool(unsigned Alignment, const char *Section,
-                std::vector<std::pair<MachineConstantPoolEntry,unsigned> > &CP);
     GCMetadataPrinter *GetOrCreateGCPrinter(GCStrategy *C);
   };
 }

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp?rev=56579&r1=56578&r2=56579&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp Wed Sep 24 17:17:59 2008
@@ -28,6 +28,7 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetOptions.h"
 #include "llvm/Target/TargetRegisterInfo.h"
+#include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringExtras.h"
@@ -255,60 +256,50 @@
   const std::vector<MachineConstantPoolEntry> &CP = MCP->getConstants();
   if (CP.empty()) return;
 
-  // Some targets require 4-, 8-, and 16- byte constant literals to be placed
-  // in special sections.
-  std::vector<std::pair<MachineConstantPoolEntry,unsigned> > FourByteCPs;
-  std::vector<std::pair<MachineConstantPoolEntry,unsigned> > EightByteCPs;
-  std::vector<std::pair<MachineConstantPoolEntry,unsigned> > SixteenByteCPs;
-  std::vector<std::pair<MachineConstantPoolEntry,unsigned> > OtherCPs;
-  std::vector<std::pair<MachineConstantPoolEntry,unsigned> > TargetCPs;
+  // Calculate sections for constant pool entries. We collect entries to go into
+  // the same section together to reduce amount of section switch statements.
+  typedef
+    std::multimap<const Section*,
+                  std::pair<MachineConstantPoolEntry, unsigned> > CPMap;
+  CPMap  CPs;
+  DenseSet<const Section*> Sections;
+
   for (unsigned i = 0, e = CP.size(); i != e; ++i) {
     MachineConstantPoolEntry CPE = CP[i];
-    const Type *Ty = CPE.getType();
-    if (TAI->getFourByteConstantSection() &&
-        TM.getTargetData()->getABITypeSize(Ty) == 4)
-      FourByteCPs.push_back(std::make_pair(CPE, i));
-    else if (TAI->getEightByteConstantSection() &&
-             TM.getTargetData()->getABITypeSize(Ty) == 8)
-      EightByteCPs.push_back(std::make_pair(CPE, i));
-    else if (TAI->getSixteenByteConstantSection() &&
-             TM.getTargetData()->getABITypeSize(Ty) == 16)
-      SixteenByteCPs.push_back(std::make_pair(CPE, i));
-    else
-      OtherCPs.push_back(std::make_pair(CPE, i));
-  }
-
-  unsigned Alignment = MCP->getConstantPoolAlignment();
-  EmitConstantPool(Alignment, TAI->getFourByteConstantSection(), FourByteCPs);
-  EmitConstantPool(Alignment, TAI->getEightByteConstantSection(), EightByteCPs);
-  EmitConstantPool(Alignment, TAI->getSixteenByteConstantSection(),
-                   SixteenByteCPs);
-  EmitConstantPool(Alignment, TAI->getConstantPoolSection(), OtherCPs);
-}
-
-void AsmPrinter::EmitConstantPool(unsigned Alignment, const char *Section,
-               std::vector<std::pair<MachineConstantPoolEntry,unsigned> > &CP) {
-  if (CP.empty()) return;
+    const Section* S = TAI->SelectSectionForMachineConst(CPE.getType());
+    CPs.insert(std::make_pair(S, std::make_pair(CPE, i)));
+    Sections.insert(S);
+  }
+
+  // Now print stuff into the calculated sections.
+  for (DenseSet<const Section*>::iterator IS = Sections.begin(),
+         ES = Sections.end(); IS != ES; ++IS) {
+    SwitchToSection(*IS);
+    EmitAlignment(MCP->getConstantPoolAlignment());
+
+    std::pair<CPMap::iterator, CPMap::iterator> II = CPs.equal_range(*IS);
+    for (CPMap::iterator I = II.first, E = II.second; I != E; ++I) {
+      CPMap::iterator J = next(I);
+      MachineConstantPoolEntry Entry = I->second.first;
+      unsigned index = I->second.second;
 
-  SwitchToDataSection(Section);
-  EmitAlignment(Alignment);
-  for (unsigned i = 0, e = CP.size(); i != e; ++i) {
-    O << TAI->getPrivateGlobalPrefix() << "CPI" << getFunctionNumber() << '_'
-      << CP[i].second << ":\t\t\t\t\t";
+      O << TAI->getPrivateGlobalPrefix() << "CPI" << getFunctionNumber() << '_'
+        << index << ":\t\t\t\t\t";
     // O << TAI->getCommentString() << ' ' << 
     //      WriteTypeSymbolic(O, CP[i].first.getType(), 0);
-    O << '\n';
-    if (CP[i].first.isMachineConstantPoolEntry())
-      EmitMachineConstantPoolValue(CP[i].first.Val.MachineCPVal);
-     else
-      EmitGlobalConstant(CP[i].first.Val.ConstVal);
-    if (i != e-1) {
-      const Type *Ty = CP[i].first.getType();
-      unsigned EntSize =
-        TM.getTargetData()->getABITypeSize(Ty);
-      unsigned ValEnd = CP[i].first.getOffset() + EntSize;
+      O << '\n';
+      if (Entry.isMachineConstantPoolEntry())
+        EmitMachineConstantPoolValue(Entry.Val.MachineCPVal);
+      else
+        EmitGlobalConstant(Entry.Val.ConstVal);
+
       // Emit inter-object padding for alignment.
-      EmitZeros(CP[i+1].first.getOffset()-ValEnd);
+      if (J != E) {
+        const Type *Ty = Entry.getType();
+        unsigned EntSize = TM.getTargetData()->getABITypeSize(Ty);
+        unsigned ValEnd = Entry.getOffset() + EntSize;
+        EmitZeros(J->second.first.getOffset()-ValEnd);
+      }
     }
   }
 }




From asl at math.spbu.ru  Wed Sep 24 17:18:55 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 24 Sep 2008 22:18:55 -0000
Subject: [llvm-commits] [llvm] r56580 - in /llvm/trunk:
 include/llvm/Target/DarwinTargetAsmInfo.h
 include/llvm/Target/TargetAsmInfo.h lib/Target/ARM/ARMTargetAsmInfo.cpp
 lib/Target/CellSPU/SPUTargetAsmInfo.cpp lib/Target/DarwinTargetAsmInfo.cpp
 lib/Target/Mips/MipsTargetAsmInfo.cpp
 lib/Target/PowerPC/PPCTargetAsmInfo.cpp lib/Target/TargetAsmInfo.cpp
 lib/Target/X86/X86TargetAsmInfo.cpp
Message-ID: <200809242218.m8OMItpA025233@zion.cs.uiuc.edu>

Author: asl
Date: Wed Sep 24 17:18:54 2008
New Revision: 56580

URL: http://llvm.org/viewvc/llvm-project?rev=56580&view=rev
Log:
Get rid of now unused {Four,Eight,Sixteen}ByteConstantSection

Modified:
    llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h
    llvm/trunk/include/llvm/Target/TargetAsmInfo.h
    llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp
    llvm/trunk/lib/Target/CellSPU/SPUTargetAsmInfo.cpp
    llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp
    llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp
    llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp
    llvm/trunk/lib/Target/TargetAsmInfo.cpp
    llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp

Modified: llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h?rev=56580&r1=56579&r2=56580&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h (original)
+++ llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h Wed Sep 24 17:18:54 2008
@@ -29,6 +29,9 @@
     const Section* ConstDataCoalSection;
     const Section* ConstDataSection;
     const Section* DataCoalSection;
+    const Section* FourByteConstantSection;
+    const Section* EightByteConstantSection;
+    const Section* SixteenByteConstantSection;
 
     explicit DarwinTargetAsmInfo(const TargetMachine &TM);
     virtual const Section* SelectSectionForGlobal(const GlobalValue *GV) const;

Modified: llvm/trunk/include/llvm/Target/TargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetAsmInfo.h?rev=56580&r1=56579&r2=56580&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/TargetAsmInfo.h (original)
+++ llvm/trunk/include/llvm/Target/TargetAsmInfo.h Wed Sep 24 17:18:54 2008
@@ -361,16 +361,6 @@
     /// Defaults to "\t.section .dtors,\"aw\", at progbits".
     const char *StaticDtorsSection;
 
-    /// FourByteConstantSection, EightByteConstantSection,
-    /// SixteenByteConstantSection - These are special sections where we place
-    /// 4-, 8-, and 16- byte constant literals.
-    const char *FourByteConstantSection;
-    const Section *FourByteConstantSection_;
-    const char *EightByteConstantSection;
-    const Section *EightByteConstantSection_;
-    const char *SixteenByteConstantSection;
-    const Section *SixteenByteConstantSection_;
-
     //===--- Global Variable Emission Directives --------------------------===//
     
     /// GlobalDirective - This is the directive used to declare a global entity.
@@ -757,24 +747,6 @@
     const char *getStaticDtorsSection() const {
       return StaticDtorsSection;
     }
-    const char *getFourByteConstantSection() const {
-      return FourByteConstantSection;
-    }
-    const Section *getFourByteConstantSection_() const {
-      return FourByteConstantSection_;
-    }
-    const char *getEightByteConstantSection() const {
-      return EightByteConstantSection;
-    }
-    const Section *getEightByteConstantSection_() const {
-      return EightByteConstantSection_;
-    }
-    const char *getSixteenByteConstantSection() const {
-      return SixteenByteConstantSection;
-    }
-    const Section *getSixteenByteConstantSection_() const {
-      return SixteenByteConstantSection_;
-    }
     const char *getGlobalDirective() const {
       return GlobalDirective;
     }

Modified: llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp?rev=56580&r1=56579&r2=56580&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp Wed Sep 24 17:18:54 2008
@@ -72,8 +72,6 @@
   ProtectedDirective = NULL;
   JumpTableDataSection = ".const";
   CStringSection = "\t.cstring";
-  FourByteConstantSection = "\t.literal4\n";
-  EightByteConstantSection = "\t.literal8\n";
   ReadOnlySection = "\t.const\n";
   HasDotTypeDotSizeDirective = false;
   NeedsIndirectEncoding = true;
@@ -115,9 +113,6 @@
   AbsoluteDebugSectionOffsets = true;
   CStringSection = ".rodata.str";
   ReadOnlySection = "\t.section\t.rodata\n";
-  FourByteConstantSection = "\t.section\t.rodata.cst4,\"aM\", at progbits,4";
-  EightByteConstantSection = "\t.section\t.rodata.cst8,\"aM\", at progbits,8";
-  SixteenByteConstantSection = "\t.section\t.rodata.cst16,\"aM\", at progbits,16";
   PrivateGlobalPrefix = ".L";
   WeakRefDirective = "\t.weak\t";
   SetDirective = "\t.set\t";

Modified: llvm/trunk/lib/Target/CellSPU/SPUTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CellSPU/SPUTargetAsmInfo.cpp?rev=56580&r1=56579&r2=56580&view=diff

==============================================================================
--- llvm/trunk/lib/Target/CellSPU/SPUTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/CellSPU/SPUTargetAsmInfo.cpp Wed Sep 24 17:18:54 2008
@@ -31,8 +31,6 @@
   CStringSection = "\t.cstring";
   StaticCtorsSection = ".mod_init_func";
   StaticDtorsSection = ".mod_term_func";
-  FourByteConstantSection = ".const";
-  SixteenByteConstantSection = "\t.section\t.rodata.cst16,\"aM\", at progbits,16";
   InlineAsmStart = "# InlineAsm Start";
   InlineAsmEnd = "# InlineAsm End";
   

Modified: llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp?rev=56580&r1=56579&r2=56580&view=diff

==============================================================================
--- llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp Wed Sep 24 17:18:54 2008
@@ -29,13 +29,14 @@
 
   CStringSection_ = getUnnamedSection("\t.cstring",
                                 SectionFlags::Mergeable | SectionFlags::Strings);
-  FourByteConstantSection_ = getUnnamedSection("\t.literal4\n",
+  FourByteConstantSection = getUnnamedSection("\t.literal4\n",
+                                              SectionFlags::Mergeable);
+  EightByteConstantSection = getUnnamedSection("\t.literal8\n",
                                                SectionFlags::Mergeable);
-  EightByteConstantSection_ = getUnnamedSection("\t.literal8\n",
-                                                SectionFlags::Mergeable);
 
   // Note: 16-byte constant section is subtarget specific and should be provided
-  // there.
+  // there, if needed.
+  SixteenByteConstantSection = 0;
 
   ReadOnlySection_ = getUnnamedSection("\t.const\n", SectionFlags::None);
 
@@ -139,11 +140,11 @@
 
   unsigned Size = TD->getABITypeSize(Ty);
   if (Size == 4)
-    return FourByteConstantSection_;
+    return FourByteConstantSection;
   else if (Size == 8)
-    return EightByteConstantSection_;
-  else if (Size == 16 && SixteenByteConstantSection_)
-    return SixteenByteConstantSection_;
+    return EightByteConstantSection;
+  else if (Size == 16 && SixteenByteConstantSection)
+    return SixteenByteConstantSection;
 
   return getReadOnlySection_();
 }

Modified: llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp?rev=56580&r1=56579&r2=56580&view=diff

==============================================================================
--- llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp Wed Sep 24 17:18:54 2008
@@ -34,7 +34,6 @@
   ZeroDirective               = "\t.space\t";
   BSSSection                  = "\t.section\t.bss";
   CStringSection              = ".rodata.str";
-  FourByteConstantSection     = "\t.section\t.rodata.cst4,\"aM\", at progbits,4";
 
   if (!Subtarget->hasABICall()) {
     JumpTableDirective = "\t.word\t";

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

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp Wed Sep 24 17:18:54 2008
@@ -43,8 +43,6 @@
   ConstantPoolSection = "\t.const\t";
   JumpTableDataSection = ".const";
   CStringSection = "\t.cstring";
-  FourByteConstantSection = "\t.literal4\n";
-  EightByteConstantSection = "\t.literal8\n";
   ReadOnlySection = "\t.const\n";
   if (TM.getRelocationModel() == Reloc::Static) {
     StaticCtorsSection = ".constructor";
@@ -140,9 +138,6 @@
   DwarfMacInfoSection = "\t.section\t.debug_macinfo,\"\", at progbits";
 
   ReadOnlySection = "\t.section\t.rodata";
-  FourByteConstantSection = "\t.section\t.rodata.cst4,\"aM\", at progbits,4";
-  EightByteConstantSection = "\t.section\t.rodata.cst8,\"aM\", at progbits,8";
-  SixteenByteConstantSection = "\t.section\t.rodata.cst16,\"aM\", at progbits,16";
   PCSymbol = ".";
 
   // Set up DWARF directives

Modified: llvm/trunk/lib/Target/TargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetAsmInfo.cpp?rev=56580&r1=56579&r2=56580&view=diff

==============================================================================
--- llvm/trunk/lib/Target/TargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/TargetAsmInfo.cpp Wed Sep 24 17:18:54 2008
@@ -81,12 +81,6 @@
   CStringSection_(0),
   StaticCtorsSection("\t.section .ctors,\"aw\", at progbits"),
   StaticDtorsSection("\t.section .dtors,\"aw\", at progbits"),
-  FourByteConstantSection(0),
-  FourByteConstantSection_(0),
-  EightByteConstantSection(0),
-  EightByteConstantSection_(0),
-  SixteenByteConstantSection(0),
-  SixteenByteConstantSection_(0),
   GlobalDirective("\t.globl\t"),
   SetDirective(0),
   LCOMMDirective(0),

Modified: llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp?rev=56580&r1=56579&r2=56580&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp Wed Sep 24 17:18:54 2008
@@ -145,13 +145,10 @@
     ConstantPoolSection = "\t.const\n";
   JumpTableDataSection = "\t.const\n";
   CStringSection = "\t.cstring";
-  FourByteConstantSection = "\t.literal4\n";
-  EightByteConstantSection = "\t.literal8\n";
   // FIXME: Why don't always use this section?
   if (is64Bit) {
-    SixteenByteConstantSection = "\t.literal16\n";
-    SixteenByteConstantSection_ = getUnnamedSection("\t.literal16\n",
-                                                    SectionFlags::Mergeable);
+    SixteenByteConstantSection = getUnnamedSection("\t.literal16\n",
+                                                   SectionFlags::Mergeable);
   }
   ReadOnlySection = "\t.const\n";
 
@@ -233,9 +230,6 @@
   X86TargetAsmInfo(TM), ELFTargetAsmInfo(TM) {
 
   ReadOnlySection = ".rodata";
-  FourByteConstantSection = "\t.section\t.rodata.cst4,\"aM\", at progbits,4";
-  EightByteConstantSection = "\t.section\t.rodata.cst8,\"aM\", at progbits,8";
-  SixteenByteConstantSection = "\t.section\t.rodata.cst16,\"aM\", at progbits,16";
   CStringSection = ".rodata.str";
   PrivateGlobalPrefix = ".L";
   WeakRefDirective = "\t.weak\t";




From asl at math.spbu.ru  Wed Sep 24 17:19:13 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 24 Sep 2008 22:19:13 -0000
Subject: [llvm-commits] [llvm] r56581 -
	/llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp
Message-ID: <200809242219.m8OMJDkT025258@zion.cs.uiuc.edu>

Author: asl
Date: Wed Sep 24 17:19:13 2008
New Revision: 56581

URL: http://llvm.org/viewvc/llvm-project?rev=56581&view=rev
Log:
Use named sections, where they should be

Modified:
    llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp

Modified: llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp?rev=56581&r1=56580&r2=56581&view=diff

==============================================================================
--- llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp Wed Sep 24 17:19:13 2008
@@ -40,16 +40,14 @@
 
   ReadOnlySection_ = getUnnamedSection("\t.const\n", SectionFlags::None);
 
-  // FIXME: These should be named sections, really.
   TextCoalSection =
-  getUnnamedSection(".section __TEXT,__textcoal_nt,coalesced,pure_instructions",
+    getNamedSection("\t__TEXT,__textcoal_nt,coalesced,pure_instructions",
                     SectionFlags::Code);
-  ConstDataCoalSection =
-    getUnnamedSection(".section __DATA,__const_coal,coalesced",
-                      SectionFlags::None);
+  ConstDataCoalSection = getBamedSection("\t__DATA,__const_coal,coalesced",
+                                         SectionFlags::None);
   ConstDataSection = getUnnamedSection(".const_data", SectionFlags::None);
-  DataCoalSection = getUnnamedSection(".section __DATA,__datacoal_nt,coalesced",
-                                      SectionFlags::Writeable);
+  DataCoalSection = getNamedSection("\t__DATA,__datacoal_nt,coalesced",
+                                    SectionFlags::Writeable);
 }
 
 /// emitUsedDirectiveFor - On Darwin, internally linked data beginning with




From asl at math.spbu.ru  Wed Sep 24 17:20:28 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 24 Sep 2008 22:20:28 -0000
Subject: [llvm-commits] [llvm] r56582 - in /llvm/trunk:
 include/llvm/Target/TargetAsmInfo.h lib/Target/ARM/ARMTargetAsmInfo.cpp
 lib/Target/DarwinTargetAsmInfo.cpp lib/Target/ELFTargetAsmInfo.cpp
 lib/Target/Mips/MipsTargetAsmInfo.cpp
 lib/Target/PowerPC/PPCTargetAsmInfo.cpp lib/Target/TargetAsmInfo.cpp
 lib/Target/X86/X86TargetAsmInfo.cpp
Message-ID: <200809242220.m8OMKSVZ025337@zion.cs.uiuc.edu>

Author: asl
Date: Wed Sep 24 17:20:27 2008
New Revision: 56582

URL: http://llvm.org/viewvc/llvm-project?rev=56582&view=rev
Log:
Get rid of ReadOnlySection duplicate

Modified:
    llvm/trunk/include/llvm/Target/TargetAsmInfo.h
    llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp
    llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp
    llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp
    llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp
    llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp
    llvm/trunk/lib/Target/TargetAsmInfo.cpp
    llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp

Modified: llvm/trunk/include/llvm/Target/TargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetAsmInfo.h?rev=56582&r1=56581&r2=56582&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/TargetAsmInfo.h (original)
+++ llvm/trunk/include/llvm/Target/TargetAsmInfo.h Wed Sep 24 17:20:27 2008
@@ -146,8 +146,7 @@
     /// ReadOnlySection - This is the directive that is emitted to switch to a
     /// read-only section for constant data (e.g. data declared const,
     /// jump tables).
-    const char *ReadOnlySection;          // Defaults to NULL
-    const Section *ReadOnlySection_;
+    const Section *ReadOnlySection;       // Defaults to NULL
 
     /// SmallDataSection - This is the directive that is emitted to switch to a
     /// small data section.
@@ -597,12 +596,9 @@
     const Section *getBSSSection_() const {
       return BSSSection_;
     }
-    const char *getReadOnlySection() const {
+    const Section *getReadOnlySection() const {
       return ReadOnlySection;
     }
-    const Section *getReadOnlySection_() const {
-      return ReadOnlySection_;
-    }
     const Section *getSmallDataSection() const {
       return SmallDataSection;
     }

Modified: llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp?rev=56582&r1=56581&r2=56582&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp Wed Sep 24 17:20:27 2008
@@ -72,7 +72,6 @@
   ProtectedDirective = NULL;
   JumpTableDataSection = ".const";
   CStringSection = "\t.cstring";
-  ReadOnlySection = "\t.const\n";
   HasDotTypeDotSizeDirective = false;
   NeedsIndirectEncoding = true;
   if (TM.getRelocationModel() == Reloc::Static) {
@@ -112,7 +111,6 @@
   HasLEB128 = true;
   AbsoluteDebugSectionOffsets = true;
   CStringSection = ".rodata.str";
-  ReadOnlySection = "\t.section\t.rodata\n";
   PrivateGlobalPrefix = ".L";
   WeakRefDirective = "\t.weak\t";
   SetDirective = "\t.set\t";

Modified: llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp?rev=56582&r1=56581&r2=56582&view=diff

==============================================================================
--- llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp Wed Sep 24 17:20:27 2008
@@ -38,12 +38,12 @@
   // there, if needed.
   SixteenByteConstantSection = 0;
 
-  ReadOnlySection_ = getUnnamedSection("\t.const\n", SectionFlags::None);
+  ReadOnlySection = getUnnamedSection("\t.const\n", SectionFlags::None);
 
   TextCoalSection =
     getNamedSection("\t__TEXT,__textcoal_nt,coalesced,pure_instructions",
                     SectionFlags::Code);
-  ConstDataCoalSection = getBamedSection("\t__DATA,__const_coal,coalesced",
+  ConstDataCoalSection = getNamedSection("\t__DATA,__const_coal,coalesced",
                                          SectionFlags::None);
   ConstDataSection = getUnnamedSection(".const_data", SectionFlags::None);
   DataCoalSection = getNamedSection("\t__DATA,__datacoal_nt,coalesced",
@@ -92,7 +92,7 @@
       return (isWeak ? DataCoalSection : DataSection);
    case SectionKind::ROData:
     return (isWeak ? ConstDataCoalSection :
-            (isNonStatic ? ConstDataSection : getReadOnlySection_()));
+            (isNonStatic ? ConstDataSection : getReadOnlySection()));
    case SectionKind::RODataMergeStr:
     return (isWeak ?
             ConstDataCoalSection :
@@ -122,7 +122,7 @@
       return getCStringSection_();
   }
 
-  return getReadOnlySection_();
+  return getReadOnlySection();
 }
 
 const Section*
@@ -144,7 +144,7 @@
   else if (Size == 16 && SixteenByteConstantSection)
     return SixteenByteConstantSection;
 
-  return getReadOnlySection_();
+  return getReadOnlySection();
 }
 
 const Section*
@@ -152,7 +152,7 @@
   const Section* S = MergeableConstSection(Ty);
 
   // Handle weird special case, when compiling PIC stuff.
-  if (S == getReadOnlySection_() &&
+  if (S == getReadOnlySection() &&
       DTM->getRelocationModel() != Reloc::Static)
     return ConstDataSection;
 

Modified: llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp?rev=56582&r1=56581&r2=56582&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp Wed Sep 24 17:20:27 2008
@@ -29,7 +29,7 @@
 
   BSSSection_  = getUnnamedSection("\t.bss",
                                    SectionFlags::Writeable | SectionFlags::BSS);
-  ReadOnlySection_ = getNamedSection("\t.rodata", SectionFlags::None);
+  ReadOnlySection = getNamedSection("\t.rodata", SectionFlags::None);
   TLSDataSection = getNamedSection("\t.tdata",
                                    SectionFlags::Writeable | SectionFlags::TLS);
   TLSBSSSection = getNamedSection("\t.tbss",
@@ -70,7 +70,7 @@
         return getBSSSection_();
        case SectionKind::ROData:
        case SectionKind::SmallROData:
-        return getReadOnlySection_();
+        return getReadOnlySection();
        case SectionKind::RODataMergeStr:
         return MergeableStringSection(GVar);
        case SectionKind::RODataMergeConst:
@@ -116,7 +116,7 @@
                                                        Size));
   }
 
-  return getReadOnlySection_();
+  return getReadOnlySection();
 }
 
 const Section*
@@ -143,7 +143,7 @@
     return getNamedSection(Name.c_str(), Flags);
   }
 
-  return getReadOnlySection_();
+  return getReadOnlySection();
 }
 
 std::string ELFTargetAsmInfo::printSectionFlags(unsigned flags) const {

Modified: llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp?rev=56582&r1=56581&r2=56582&view=diff

==============================================================================
--- llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp Wed Sep 24 17:20:27 2008
@@ -30,7 +30,6 @@
   PrivateGlobalPrefix         = "$";
   JumpTableDataSection        = "\t.rdata";
   CommentString               = "#";
-  ReadOnlySection             = "\t.rdata";
   ZeroDirective               = "\t.space\t";
   BSSSection                  = "\t.section\t.bss";
   CStringSection              = ".rodata.str";
@@ -38,9 +37,10 @@
   if (!Subtarget->hasABICall()) {
     JumpTableDirective = "\t.word\t";
     SmallDataSection = getNamedSection("\t.sdata", SectionFlags::Writeable);
-    SmallBSSSection = getNamedSection("\t.sbss", SectionFlags::Writeable | 
+    SmallBSSSection = getNamedSection("\t.sbss",
+                                      SectionFlags::Writeable |
                                       SectionFlags::BSS);
-  } else 
+  } else
     JumpTableDirective = "\t.gpword\t";
 
 }

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

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp Wed Sep 24 17:20:27 2008
@@ -43,7 +43,6 @@
   ConstantPoolSection = "\t.const\t";
   JumpTableDataSection = ".const";
   CStringSection = "\t.cstring";
-  ReadOnlySection = "\t.const\n";
   if (TM.getRelocationModel() == Reloc::Static) {
     StaticCtorsSection = ".constructor";
     StaticDtorsSection = ".destructor";
@@ -137,7 +136,6 @@
   DwarfRangesSection =  "\t.section\t.debug_ranges,\"\", at progbits";
   DwarfMacInfoSection = "\t.section\t.debug_macinfo,\"\", at progbits";
 
-  ReadOnlySection = "\t.section\t.rodata";
   PCSymbol = ".";
 
   // Set up DWARF directives

Modified: llvm/trunk/lib/Target/TargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetAsmInfo.cpp?rev=56582&r1=56581&r2=56582&view=diff

==============================================================================
--- llvm/trunk/lib/Target/TargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/TargetAsmInfo.cpp Wed Sep 24 17:20:27 2008
@@ -31,7 +31,6 @@
   BSSSection("\t.bss"),
   BSSSection_(0),
   ReadOnlySection(0),
-  ReadOnlySection_(0),
   SmallDataSection(0),
   SmallBSSSection(0),
   SmallRODataSection(0),
@@ -293,8 +292,8 @@
       return getTextSection();
     else if (isBSS(Kind) && getBSSSection_())
       return getBSSSection_();
-    else if (getReadOnlySection_() && SectionKind::isReadOnly(Kind))
-      return getReadOnlySection_();
+    else if (getReadOnlySection() && SectionKind::isReadOnly(Kind))
+      return getReadOnlySection();
   }
 
   return getDataSection();

Modified: llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp?rev=56582&r1=56581&r2=56582&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp Wed Sep 24 17:20:27 2008
@@ -150,8 +150,6 @@
     SixteenByteConstantSection = getUnnamedSection("\t.literal16\n",
                                                    SectionFlags::Mergeable);
   }
-  ReadOnlySection = "\t.const\n";
-
   LCOMMDirective = "\t.lcomm\t";
   SwitchToSectionDirective = "\t.section ";
   StringConstantPrefix = "\1LC";
@@ -229,7 +227,6 @@
 X86ELFTargetAsmInfo::X86ELFTargetAsmInfo(const X86TargetMachine &TM):
   X86TargetAsmInfo(TM), ELFTargetAsmInfo(TM) {
 
-  ReadOnlySection = ".rodata";
   CStringSection = ".rodata.str";
   PrivateGlobalPrefix = ".L";
   WeakRefDirective = "\t.weak\t";




From asl at math.spbu.ru  Wed Sep 24 17:20:46 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 24 Sep 2008 22:20:46 -0000
Subject: [llvm-commits] [llvm] r56583 -
	/llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
Message-ID: <200809242220.m8OMKkcQ025360@zion.cs.uiuc.edu>

Author: asl
Date: Wed Sep 24 17:20:46 2008
New Revision: 56583

URL: http://llvm.org/viewvc/llvm-project?rev=56583&view=rev
Log:
SmallPtrSet will be better

Modified:
    llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp?rev=56583&r1=56582&r2=56583&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp Wed Sep 24 17:20:46 2008
@@ -28,7 +28,6 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetOptions.h"
 #include "llvm/Target/TargetRegisterInfo.h"
-#include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringExtras.h"
@@ -262,7 +261,7 @@
     std::multimap<const Section*,
                   std::pair<MachineConstantPoolEntry, unsigned> > CPMap;
   CPMap  CPs;
-  DenseSet<const Section*> Sections;
+  SmallPtrSet<const Section*, 5> Sections;
 
   for (unsigned i = 0, e = CP.size(); i != e; ++i) {
     MachineConstantPoolEntry CPE = CP[i];
@@ -272,7 +271,7 @@
   }
 
   // Now print stuff into the calculated sections.
-  for (DenseSet<const Section*>::iterator IS = Sections.begin(),
+  for (SmallPtrSet<const Section*, 5>::iterator IS = Sections.begin(),
          ES = Sections.end(); IS != ES; ++IS) {
     SwitchToSection(*IS);
     EmitAlignment(MCP->getConstantPoolAlignment());




From asl at math.spbu.ru  Wed Sep 24 17:21:04 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 24 Sep 2008 22:21:04 -0000
Subject: [llvm-commits] [llvm] r56584 -
	/llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
Message-ID: <200809242221.m8OML4im025380@zion.cs.uiuc.edu>

Author: asl
Date: Wed Sep 24 17:21:04 2008
New Revision: 56584

URL: http://llvm.org/viewvc/llvm-project?rev=56584&view=rev
Log:
Use helper

Modified:
    llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp?rev=56584&r1=56583&r2=56584&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp Wed Sep 24 17:21:04 2008
@@ -185,7 +185,7 @@
 
       const GlobalValue *GV = cast<GlobalValue>(I->getAliasedGlobal());
       Target = Mang->getValueName(GV);
-      
+
       if (I->hasExternalLinkage() || !TAI->getWeakRefDirective())
         O << "\t.globl\t" << Name << '\n';
       else if (I->hasWeakLinkage())
@@ -193,13 +193,7 @@
       else if (!I->hasInternalLinkage())
         assert(0 && "Invalid alias linkage");
 
-      if (I->hasHiddenVisibility()) {
-        if (const char *Directive = TAI->getHiddenDirective())
-          O << Directive << Name << '\n';
-      } else if (I->hasProtectedVisibility()) {
-        if (const char *Directive = TAI->getProtectedDirective())
-          O << Directive << Name << '\n';
-      }
+      printVisibility(Name, I->getVisibility());
 
       O << TAI->getSetDirective() << ' ' << Name << ", " << Target << '\n';
 




From asl at math.spbu.ru  Wed Sep 24 17:21:40 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 24 Sep 2008 22:21:40 -0000
Subject: [llvm-commits] [llvm] r56585 - in /llvm/trunk:
 include/llvm/Target/TargetAsmInfo.h lib/Target/TargetAsmInfo.cpp
 lib/Target/X86/X86TargetAsmInfo.cpp lib/Target/X86/X86TargetAsmInfo.h
 lib/Target/X86/X86TargetMachine.cpp
Message-ID: <200809242221.m8OMLe9P025410@zion.cs.uiuc.edu>

Author: asl
Date: Wed Sep 24 17:21:39 2008
New Revision: 56585

URL: http://llvm.org/viewvc/llvm-project?rev=56585&view=rev
Log:
Use crazy template-based inheritance instead of virtual one.

Modified:
    llvm/trunk/include/llvm/Target/TargetAsmInfo.h
    llvm/trunk/lib/Target/TargetAsmInfo.cpp
    llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp
    llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h
    llvm/trunk/lib/Target/X86/X86TargetMachine.cpp

Modified: llvm/trunk/include/llvm/Target/TargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetAsmInfo.h?rev=56585&r1=56584&r2=56585&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/TargetAsmInfo.h (original)
+++ llvm/trunk/include/llvm/Target/TargetAsmInfo.h Wed Sep 24 17:21:39 2008
@@ -124,6 +124,7 @@
   private:
     mutable StringMap<Section> Sections;
     mutable SectionFlags::FlagsStringsMapType FlagsStrings;
+    void fillDefaultValues();
   protected:
     //===------------------------------------------------------------------===//
     // Properties to be set by the target writer, used to configure asm printer.
@@ -510,6 +511,7 @@
 
   public:
     TargetAsmInfo();
+    TargetAsmInfo(const TargetMachine &TM);
     virtual ~TargetAsmInfo();
 
     const Section* getNamedSection(const char *Name,

Modified: llvm/trunk/lib/Target/TargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetAsmInfo.cpp?rev=56585&r1=56584&r2=56585&view=diff

==============================================================================
--- llvm/trunk/lib/Target/TargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/TargetAsmInfo.cpp Wed Sep 24 17:21:39 2008
@@ -25,100 +25,108 @@
 
 using namespace llvm;
 
-TargetAsmInfo::TargetAsmInfo() :
-  TextSection(0),
-  DataSection(0),
-  BSSSection("\t.bss"),
-  BSSSection_(0),
-  ReadOnlySection(0),
-  SmallDataSection(0),
-  SmallBSSSection(0),
-  SmallRODataSection(0),
-  TLSDataSection(0),
-  TLSBSSSection(0),
-  ZeroFillDirective(0),
-  NonexecutableStackDirective(0),
-  NeedsSet(false),
-  MaxInstLength(4),
-  PCSymbol("$"),
-  SeparatorChar(';'),
-  CommentString("#"),
-  GlobalPrefix(""),
-  PrivateGlobalPrefix("."),
-  LessPrivateGlobalPrefix(""),
-  JumpTableSpecialLabelPrefix(0),
-  GlobalVarAddrPrefix(""),
-  GlobalVarAddrSuffix(""),
-  FunctionAddrPrefix(""),
-  FunctionAddrSuffix(""),
-  PersonalityPrefix(""),
-  PersonalitySuffix(""),
-  NeedsIndirectEncoding(false),
-  InlineAsmStart("#APP"),
-  InlineAsmEnd("#NO_APP"),
-  AssemblerDialect(0),
-  StringConstantPrefix(".str"),
-  ZeroDirective("\t.zero\t"),
-  ZeroDirectiveSuffix(0),
-  AsciiDirective("\t.ascii\t"),
-  AscizDirective("\t.asciz\t"),
-  Data8bitsDirective("\t.byte\t"),
-  Data16bitsDirective("\t.short\t"),
-  Data32bitsDirective("\t.long\t"),
-  Data64bitsDirective("\t.quad\t"),
-  AlignDirective("\t.align\t"),
-  AlignmentIsInBytes(true),
-  TextAlignFillValue(0),
-  SwitchToSectionDirective("\t.section\t"),
-  TextSectionStartSuffix(""),
-  DataSectionStartSuffix(""),
-  SectionEndDirectiveSuffix(0),
-  ConstantPoolSection("\t.section .rodata"),
-  JumpTableDataSection("\t.section .rodata"),
-  JumpTableDirective(0),
-  CStringSection(0),
-  CStringSection_(0),
-  StaticCtorsSection("\t.section .ctors,\"aw\", at progbits"),
-  StaticDtorsSection("\t.section .dtors,\"aw\", at progbits"),
-  GlobalDirective("\t.globl\t"),
-  SetDirective(0),
-  LCOMMDirective(0),
-  COMMDirective("\t.comm\t"),
-  COMMDirectiveTakesAlignment(true),
-  HasDotTypeDotSizeDirective(true),
-  UsedDirective(0),
-  WeakRefDirective(0),
-  WeakDefDirective(0),
-  HiddenDirective("\t.hidden\t"),
-  ProtectedDirective("\t.protected\t"),
-  AbsoluteDebugSectionOffsets(false),
-  AbsoluteEHSectionOffsets(false),
-  HasLEB128(false),
-  HasDotLocAndDotFile(false),
-  SupportsDebugInformation(false),
-  SupportsExceptionHandling(false),
-  DwarfRequiresFrameSection(true),
-  GlobalEHDirective(0),
-  SupportsWeakOmittedEHFrame(true),
-  DwarfSectionOffsetDirective(0),
-  DwarfAbbrevSection(".debug_abbrev"),
-  DwarfInfoSection(".debug_info"),
-  DwarfLineSection(".debug_line"),
-  DwarfFrameSection(".debug_frame"),
-  DwarfPubNamesSection(".debug_pubnames"),
-  DwarfPubTypesSection(".debug_pubtypes"),
-  DwarfStrSection(".debug_str"),
-  DwarfLocSection(".debug_loc"),
-  DwarfARangesSection(".debug_aranges"),
-  DwarfRangesSection(".debug_ranges"),
-  DwarfMacInfoSection(".debug_macinfo"),
-  DwarfEHFrameSection(".eh_frame"),
-  DwarfExceptionSection(".gcc_except_table"),
-  AsmTransCBE(0) {
+void TargetAsmInfo::fillDefaultValues() {
+  BSSSection = "\t.bss";
+  BSSSection_ = 0;
+  ReadOnlySection = 0;
+  SmallDataSection = 0;
+  SmallBSSSection = 0;
+  SmallRODataSection = 0;
+  TLSDataSection = 0;
+  TLSBSSSection = 0;
+  ZeroFillDirective = 0;
+  NonexecutableStackDirective = 0;
+  NeedsSet = false;
+  MaxInstLength = 4;
+  PCSymbol = "$";
+  SeparatorChar = ';';
+  CommentString = "#";
+  GlobalPrefix = "";
+  PrivateGlobalPrefix = ".";
+  LessPrivateGlobalPrefix = "";
+  JumpTableSpecialLabelPrefix = 0;
+  GlobalVarAddrPrefix = "";
+  GlobalVarAddrSuffix = "";
+  FunctionAddrPrefix = "";
+  FunctionAddrSuffix = "";
+  PersonalityPrefix = "";
+  PersonalitySuffix = "";
+  NeedsIndirectEncoding = false;
+  InlineAsmStart = "#APP";
+  InlineAsmEnd = "#NO_APP";
+  AssemblerDialect = 0;
+  StringConstantPrefix = ".str";
+  ZeroDirective = "\t.zero\t";
+  ZeroDirectiveSuffix = 0;
+  AsciiDirective = "\t.ascii\t";
+  AscizDirective = "\t.asciz\t";
+  Data8bitsDirective = "\t.byte\t";
+  Data16bitsDirective = "\t.short\t";
+  Data32bitsDirective = "\t.long\t";
+  Data64bitsDirective = "\t.quad\t";
+  AlignDirective = "\t.align\t";
+  AlignmentIsInBytes = true;
+  TextAlignFillValue = 0;
+  SwitchToSectionDirective = "\t.section\t";
+  TextSectionStartSuffix = "";
+  DataSectionStartSuffix = "";
+  SectionEndDirectiveSuffix = 0;
+  ConstantPoolSection = "\t.section .rodata";
+  JumpTableDataSection = "\t.section .rodata";
+  JumpTableDirective = 0;
+  CStringSection = 0;
+  CStringSection_ = 0;
+  // FIXME: Flags are ELFish - replace with normal section stuff.
+  StaticCtorsSection = "\t.section .ctors,\"aw\", at progbits";
+  StaticDtorsSection = "\t.section .dtors,\"aw\", at progbits";
+  GlobalDirective = "\t.globl\t";
+  SetDirective = 0;
+  LCOMMDirective = 0;
+  COMMDirective = "\t.comm\t";
+  COMMDirectiveTakesAlignment = true;
+  HasDotTypeDotSizeDirective = true;
+  UsedDirective = 0;
+  WeakRefDirective = 0;
+  WeakDefDirective = 0;
+  // FIXME: These are ELFish - move to ELFTAI.
+  HiddenDirective = "\t.hidden\t";
+  ProtectedDirective = "\t.protected\t";
+  AbsoluteDebugSectionOffsets = false;
+  AbsoluteEHSectionOffsets = false;
+  HasLEB128 = false;
+  HasDotLocAndDotFile = false;
+  SupportsDebugInformation = false;
+  SupportsExceptionHandling = false;
+  DwarfRequiresFrameSection = true;
+  GlobalEHDirective = 0;
+  SupportsWeakOmittedEHFrame = true;
+  DwarfSectionOffsetDirective = 0;
+  DwarfAbbrevSection = ".debug_abbrev";
+  DwarfInfoSection = ".debug_info";
+  DwarfLineSection = ".debug_line";
+  DwarfFrameSection = ".debug_frame";
+  DwarfPubNamesSection = ".debug_pubnames";
+  DwarfPubTypesSection = ".debug_pubtypes";
+  DwarfStrSection = ".debug_str";
+  DwarfLocSection = ".debug_loc";
+  DwarfARangesSection = ".debug_aranges";
+  DwarfRangesSection = ".debug_ranges";
+  DwarfMacInfoSection = ".debug_macinfo";
+  DwarfEHFrameSection = ".eh_frame";
+  DwarfExceptionSection = ".gcc_except_table";
+  AsmTransCBE = 0;
   TextSection = getUnnamedSection("\t.text", SectionFlags::Code);
   DataSection = getUnnamedSection("\t.data", SectionFlags::Writeable);
 }
 
+TargetAsmInfo::TargetAsmInfo() {
+  fillDefaultValues();
+}
+
+TargetAsmInfo::TargetAsmInfo(const TargetMachine &TM) {
+  fillDefaultValues();
+}
+
 TargetAsmInfo::~TargetAsmInfo() {
 }
 

Modified: llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp?rev=56585&r1=56584&r2=56585&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp Wed Sep 24 17:21:39 2008
@@ -25,27 +25,20 @@
 using namespace llvm;
 using namespace llvm::dwarf;
 
-static const char *const x86_asm_table[] = {
-                                      "{si}", "S",
-                                      "{di}", "D",
-                                      "{ax}", "a",
-                                      "{cx}", "c",
-                                      "{memory}", "memory",
-                                      "{flags}", "",
-                                      "{dirflag}", "",
-                                      "{fpsr}", "",
-                                      "{cc}", "cc",
-                                      0,0};
-
-X86TargetAsmInfo::X86TargetAsmInfo(const X86TargetMachine &TM) {
-  const X86Subtarget *Subtarget = &TM.getSubtarget<X86Subtarget>();
+const char *const llvm::x86_asm_table[] = {
+  "{si}", "S",
+  "{di}", "D",
+  "{ax}", "a",
+  "{cx}", "c",
+  "{memory}", "memory",
+  "{flags}", "",
+  "{dirflag}", "",
+  "{fpsr}", "",
+  "{cc}", "cc",
+  0,0};
 
-  AsmTransCBE = x86_asm_table;
-
-  AssemblerDialect = Subtarget->getAsmFlavor();
-}
-
-bool X86TargetAsmInfo::LowerToBSwap(CallInst *CI) const {
+template <class BaseTAI>
+bool X86TargetAsmInfo<BaseTAI>::LowerToBSwap(CallInst *CI) const {
   // FIXME: this should verify that we are targetting a 486 or better.  If not,
   // we will turn this bswap into something that will be lowered to logical ops
   // instead of emitting the bswap asm.  For now, we don't support 486 or lower
@@ -74,7 +67,8 @@
   return true;
 }
 
-bool X86TargetAsmInfo::ExpandInlineAsm(CallInst *CI) const {
+template <class BaseTAI>
+bool X86TargetAsmInfo<BaseTAI>::ExpandInlineAsm(CallInst *CI) const {
   InlineAsm *IA = cast<InlineAsm>(CI->getCalledValue());
   std::vector<InlineAsm::ConstraintInfo> Constraints = IA->ParseConstraints();
 
@@ -125,7 +119,7 @@
 }
 
 X86DarwinTargetAsmInfo::X86DarwinTargetAsmInfo(const X86TargetMachine &TM):
-  X86TargetAsmInfo(TM), DarwinTargetAsmInfo(TM) {
+  X86TargetAsmInfo<DarwinTargetAsmInfo>(TM) {
   const X86Subtarget* Subtarget = &DTM->getSubtarget<X86Subtarget>();
   bool is64Bit = Subtarget->is64Bit();
 
@@ -225,7 +219,7 @@
 }
 
 X86ELFTargetAsmInfo::X86ELFTargetAsmInfo(const X86TargetMachine &TM):
-  X86TargetAsmInfo(TM), ELFTargetAsmInfo(TM) {
+  X86TargetAsmInfo<ELFTargetAsmInfo>(TM) {
 
   CStringSection = ".rodata.str";
   PrivateGlobalPrefix = ".L";
@@ -302,7 +296,7 @@
 }
 
 X86COFFTargetAsmInfo::X86COFFTargetAsmInfo(const X86TargetMachine &TM):
-  X86TargetAsmInfo(TM) {
+  X86GenericTargetAsmInfo(TM) {
   X86TM = &TM;
 
   GlobalPrefix = "_";
@@ -408,7 +402,7 @@
 }
 
 X86WinTargetAsmInfo::X86WinTargetAsmInfo(const X86TargetMachine &TM):
-  X86TargetAsmInfo(TM) {
+  X86GenericTargetAsmInfo(TM) {
   GlobalPrefix = "_";
   CommentString = ";";
 

Modified: llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h?rev=56585&r1=56584&r2=56585&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h (original)
+++ llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h Wed Sep 24 17:21:39 2008
@@ -14,17 +14,24 @@
 #ifndef X86TARGETASMINFO_H
 #define X86TARGETASMINFO_H
 
+#include "X86TargetMachine.h"
 #include "llvm/Target/TargetAsmInfo.h"
 #include "llvm/Target/ELFTargetAsmInfo.h"
 #include "llvm/Target/DarwinTargetAsmInfo.h"
 
 namespace llvm {
 
-  // Forward declaration.
-  class X86TargetMachine;
+  extern const char *const x86_asm_table[];
 
-  struct X86TargetAsmInfo : public virtual TargetAsmInfo {
-    explicit X86TargetAsmInfo(const X86TargetMachine &TM);
+  template <class BaseTAI>
+  struct X86TargetAsmInfo : public BaseTAI {
+    explicit X86TargetAsmInfo(const X86TargetMachine &TM):
+      BaseTAI(TM) {
+      const X86Subtarget *Subtarget = &TM.getSubtarget<X86Subtarget>();
+
+      BaseTAI::AsmTransCBE = x86_asm_table;
+      BaseTAI::AssemblerDialect = Subtarget->getAsmFlavor();
+    }
 
     virtual bool ExpandInlineAsm(CallInst *CI) const;
 
@@ -32,21 +39,21 @@
     bool LowerToBSwap(CallInst *CI) const;
   };
 
-  struct X86DarwinTargetAsmInfo : public X86TargetAsmInfo,
-                                  public DarwinTargetAsmInfo {
+  typedef X86TargetAsmInfo<TargetAsmInfo> X86GenericTargetAsmInfo;
+
+  struct X86DarwinTargetAsmInfo : public X86TargetAsmInfo<DarwinTargetAsmInfo> {
     explicit X86DarwinTargetAsmInfo(const X86TargetMachine &TM);
     virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target Reason,
                                            bool Global) const;
   };
 
-  struct X86ELFTargetAsmInfo : public X86TargetAsmInfo,
-                               public ELFTargetAsmInfo {
+  struct X86ELFTargetAsmInfo : public X86TargetAsmInfo<ELFTargetAsmInfo> {
     explicit X86ELFTargetAsmInfo(const X86TargetMachine &TM);
     virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target Reason,
                                            bool Global) const;
   };
 
-  struct X86COFFTargetAsmInfo : public X86TargetAsmInfo {
+  struct X86COFFTargetAsmInfo : public X86GenericTargetAsmInfo {
     explicit X86COFFTargetAsmInfo(const X86TargetMachine &TM);
     virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target Reason,
                                            bool Global) const;
@@ -57,9 +64,11 @@
     const X86TargetMachine *X86TM;
   };
 
-  struct X86WinTargetAsmInfo : public X86TargetAsmInfo {
+  struct X86WinTargetAsmInfo : public X86GenericTargetAsmInfo {
     explicit X86WinTargetAsmInfo(const X86TargetMachine &TM);
   };
+
 } // namespace llvm
 
 #endif
+

Modified: llvm/trunk/lib/Target/X86/X86TargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetMachine.cpp?rev=56585&r1=56584&r2=56585&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetMachine.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86TargetMachine.cpp Wed Sep 24 17:21:39 2008
@@ -54,7 +54,7 @@
      case X86Subtarget::isWindows:
       return new X86WinTargetAsmInfo(*this);
      default:
-      return new X86TargetAsmInfo(*this);
+      return new X86GenericTargetAsmInfo(*this);
     }
 }
 




From asl at math.spbu.ru  Wed Sep 24 17:22:03 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 24 Sep 2008 22:22:03 -0000
Subject: [llvm-commits] [llvm] r56586 - in /llvm/trunk/lib/Target/PowerPC:
 PPCTargetAsmInfo.cpp PPCTargetAsmInfo.h
Message-ID: <200809242222.m8OMM3Qs025446@zion.cs.uiuc.edu>

Author: asl
Date: Wed Sep 24 17:22:03 2008
New Revision: 56586

URL: http://llvm.org/viewvc/llvm-project?rev=56586&view=rev
Log:
Get rid of virtual inheritance for PPC TAI

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

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

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp Wed Sep 24 17:22:03 2008
@@ -19,21 +19,8 @@
 using namespace llvm;
 using namespace llvm::dwarf;
 
-PPCTargetAsmInfo::PPCTargetAsmInfo(const PPCTargetMachine &TM) {
-  bool isPPC64 = TM.getSubtargetImpl()->isPPC64();
-
-  ZeroDirective = "\t.space\t";
-  SetDirective = "\t.set";
-  Data64bitsDirective = isPPC64 ? "\t.quad\t" : 0;  
-  AlignmentIsInBytes = false;
-  LCOMMDirective = "\t.lcomm\t";
-  InlineAsmStart = "# InlineAsm Start";
-  InlineAsmEnd = "# InlineAsm End";
-  AssemblerDialect = TM.getSubtargetImpl()->getAsmFlavor();
-}
-
 PPCDarwinTargetAsmInfo::PPCDarwinTargetAsmInfo(const PPCTargetMachine &TM):
-  PPCTargetAsmInfo(TM), DarwinTargetAsmInfo(TM) {
+  PPCTargetAsmInfo<DarwinTargetAsmInfo>(TM) {
   PCSymbol = ".";
   CommentString = ";";
   GlobalPrefix = "_";
@@ -103,7 +90,7 @@
 
 
 PPCLinuxTargetAsmInfo::PPCLinuxTargetAsmInfo(const PPCTargetMachine &TM) :
-  PPCTargetAsmInfo(TM), ELFTargetAsmInfo(TM) {
+  PPCTargetAsmInfo<ELFTargetAsmInfo>(TM) {
   CommentString = "#";
   GlobalPrefix = "";
   PrivateGlobalPrefix = "";

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

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h Wed Sep 24 17:22:03 2008
@@ -14,28 +14,40 @@
 #ifndef PPCTARGETASMINFO_H
 #define PPCTARGETASMINFO_H
 
+#include "PPCTargetMachine.h"
 #include "llvm/Target/TargetAsmInfo.h"
 #include "llvm/Target/DarwinTargetAsmInfo.h"
 #include "llvm/Target/ELFTargetAsmInfo.h"
 
 namespace llvm {
 
-  // Forward declaration.
-  class PPCTargetMachine;
-
-  struct PPCTargetAsmInfo : public virtual TargetAsmInfo {
-    explicit PPCTargetAsmInfo(const PPCTargetMachine &TM);
+  template <class BaseTAI>
+  struct PPCTargetAsmInfo : public BaseTAI {
+    explicit PPCTargetAsmInfo(const PPCTargetMachine &TM):
+      BaseTAI(TM) {
+      const PPCSubtarget *Subtarget = &TM.getSubtarget<PPCSubtarget>();
+      bool isPPC64 = Subtarget->isPPC64();
+
+      BaseTAI::ZeroDirective = "\t.space\t";
+      BaseTAI::SetDirective = "\t.set";
+      BaseTAI::Data64bitsDirective = isPPC64 ? "\t.quad\t" : 0;
+      BaseTAI::AlignmentIsInBytes = false;
+      BaseTAI::LCOMMDirective = "\t.lcomm\t";
+      BaseTAI::InlineAsmStart = "# InlineAsm Start";
+      BaseTAI::InlineAsmEnd = "# InlineAsm End";
+      BaseTAI::AssemblerDialect = Subtarget->getAsmFlavor();
+    }
   };
 
-  struct PPCDarwinTargetAsmInfo : public PPCTargetAsmInfo,
-                                  public DarwinTargetAsmInfo {
+  typedef PPCTargetAsmInfo<TargetAsmInfo> PPCGenericTargetAsmInfo;
+
+  struct PPCDarwinTargetAsmInfo : public PPCTargetAsmInfo<DarwinTargetAsmInfo> {
     explicit PPCDarwinTargetAsmInfo(const PPCTargetMachine &TM);
     virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target Reason,
                                            bool Global) const;
   };
 
-  struct PPCLinuxTargetAsmInfo : public PPCTargetAsmInfo,
-                                 public ELFTargetAsmInfo {
+  struct PPCLinuxTargetAsmInfo : public PPCTargetAsmInfo<ELFTargetAsmInfo> {
     explicit PPCLinuxTargetAsmInfo(const PPCTargetMachine &TM);
     virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target Reason,
                                            bool Global) const;




From asl at math.spbu.ru  Wed Sep 24 17:22:27 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 24 Sep 2008 22:22:27 -0000
Subject: [llvm-commits] [llvm] r56587 - in /llvm/trunk/lib/Target/ARM:
 ARMTargetAsmInfo.cpp ARMTargetAsmInfo.h ARMTargetMachine.cpp
Message-ID: <200809242222.m8OMMRIR025473@zion.cs.uiuc.edu>

Author: asl
Date: Wed Sep 24 17:22:27 2008
New Revision: 56587

URL: http://llvm.org/viewvc/llvm-project?rev=56587&view=rev
Log:
Get rid of virtual inheritance for ARM TAI

Modified:
    llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp
    llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h
    llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp

Modified: llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp?rev=56587&r1=56586&r2=56587&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp Wed Sep 24 17:22:27 2008
@@ -17,7 +17,7 @@
 #include <cctype>
 using namespace llvm;
 
-static const char *const arm_asm_table[] = {
+const char *const llvm::arm_asm_table[] = {
                                       "{r0}", "r0",
                                       "{r1}", "r1",
                                       "{r2}", "r2",
@@ -42,21 +42,10 @@
                                       "{cc}", "cc",
                                       0,0};
 
-ARMTargetAsmInfo::ARMTargetAsmInfo(const ARMTargetMachine &TM) {
-  AsmTransCBE = arm_asm_table;
-
-  AlignmentIsInBytes = false;
-  Data64bitsDirective = 0;
-  CommentString = "@";
-  ConstantPoolSection = "\t.text\n";
-  COMMDirectiveTakesAlignment = false;
-  InlineAsmStart = "@ InlineAsm Start";
-  InlineAsmEnd = "@ InlineAsm End";
-  LCOMMDirective = "\t.lcomm\t";
-}
+TEMPLATE_INSTANTIATION(class ARMTargetAsmInfo<TargetAsmInfo>);
 
 ARMDarwinTargetAsmInfo::ARMDarwinTargetAsmInfo(const ARMTargetMachine &TM):
-  ARMTargetAsmInfo(TM), DarwinTargetAsmInfo(TM) {
+  ARMTargetAsmInfo<DarwinTargetAsmInfo>(TM) {
   Subtarget = &DTM->getSubtarget<ARMSubtarget>();
 
   GlobalPrefix = "_";
@@ -104,7 +93,7 @@
 }
 
 ARMELFTargetAsmInfo::ARMELFTargetAsmInfo(const ARMTargetMachine &TM):
-  ARMTargetAsmInfo(TM), ELFTargetAsmInfo(TM) {
+  ARMTargetAsmInfo<ELFTargetAsmInfo>(TM) {
   Subtarget = &ETM->getSubtarget<ARMSubtarget>();
 
   NeedsSet = false;
@@ -138,13 +127,15 @@
 
 /// Count the number of comma-separated arguments.
 /// Do not try to detect errors.
-unsigned ARMTargetAsmInfo::countArguments(const char* p) const {
+template <class BaseTAI>
+unsigned ARMTargetAsmInfo<BaseTAI>::countArguments(const char* p) const {
   unsigned count = 0;
   while (*p && isspace(*p) && *p != '\n')
     p++;
   count++;
-  while (*p && *p!='\n' && 
-         strncmp(p, CommentString, strlen(CommentString))!=0) {
+  while (*p && *p!='\n' &&
+         strncmp(p, BaseTAI::CommentString,
+                 strlen(BaseTAI::CommentString))!=0) {
     if (*p==',')
       count++;
     p++;
@@ -154,7 +145,8 @@
 
 /// Count the length of a string enclosed in quote characters.
 /// Do not try to detect errors.
-unsigned ARMTargetAsmInfo::countString(const char* p) const {
+template <class BaseTAI>
+unsigned ARMTargetAsmInfo<BaseTAI>::countString(const char* p) const {
   unsigned count = 0;
   while (*p && isspace(*p) && *p!='\n')
     p++;
@@ -166,7 +158,8 @@
 }
 
 /// ARM-specific version of TargetAsmInfo::getInlineAsmLength.
-unsigned ARMTargetAsmInfo::getInlineAsmLength(const char *s) const {
+template <class BaseTAI>
+unsigned ARMTargetAsmInfo<BaseTAI>::getInlineAsmLength(const char *s) const {
   // Make a lowercase-folded version of s for counting purposes.
   char *q, *s_copy = (char *)malloc(strlen(s) + 1);
   strcpy(s_copy, s);
@@ -192,7 +185,7 @@
           break;
         }
       // Ignore everything from comment char(s) to EOL
-      if (strncmp(Str, CommentString, strlen(CommentString))==-0)
+      if (strncmp(Str, BaseTAI::CommentString, strlen(BaseTAI::CommentString))==-0)
         atInsnStart = false;
       // FIXME do something like the following for non-Darwin
       else if (*Str == '.' && Subtarget->isTargetDarwin()) {
@@ -282,7 +275,7 @@
           Length += 4;    // ARM
       }
     }
-    if (*Str == '\n' || *Str == SeparatorChar)
+    if (*Str == '\n' || *Str == BaseTAI::SeparatorChar)
       atInsnStart = true;
   }
   free(s_copy);

Modified: llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h?rev=56587&r1=56586&r2=56587&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h (original)
+++ llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h Wed Sep 24 17:22:27 2008
@@ -14,19 +14,31 @@
 #ifndef ARMTARGETASMINFO_H
 #define ARMTARGETASMINFO_H
 
+#include "ARMTargetMachine.h"
 #include "llvm/Target/TargetAsmInfo.h"
 #include "llvm/Target/ELFTargetAsmInfo.h"
 #include "llvm/Target/DarwinTargetAsmInfo.h"
-
-#include "ARMSubtarget.h"
+#include "llvm/Support/Compiler.h"
 
 namespace llvm {
 
-  // Forward declaration.
-  class ARMTargetMachine;
+  extern const char *const arm_asm_table[];
 
-  struct ARMTargetAsmInfo : public virtual TargetAsmInfo {
-    explicit ARMTargetAsmInfo(const ARMTargetMachine &TM);
+  template <class BaseTAI>
+  struct ARMTargetAsmInfo : public BaseTAI {
+    explicit ARMTargetAsmInfo(const ARMTargetMachine &TM):
+      BaseTAI(TM) {
+      BaseTAI::AsmTransCBE = arm_asm_table;
+
+      BaseTAI::AlignmentIsInBytes = false;
+      BaseTAI::Data64bitsDirective = 0;
+      BaseTAI::CommentString = "@";
+      BaseTAI::ConstantPoolSection = "\t.text\n";
+      BaseTAI::COMMDirectiveTakesAlignment = false;
+      BaseTAI::InlineAsmStart = "@ InlineAsm Start";
+      BaseTAI::InlineAsmEnd = "@ InlineAsm End";
+      BaseTAI::LCOMMDirective = "\t.lcomm\t";
+    }
 
     const ARMSubtarget *Subtarget;
 
@@ -35,13 +47,15 @@
     unsigned countString(const char *p) const;
   };
 
-  struct ARMDarwinTargetAsmInfo : public virtual ARMTargetAsmInfo,
-                                  public virtual DarwinTargetAsmInfo {
+  typedef ARMTargetAsmInfo<TargetAsmInfo> ARMGenericTargetAsmInfo;
+
+  EXTERN_TEMPLATE_INSTANTIATION(class ARMTargetAsmInfo<TargetAsmInfo>);
+
+  struct ARMDarwinTargetAsmInfo : public ARMTargetAsmInfo<DarwinTargetAsmInfo> {
     explicit ARMDarwinTargetAsmInfo(const ARMTargetMachine &TM);
   };
 
-  struct ARMELFTargetAsmInfo : public virtual ARMTargetAsmInfo,
-                               public virtual ELFTargetAsmInfo {
+  struct ARMELFTargetAsmInfo : public ARMTargetAsmInfo<ELFTargetAsmInfo> {
     explicit ARMELFTargetAsmInfo(const ARMTargetMachine &TM);
   };
 

Modified: llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp?rev=56587&r1=56586&r2=56587&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp Wed Sep 24 17:22:27 2008
@@ -120,7 +120,7 @@
    case ARMSubtarget::isELF:
     return new ARMELFTargetAsmInfo(*this);
    default:
-    return new ARMTargetAsmInfo(*this);
+    return new ARMGenericTargetAsmInfo(*this);
   }
 }
 




From asl at math.spbu.ru  Wed Sep 24 17:22:54 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 24 Sep 2008 22:22:54 -0000
Subject: [llvm-commits] [llvm] r56588 - in /llvm/trunk/lib/Target:
 PowerPC/PPCTargetAsmInfo.cpp PowerPC/PPCTargetAsmInfo.h
 X86/X86TargetAsmInfo.cpp X86/X86TargetAsmInfo.h
Message-ID: <200809242222.m8OMMtae025499@zion.cs.uiuc.edu>

Author: asl
Date: Wed Sep 24 17:22:54 2008
New Revision: 56588

URL: http://llvm.org/viewvc/llvm-project?rev=56588&view=rev
Log:
Minor cleanup

Modified:
    llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp
    llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h
    llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp
    llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h

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

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp Wed Sep 24 17:22:54 2008
@@ -19,6 +19,8 @@
 using namespace llvm;
 using namespace llvm::dwarf;
 
+TEMPLATE_INSTANTIATION(class PPCTargetAsmInfo<TargetAsmInfo>);
+
 PPCDarwinTargetAsmInfo::PPCDarwinTargetAsmInfo(const PPCTargetMachine &TM):
   PPCTargetAsmInfo<DarwinTargetAsmInfo>(TM) {
   PCSymbol = ".";

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

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h Wed Sep 24 17:22:54 2008
@@ -18,6 +18,7 @@
 #include "llvm/Target/TargetAsmInfo.h"
 #include "llvm/Target/DarwinTargetAsmInfo.h"
 #include "llvm/Target/ELFTargetAsmInfo.h"
+#include "llvm/Support/Compiler.h"
 
 namespace llvm {
 
@@ -41,6 +42,8 @@
 
   typedef PPCTargetAsmInfo<TargetAsmInfo> PPCGenericTargetAsmInfo;
 
+  EXTERN_TEMPLATE_INSTANTIATION(class PPCTargetAsmInfo<TargetAsmInfo>);
+
   struct PPCDarwinTargetAsmInfo : public PPCTargetAsmInfo<DarwinTargetAsmInfo> {
     explicit PPCDarwinTargetAsmInfo(const PPCTargetMachine &TM);
     virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target Reason,

Modified: llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp?rev=56588&r1=56587&r2=56588&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp Wed Sep 24 17:22:54 2008
@@ -37,6 +37,8 @@
   "{cc}", "cc",
   0,0};
 
+TEMPLATE_INSTANTIATION(class X86TargetAsmInfo<TargetAsmInfo>);
+
 template <class BaseTAI>
 bool X86TargetAsmInfo<BaseTAI>::LowerToBSwap(CallInst *CI) const {
   // FIXME: this should verify that we are targetting a 486 or better.  If not,

Modified: llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h?rev=56588&r1=56587&r2=56588&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h (original)
+++ llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h Wed Sep 24 17:22:54 2008
@@ -18,6 +18,7 @@
 #include "llvm/Target/TargetAsmInfo.h"
 #include "llvm/Target/ELFTargetAsmInfo.h"
 #include "llvm/Target/DarwinTargetAsmInfo.h"
+#include "llvm/Support/Compiler.h"
 
 namespace llvm {
 
@@ -41,6 +42,8 @@
 
   typedef X86TargetAsmInfo<TargetAsmInfo> X86GenericTargetAsmInfo;
 
+  EXTERN_TEMPLATE_INSTANTIATION(class X86TargetAsmInfo<TargetAsmInfo>);
+
   struct X86DarwinTargetAsmInfo : public X86TargetAsmInfo<DarwinTargetAsmInfo> {
     explicit X86DarwinTargetAsmInfo(const X86TargetMachine &TM);
     virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target Reason,




From asl at math.spbu.ru  Wed Sep 24 17:23:17 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 24 Sep 2008 22:23:17 -0000
Subject: [llvm-commits] [llvm] r56589 - in /llvm/trunk/include/llvm/Target:
 DarwinTargetAsmInfo.h ELFTargetAsmInfo.h
Message-ID: <200809242223.m8OMNH2d025528@zion.cs.uiuc.edu>

Author: asl
Date: Wed Sep 24 17:23:17 2008
New Revision: 56589

URL: http://llvm.org/viewvc/llvm-project?rev=56589&view=rev
Log:
Finally get rid of virtual inheritance in TAI

Modified:
    llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h
    llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h

Modified: llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h?rev=56589&r1=56588&r2=56589&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h (original)
+++ llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h Wed Sep 24 17:23:17 2008
@@ -24,7 +24,7 @@
   class Type;
   class Mangler;
 
-  struct DarwinTargetAsmInfo: public virtual TargetAsmInfo {
+  struct DarwinTargetAsmInfo: public TargetAsmInfo {
     const Section* TextCoalSection;
     const Section* ConstDataCoalSection;
     const Section* ConstDataSection;

Modified: llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h?rev=56589&r1=56588&r2=56589&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h (original)
+++ llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h Wed Sep 24 17:23:17 2008
@@ -23,7 +23,7 @@
   class GlobalVariable;
   class Type;
 
-  struct ELFTargetAsmInfo: public virtual TargetAsmInfo {
+  struct ELFTargetAsmInfo: public TargetAsmInfo {
     explicit ELFTargetAsmInfo(const TargetMachine &TM);
 
     virtual const Section* SelectSectionForGlobal(const GlobalValue *GV) const;




From asl at math.spbu.ru  Wed Sep 24 17:03:06 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 24 Sep 2008 22:03:06 -0000
Subject: [llvm-commits] [llvm] r56568 -
	/llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp
Message-ID: <200809242203.m8OM37aB024557@zion.cs.uiuc.edu>

Author: asl
Date: Wed Sep 24 17:03:04 2008
New Revision: 56568

URL: http://llvm.org/viewvc/llvm-project?rev=56568&view=rev
Log:
XMM6-XMM15 are callee-saved on Win64. Patch by Nicolas Capens!

Modified:
    llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp

Modified: llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp?rev=56568&r1=56567&r2=56568&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp Wed Sep 24 17:03:04 2008
@@ -185,8 +185,11 @@
   };
 
   static const unsigned CalleeSavedRegsWin64[] = {
-    X86::RBX, X86::RBP, X86::RDI, X86::RSI,
-    X86::R12, X86::R13, X86::R14, X86::R15, 0
+    X86::RBX,   X86::RBP,   X86::RDI,   X86::RSI,
+    X86::R12,   X86::R13,   X86::R14,   X86::R15,
+    X86::XMM6,  X86::XMM7,  X86::XMM8,  X86::XMM9,
+    X86::XMM10, X86::XMM11, X86::XMM12, X86::XMM13,
+    X86::XMM14, X86::XMM15, 0
   };
 
   if (Is64Bit) {
@@ -230,10 +233,15 @@
     &X86::GR64RegClass, &X86::GR64RegClass, 0
   };
   static const TargetRegisterClass * const CalleeSavedRegClassesWin64[] = {
-    &X86::GR64RegClass, &X86::GR64RegClass,
-    &X86::GR64RegClass, &X86::GR64RegClass,
-    &X86::GR64RegClass, &X86::GR64RegClass,
-    &X86::GR64RegClass, &X86::GR64RegClass, 0
+    &X86::GR64RegClass,  &X86::GR64RegClass,
+    &X86::GR64RegClass,  &X86::GR64RegClass,
+    &X86::GR64RegClass,  &X86::GR64RegClass,
+    &X86::GR64RegClass,  &X86::GR64RegClass,
+    &X86::VR128RegClass, &X86::VR128RegClass,
+    &X86::VR128RegClass, &X86::VR128RegClass,
+    &X86::VR128RegClass, &X86::VR128RegClass,
+    &X86::VR128RegClass, &X86::VR128RegClass,
+    &X86::VR128RegClass, &X86::VR128RegClass, 0
   };
 
   if (Is64Bit) {




From isanbard at gmail.com  Wed Sep 24 18:04:43 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 24 Sep 2008 16:04:43 -0700
Subject: [llvm-commits] [llvm] r56569 -
	/llvm/trunk/lib/Target/PIC16/PIC16AsmPrinter.cpp
In-Reply-To: <200809242211.m8OMBQf4024800@zion.cs.uiuc.edu>
References: <200809242211.m8OMBQf4024800@zion.cs.uiuc.edu>
Message-ID: <16e5fdf90809241604o777abddfh74124090fa16f2fa@mail.gmail.com>

Hi Anton,

One of your recent changes is causing a build failure. Please
investigate. Thanks!

-bw

llvm[2]: ======= Finished Linking Release Executable opt (without symbols)
if [ ! -f llvm-nm/Makefile ]; then \
	  /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm.src/autoconf/mkinstalldirs
llvm-nm; \
	  /bin/cp /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm.src/tools/llvm-nm/Makefile
llvm-nm/Makefile; \
	fi; \
	make -C llvm-nm all
Undefined symbols:
  "llvm::ARMTargetAsmInfo<llvm::TargetAsmInfo>::getInlineAsmLength(char
const*) const", referenced from:
      vtable for llvm::ARMTargetAsmInfo<llvm::TargetAsmInfo>in LLVMARMCodeGen.o
  "llvm::X86TargetAsmInfo<llvm::TargetAsmInfo>::ExpandInlineAsm(llvm::CallInst*)
const", referenced from:
      vtable for llvm::X86COFFTargetAsmInfoin LLVMX86CodeGen.o
      vtable for llvm::X86TargetAsmInfo<llvm::TargetAsmInfo>in LLVMX86CodeGen.o
      vtable for llvm::X86WinTargetAsmInfoin LLVMX86CodeGen.o
ld: symbol(s) not found
collect2: ld returned 1 exit status


On Wed, Sep 24, 2008 at 3:11 PM, Anton Korobeynikov <asl at math.spbu.ru> wrote:
> Author: asl
> Date: Wed Sep 24 17:11:26 2008
> New Revision: 56569
>
> URL: http://llvm.org/viewvc/llvm-project?rev=56569&view=rev
> Log:
> Remove dead code for PIC16 (preparation to switch to new section handling stuff)
>
> Modified:
>    llvm/trunk/lib/Target/PIC16/PIC16AsmPrinter.cpp
>
> Modified: llvm/trunk/lib/Target/PIC16/PIC16AsmPrinter.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PIC16/PIC16AsmPrinter.cpp?rev=56569&r1=56568&r2=56569&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/PIC16/PIC16AsmPrinter.cpp (original)
> +++ llvm/trunk/lib/Target/PIC16/PIC16AsmPrinter.cpp Wed Sep 24 17:11:26 2008
> @@ -416,10 +416,7 @@
>           (I->hasInternalLinkage() || I->hasWeakLinkage() ||
>            I->hasLinkOnceLinkage() || I->hasCommonLinkage())) {
>         if (Size == 0) Size = 1;   // .comm Foo, 0 is undefined, avoid it.
> -        if (!NoZerosInBSS && TAI->getBSSSection())
> -          SwitchToDataSection(M.getModuleIdentifier().c_str(), I);
> -        else
> -          SwitchToDataSection(TAI->getDataSection(), I);
> +        SwitchToDataSection(M.getModuleIdentifier().c_str(), I);
>         if (TAI->getLCOMMDirective() != NULL) {
>           if (I->hasInternalLinkage()) {
>             O << TAI->getLCOMMDirective() << name << "," << Size;
> @@ -450,13 +447,6 @@
>       // FALL THROUGH
>
>     case GlobalValue::InternalLinkage:
> -      if (I->isConstant()) {
> -        const ConstantArray *CVA = dyn_cast<ConstantArray>(C);
> -        if (TAI->getCStringSection() && CVA && CVA->isCString()) {
> -          SwitchToDataSection(TAI->getCStringSection(), I);
> -          break;
> -        }
> -      }
>       break;
>
>     default:
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>


From dalej at apple.com  Wed Sep 24 18:13:09 2008
From: dalej at apple.com (Dale Johannesen)
Date: Wed, 24 Sep 2008 23:13:09 -0000
Subject: [llvm-commits] [llvm] r56592 - in /llvm/trunk:
 lib/CodeGen/RegAllocLocal.cpp
 lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
 lib/CodeGen/SelectionDAG/SelectionDAGBuild.h
 test/CodeGen/PowerPC/2007-04-30-InlineAsmEarlyClobber.ll
 test/CodeGen/X86/2008-09-17-inline-asm-1.ll
 test/CodeGen/X86/2008-09-18-inline-asm-2.ll
Message-ID: <200809242313.m8OND9xW027138@zion.cs.uiuc.edu>

Author: johannes
Date: Wed Sep 24 18:13:09 2008
New Revision: 56592

URL: http://llvm.org/viewvc/llvm-project?rev=56592&view=rev
Log:
Remove SelectionDag early allocation of registers
for earlyclobbers.  Teach Local RA about earlyclobber,
and add some tests for it.


Added:
    llvm/trunk/test/CodeGen/X86/2008-09-18-inline-asm-2.ll
Modified:
    llvm/trunk/lib/CodeGen/RegAllocLocal.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.h
    llvm/trunk/test/CodeGen/PowerPC/2007-04-30-InlineAsmEarlyClobber.ll
    llvm/trunk/test/CodeGen/X86/2008-09-17-inline-asm-1.ll

Modified: llvm/trunk/lib/CodeGen/RegAllocLocal.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/RegAllocLocal.cpp?rev=56592&r1=56591&r2=56592&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/RegAllocLocal.cpp (original)
+++ llvm/trunk/lib/CodeGen/RegAllocLocal.cpp Wed Sep 24 18:13:09 2008
@@ -722,6 +722,55 @@
       }
     }
 
+    // If any physical regs are earlyclobber, spill any value they might
+    // have in them, then mark them unallocatable.
+    // If any virtual regs are earlyclobber, allocate them now (before
+    // freeing inputs that are killed).
+    if (MI->getOpcode()==TargetInstrInfo::INLINEASM) {
+      for (unsigned i = 0; i != MI->getNumOperands(); ++i) {
+        MachineOperand& MO = MI->getOperand(i);
+        if (MO.isRegister() && MO.isDef() && MO.isEarlyClobber() && 
+            MO.getReg()) {
+          if (TargetRegisterInfo::isVirtualRegister(MO.getReg())) {
+            unsigned DestVirtReg = MO.getReg();
+            unsigned DestPhysReg;
+
+            // If DestVirtReg already has a value, use it.
+            if (!(DestPhysReg = getVirt2PhysRegMapSlot(DestVirtReg)))
+              DestPhysReg = getReg(MBB, MI, DestVirtReg);
+            MF->getRegInfo().setPhysRegUsed(DestPhysReg);
+            markVirtRegModified(DestVirtReg);
+            getVirtRegLastUse(DestVirtReg) =
+                   std::make_pair((MachineInstr*)0, 0);
+            DOUT << "  Assigning " << TRI->getName(DestPhysReg)
+                 << " to %reg" << DestVirtReg << "\n";
+            MO.setReg(DestPhysReg);  // Assign the earlyclobber register
+          } else {
+            unsigned Reg = MO.getReg();
+            if (PhysRegsUsed[Reg] == -2) continue;  // Something like ESP.
+            // These are extra physical register defs when a sub-register
+            // is defined (def of a sub-register is a read/mod/write of the
+            // larger registers). Ignore.
+            if (isReadModWriteImplicitDef(MI, MO.getReg())) continue;
+
+            MF->getRegInfo().setPhysRegUsed(Reg);
+            spillPhysReg(MBB, MI, Reg, true); // Spill any existing value in reg
+            PhysRegsUsed[Reg] = 0;            // It is free and reserved now
+            AddToPhysRegsUseOrder(Reg); 
+
+            for (const unsigned *AliasSet = TRI->getSubRegisters(Reg);
+                 *AliasSet; ++AliasSet) {
+              if (PhysRegsUsed[*AliasSet] != -2) {
+                MF->getRegInfo().setPhysRegUsed(*AliasSet);
+                PhysRegsUsed[*AliasSet] = 0;  // It is free and reserved now
+                AddToPhysRegsUseOrder(*AliasSet); 
+              }
+            }
+          }
+        }
+      }
+    }
+
     // Get the used operands into registers.  This has the potential to spill
     // incoming values if we are out of registers.  Note that we completely
     // ignore physical register uses here.  We assume that if an explicit
@@ -778,6 +827,7 @@
     for (unsigned i = 0, e = MI->getNumOperands(); i != e; ++i) {
       MachineOperand& MO = MI->getOperand(i);
       if (MO.isRegister() && MO.isDef() && !MO.isImplicit() && MO.getReg() &&
+          !MO.isEarlyClobber() &&
           TargetRegisterInfo::isPhysicalRegister(MO.getReg())) {
         unsigned Reg = MO.getReg();
         if (PhysRegsUsed[Reg] == -2) continue;  // Something like ESP.
@@ -839,6 +889,7 @@
     for (unsigned i = 0, e = MI->getNumOperands(); i != e; ++i) {
       MachineOperand& MO = MI->getOperand(i);
       if (MO.isRegister() && MO.isDef() && MO.getReg() &&
+          !MO.isEarlyClobber() &&
           TargetRegisterInfo::isVirtualRegister(MO.getReg())) {
         unsigned DestVirtReg = MO.getReg();
         unsigned DestPhysReg;

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Wed Sep 24 18:13:09 2008
@@ -4465,12 +4465,10 @@
 /// allocation.  This produces generally horrible, but correct, code.
 ///
 ///   OpInfo describes the operand.
-///   HasEarlyClobber is true if there are any early clobber constraints (=&r)
-///     or any explicitly clobbered registers.
 ///   Input and OutputRegs are the set of already allocated physical registers.
 ///
 void SelectionDAGLowering::
-GetRegistersForValue(SDISelAsmOperandInfo &OpInfo, bool HasEarlyClobber,
+GetRegistersForValue(SDISelAsmOperandInfo &OpInfo,
                      std::set<unsigned> &OutputRegs, 
                      std::set<unsigned> &InputRegs) {
   // Compute whether this value requires an input register, an output register,
@@ -4481,10 +4479,9 @@
   case InlineAsm::isOutput:
     isOutReg = true;
     
-    // If this is an early-clobber output, or if there is an input
-    // constraint that matches this, we need to reserve the input register
-    // so no other inputs allocate to it.
-    isInReg = OpInfo.isEarlyClobber || OpInfo.hasMatchingInput;
+    // If there is an input constraint that matches this, we need to reserve 
+    // the input register so no other inputs allocate to it.
+    isInReg = OpInfo.hasMatchingInput;
     break;
   case InlineAsm::isInput:
     isInReg = true;
@@ -4551,16 +4548,11 @@
   std::vector<unsigned> RegClassRegs;
   const TargetRegisterClass *RC = PhysReg.second;
   if (RC) {
-    // If this is an early clobber or tied register, our regalloc doesn't know
-    // how to maintain the constraint.  If it isn't, go ahead and create vreg
+    // If this is a tied register, our regalloc doesn't know how to maintain 
+    // the constraint.  If it isn't, go ahead and create vreg
     // and let the regalloc do the right thing.
-    if (!OpInfo.hasMatchingInput && !OpInfo.isEarlyClobber && 
-        // If there is some other early clobber and this is an input register,
-        // then we are forced to pre-allocate the input reg so it doesn't
-        // conflict with the earlyclobber.
-        !(OpInfo.Type == InlineAsm::isInput && HasEarlyClobber)) {
+    if (!OpInfo.hasMatchingInput) {
       RegVT = *PhysReg.second->vt_begin();
-      
       if (OpInfo.ConstraintVT == MVT::Other)
         ValueVT = RegVT;
 
@@ -4664,11 +4656,6 @@
   std::vector<InlineAsm::ConstraintInfo>
     ConstraintInfos = IA->ParseConstraints();
 
-  // SawEarlyClobber - Keep track of whether we saw an earlyclobber output
-  // constraint.  If so, we can't let the register allocator allocate any input
-  // registers, because it will not know to avoid the earlyclobbered output reg.
-  bool SawEarlyClobber = false;
-
   bool hasMemory = hasInlineAsmMemConstraint(ConstraintInfos, TLI);
   
   unsigned ArgNo = 0;   // ArgNo - The argument of the CallInst.
@@ -4744,24 +4731,6 @@
     // Compute the constraint code and ConstraintType to use.
     TLI.ComputeConstraintToUse(OpInfo, OpInfo.CallOperand, hasMemory, &DAG);
 
-    // Keep track of whether we see an earlyclobber.
-    SawEarlyClobber |= OpInfo.isEarlyClobber;
-    
-    // If we see a clobber of a register, it is an early clobber.
-    if (!SawEarlyClobber &&
-        OpInfo.Type == InlineAsm::isClobber &&
-        OpInfo.ConstraintType == TargetLowering::C_Register) {
-      // Note that we want to ignore things that we don't track here, like
-      // dirflag, fpsr, flags, etc.
-      std::pair<unsigned, const TargetRegisterClass*> PhysReg = 
-        TLI.getRegForInlineAsmConstraint(OpInfo.ConstraintCode,
-                                         OpInfo.ConstraintVT);
-      if (PhysReg.first || PhysReg.second) {
-        // This is a register we know of.
-        SawEarlyClobber = true;
-      }
-    }
-    
     // If this is a memory input, and if the operand is not indirect, do what we
     // need to to provide an address for the memory input.
     if (OpInfo.ConstraintType == TargetLowering::C_Memory &&
@@ -4802,7 +4771,7 @@
     // If this constraint is for a specific register, allocate it before
     // anything else.
     if (OpInfo.ConstraintType == TargetLowering::C_Register)
-      GetRegistersForValue(OpInfo, SawEarlyClobber, OutputRegs, InputRegs);
+      GetRegistersForValue(OpInfo, OutputRegs, InputRegs);
   }
   ConstraintInfos.clear();
   
@@ -4815,7 +4784,7 @@
     // C_Register operands have already been allocated, Other/Memory don't need
     // to be.
     if (OpInfo.ConstraintType == TargetLowering::C_RegisterClass)
-      GetRegistersForValue(OpInfo, SawEarlyClobber, OutputRegs, InputRegs);
+      GetRegistersForValue(OpInfo, OutputRegs, InputRegs);
   }    
   
   // AsmNodeOperands - The operands for the ISD::INLINEASM node.

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.h?rev=56592&r1=56591&r2=56592&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.h (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.h Wed Sep 24 18:13:09 2008
@@ -398,7 +398,7 @@
     N = NewN;
   }
   
-  void GetRegistersForValue(SDISelAsmOperandInfo &OpInfo, bool HasEarlyClobber,
+  void GetRegistersForValue(SDISelAsmOperandInfo &OpInfo,
                             std::set<unsigned> &OutputRegs, 
                             std::set<unsigned> &InputRegs);
 

Modified: llvm/trunk/test/CodeGen/PowerPC/2007-04-30-InlineAsmEarlyClobber.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/2007-04-30-InlineAsmEarlyClobber.ll?rev=56592&r1=56591&r2=56592&view=diff

==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/2007-04-30-InlineAsmEarlyClobber.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/2007-04-30-InlineAsmEarlyClobber.ll Wed Sep 24 18:13:09 2008
@@ -1,5 +1,8 @@
-; RUN: llvm-as < %s | llc | grep {subfc r2,r5,r4}
-; RUN: llvm-as < %s | llc | grep {subfze r4,r3}
+; RUN: llvm-as < %s | llc | grep {subfc r3,r5,r4}
+; RUN: llvm-as < %s | llc | grep {subfze r4,r2}
+; RUN: llvm-as < %s | llc -regalloc=local | grep {subfc r5,r2,r4}
+; RUN: llvm-as < %s | llc -regalloc=local | grep {subfze r2,r3}
+; The first argument of subfc must not be the same as any other register.
 
 ; PR1357
 

Modified: llvm/trunk/test/CodeGen/X86/2008-09-17-inline-asm-1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2008-09-17-inline-asm-1.ll?rev=56592&r1=56591&r2=56592&view=diff

==============================================================================
--- llvm/trunk/test/CodeGen/X86/2008-09-17-inline-asm-1.ll (original)
+++ llvm/trunk/test/CodeGen/X86/2008-09-17-inline-asm-1.ll Wed Sep 24 18:13:09 2008
@@ -2,6 +2,10 @@
 ; RUN: llvm-as < %s | llc -march=x86 | not grep "movl %edx, %edx"
 ; RUN: llvm-as < %s | llc -march=x86 | not grep "movl (%eax), %eax"
 ; RUN: llvm-as < %s | llc -march=x86 | not grep "movl (%edx), %edx"
+; RUN: llvm-as < %s | llc -march=x86 -regalloc=local | not grep "movl %eax, %eax"
+; RUN: llvm-as < %s | llc -march=x86 -regalloc=local | not grep "movl %edx, %edx"
+; RUN: llvm-as < %s | llc -march=x86 -regalloc=local | not grep "movl (%eax), %eax"
+; RUN: llvm-as < %s | llc -march=x86 -regalloc=local | not grep "movl (%edx), %edx"
 
 ; %0 must not be put in EAX or EDX.
 ; In the first asm, $0 and $2 must not be put in EAX.

Added: llvm/trunk/test/CodeGen/X86/2008-09-18-inline-asm-2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2008-09-18-inline-asm-2.ll?rev=56592&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/2008-09-18-inline-asm-2.ll (added)
+++ llvm/trunk/test/CodeGen/X86/2008-09-18-inline-asm-2.ll Wed Sep 24 18:13:09 2008
@@ -0,0 +1,26 @@
+; RUN: llvm-as < %s | llc -march=x86 | grep "#%ebp %eax %edx 8(%esi) %ebx (%edi)"
+; RUN: llvm-as < %s | llc -march=x86 -regalloc=local | grep "#%ecx %eax %edx 8(%edi) %ebx (%esi)"
+; The 1st, 2nd, 3rd and 5th registers above must all be different.  The registers
+; referenced in the 4th and 6th operands must not be the same as the 1st or 5th
+; operand.  There are many combinations that work; this is what llc puts out now.
+; ModuleID = '<stdin>'
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
+target triple = "i386-apple-darwin8"
+	%struct.foo = type { i32, i32, i8* }
+
+define i32 @get(%struct.foo* %c, i8* %state) nounwind {
+entry:
+	%0 = getelementptr %struct.foo* %c, i32 0, i32 0		; <i32*> [#uses=2]
+	%1 = getelementptr %struct.foo* %c, i32 0, i32 1		; <i32*> [#uses=2]
+	%2 = getelementptr %struct.foo* %c, i32 0, i32 2		; <i8**> [#uses=2]
+	%3 = load i32* %0, align 4		; <i32> [#uses=1]
+	%4 = load i32* %1, align 4		; <i32> [#uses=1]
+	%5 = load i8* %state, align 1		; <i8> [#uses=1]
+	%asmtmp = tail call { i32, i32, i32, i32 } asm sideeffect "#$0 $1 $2 $3 $4 $5", "=&r,=r,=r,=*m,=&q,=*imr,1,2,*m,5,~{dirflag},~{fpsr},~{flags},~{cx}"(i8** %2, i8* %state, i32 %3, i32 %4, i8** %2, i8 %5) nounwind		; <{ i32, i32, i32, i32 }> [#uses=3]
+	%asmresult = extractvalue { i32, i32, i32, i32 } %asmtmp, 0		; <i32> [#uses=1]
+	%asmresult1 = extractvalue { i32, i32, i32, i32 } %asmtmp, 1		; <i32> [#uses=1]
+	store i32 %asmresult1, i32* %0
+	%asmresult2 = extractvalue { i32, i32, i32, i32 } %asmtmp, 2		; <i32> [#uses=1]
+	store i32 %asmresult2, i32* %1
+	ret i32 %asmresult
+}




From evan.cheng at apple.com  Wed Sep 24 18:26:37 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Wed, 24 Sep 2008 23:26:37 -0000
Subject: [llvm-commits] [llvm] r56593 -
	/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
Message-ID: <200809242326.m8ONQb5T027716@zion.cs.uiuc.edu>

Author: evancheng
Date: Wed Sep 24 18:26:36 2008
New Revision: 56593

URL: http://llvm.org/viewvc/llvm-project?rev=56593&view=rev
Log:
X86ISD::VZEXT_LOAD should produce and fold a chain.

Modified:
    llvm/trunk/lib/Target/X86/X86ISelLowering.cpp

Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=56593&r1=56592&r2=56593&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Wed Sep 24 18:26:36 2008
@@ -5784,7 +5784,7 @@
   SDValue StackSlot = DAG.getFrameIndex(SSFI, getPointerTy());
 
   SDValue Chain = DAG.getNode(X86ISD::FNSTCW16m, MVT::Other,
-                                DAG.getEntryNode(), StackSlot);
+                              DAG.getEntryNode(), StackSlot);
 
   // Load FP Control Word from stack slot
   SDValue CWD = DAG.getLoad(MVT::i16, Chain, StackSlot, NULL, 0);
@@ -5893,10 +5893,10 @@
   SDValue cpIn = DAG.getCopyToReg(Op.getOperand(0), Reg,
                                     Op.getOperand(2), SDValue());
   SDValue Ops[] = { cpIn.getValue(0),
-                      Op.getOperand(1),
-                      Op.getOperand(3),
-                      DAG.getTargetConstant(size, MVT::i8),
-                      cpIn.getValue(1) };
+                    Op.getOperand(1),
+                    Op.getOperand(3),
+                    DAG.getTargetConstant(size, MVT::i8),
+                    cpIn.getValue(1) };
   SDVTList Tys = DAG.getVTList(MVT::Other, MVT::Flag);
   SDValue Result = DAG.getNode(X86ISD::LCMPXCHG_DAG, Tys, Ops, 5);
   SDValue cpOut = 
@@ -5927,8 +5927,8 @@
   swapInH = DAG.getCopyToReg(swapInL.getValue(0), X86::ECX,
                              swapInH, swapInL.getValue(1));
   SDValue Ops[] = { swapInH.getValue(0),
-                      Op->getOperand(1),
-                      swapInH.getValue(1)};
+                    Op->getOperand(1),
+                    swapInH.getValue(1) };
   SDVTList Tys = DAG.getVTList(MVT::Other, MVT::Flag);
   SDValue Result = DAG.getNode(X86ISD::LCMPXCHG8_DAG, Tys, Ops, 3);
   SDValue cpOutL = DAG.getCopyFromReg(Result.getValue(0), X86::EAX, MVT::i32, 
@@ -6775,8 +6775,8 @@
 
 /// PerformBuildVectorCombine - build_vector 0,(load i64 / f64) -> movq / movsd.
 static SDValue PerformBuildVectorCombine(SDNode *N, SelectionDAG &DAG,
-                                           const X86Subtarget *Subtarget,
-                                           const TargetLowering &TLI) {
+                                         const X86Subtarget *Subtarget,
+                                         const TargetLowering &TLI) {
   unsigned NumOps = N->getNumOperands();
 
   // Ignore single operand BUILD_VECTOR.
@@ -6812,7 +6812,11 @@
   if (LD->getExtensionType() != ISD::NON_EXTLOAD)
     return SDValue();
   
-  return DAG.getNode(X86ISD::VZEXT_LOAD, VT, LD->getChain(), LD->getBasePtr());
+  SDVTList Tys = DAG.getVTList(VT, MVT::Other);
+  SDValue Ops[] = { LD->getChain(), LD->getBasePtr() };
+  SDValue ResNode = DAG.getNode(X86ISD::VZEXT_LOAD, Tys, Ops, 2);
+  DAG.ReplaceAllUsesOfValueWith(SDValue(Base, 1), ResNode.getValue(1));
+  return ResNode;
 }                                           
 
 /// PerformSELECTCombine - Do target-specific dag combines on SELECT nodes.




From evan.cheng at apple.com  Wed Sep 24 18:27:55 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Wed, 24 Sep 2008 23:27:55 -0000
Subject: [llvm-commits] [llvm] r56594 - in /llvm/trunk:
 lib/Target/X86/X86InstrInfo.td lib/Target/X86/X86InstrSSE.td
 test/CodeGen/X86/sse41-pmovx.ll
Message-ID: <200809242327.m8ONRuXV027804@zion.cs.uiuc.edu>

Author: evancheng
Date: Wed Sep 24 18:27:55 2008
New Revision: 56594

URL: http://llvm.org/viewvc/llvm-project?rev=56594&view=rev
Log:
Fix patterns for SSE4.1 move and sign extend instructions. Also add instructions which fold VZEXT_MOVL and VZEXT_LOAD.

Added:
    llvm/trunk/test/CodeGen/X86/sse41-pmovx.ll
Modified:
    llvm/trunk/lib/Target/X86/X86InstrInfo.td
    llvm/trunk/lib/Target/X86/X86InstrSSE.td

Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.td?rev=56594&r1=56593&r2=56594&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86InstrInfo.td (original)
+++ llvm/trunk/lib/Target/X86/X86InstrInfo.td Wed Sep 24 18:27:55 2008
@@ -243,6 +243,16 @@
   return false;
 }]>;
 
+def loadi16_anyext : PatFrag<(ops node:$ptr), (i32 (ld node:$ptr)), [{
+  LoadSDNode *LD = cast<LoadSDNode>(N);
+  if (LD->getAddressingMode() != ISD::UNINDEXED)
+    return false;
+  ISD::LoadExtType ExtType = LD->getExtensionType();
+  if (ExtType == ISD::EXTLOAD)
+    return LD->getAlignment() >= 2 && !LD->isVolatile();
+  return false;
+}]>;
+
 def loadi32 : PatFrag<(ops node:$ptr), (i32 (ld node:$ptr)), [{
   LoadSDNode *LD = cast<LoadSDNode>(N);
   if (LD->getAddressingMode() != ISD::UNINDEXED)

Modified: llvm/trunk/lib/Target/X86/X86InstrSSE.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrSSE.td?rev=56594&r1=56593&r2=56594&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86InstrSSE.td (original)
+++ llvm/trunk/lib/Target/X86/X86InstrSSE.td Wed Sep 24 18:27:55 2008
@@ -162,6 +162,17 @@
 def bc_v4i32 : PatFrag<(ops node:$in), (v4i32 (bitconvert node:$in))>;
 def bc_v2i64 : PatFrag<(ops node:$in), (v2i64 (bitconvert node:$in))>;
 
+def vzmovl_v2i64 : PatFrag<(ops node:$src),
+                           (bitconvert (v2i64 (X86vzmovl
+                             (v2i64 (scalar_to_vector (loadi64 node:$src))))))>;
+def vzmovl_v4i32 : PatFrag<(ops node:$src),
+                           (bitconvert (v4i32 (X86vzmovl
+                             (v4i32 (scalar_to_vector (loadi32 node:$src))))))>;
+
+def vzload_v2i64 : PatFrag<(ops node:$src),
+                           (bitconvert (v2i64 (X86vzload node:$src)))>;
+
+
 def fp32imm0 : PatLeaf<(f32 fpimm), [{
   return N->isExactlyValue(+0.0);
 }]>;
@@ -3368,8 +3379,9 @@
 
   def rm : SS48I<opc, MRMSrcMem, (outs VR128:$dst), (ins i64mem:$src),
                  !strconcat(OpcodeStr, "\t{$src, $dst|$dst, $src}"),
-                 [(set VR128:$dst,
-                   (IntId (bitconvert (v4i32 (load addr:$src)))))]>, OpSize;
+       [(set VR128:$dst,
+         (IntId (bitconvert (v2i64 (scalar_to_vector (loadi64 addr:$src))))))]>,
+       OpSize;
 }
 
 defm PMOVSXBW   : SS41I_binop_rm_int8<0x20, "pmovsxbw", int_x86_sse41_pmovsxbw>;
@@ -3379,6 +3391,38 @@
 defm PMOVZXWD   : SS41I_binop_rm_int8<0x33, "pmovzxwd", int_x86_sse41_pmovzxwd>;
 defm PMOVZXDQ   : SS41I_binop_rm_int8<0x35, "pmovzxdq", int_x86_sse41_pmovzxdq>;
 
+// Common patterns involving scalar load.
+def : Pat<(int_x86_sse41_pmovsxbw (vzmovl_v2i64 addr:$src)),
+          (PMOVSXBWrm addr:$src)>, Requires<[HasSSE41]>;
+def : Pat<(int_x86_sse41_pmovsxbw (vzload_v2i64 addr:$src)),
+          (PMOVSXBWrm addr:$src)>, Requires<[HasSSE41]>;
+
+def : Pat<(int_x86_sse41_pmovsxwd (vzmovl_v2i64 addr:$src)),
+          (PMOVSXWDrm addr:$src)>, Requires<[HasSSE41]>;
+def : Pat<(int_x86_sse41_pmovsxwd (vzload_v2i64 addr:$src)),
+          (PMOVSXWDrm addr:$src)>, Requires<[HasSSE41]>;
+
+def : Pat<(int_x86_sse41_pmovsxdq (vzmovl_v2i64 addr:$src)),
+          (PMOVSXDQrm addr:$src)>, Requires<[HasSSE41]>;
+def : Pat<(int_x86_sse41_pmovsxdq (vzload_v2i64 addr:$src)),
+          (PMOVSXDQrm addr:$src)>, Requires<[HasSSE41]>;
+
+def : Pat<(int_x86_sse41_pmovzxbw (vzmovl_v2i64 addr:$src)),
+          (PMOVZXBWrm addr:$src)>, Requires<[HasSSE41]>;
+def : Pat<(int_x86_sse41_pmovzxbw (vzload_v2i64 addr:$src)),
+          (PMOVZXBWrm addr:$src)>, Requires<[HasSSE41]>;
+
+def : Pat<(int_x86_sse41_pmovzxwd (vzmovl_v2i64 addr:$src)),
+          (PMOVZXWDrm addr:$src)>, Requires<[HasSSE41]>;
+def : Pat<(int_x86_sse41_pmovzxwd (vzload_v2i64 addr:$src)),
+          (PMOVZXWDrm addr:$src)>, Requires<[HasSSE41]>;
+
+def : Pat<(int_x86_sse41_pmovzxdq (vzmovl_v2i64 addr:$src)),
+          (PMOVZXDQrm addr:$src)>, Requires<[HasSSE41]>;
+def : Pat<(int_x86_sse41_pmovzxdq (vzload_v2i64 addr:$src)),
+          (PMOVZXDQrm addr:$src)>, Requires<[HasSSE41]>;
+
+
 multiclass SS41I_binop_rm_int4<bits<8> opc, string OpcodeStr, Intrinsic IntId> {
   def rr : SS48I<opc, MRMSrcReg, (outs VR128:$dst), (ins VR128:$src),
                  !strconcat(OpcodeStr, "\t{$src, $dst|$dst, $src}"),
@@ -3386,8 +3430,9 @@
 
   def rm : SS48I<opc, MRMSrcMem, (outs VR128:$dst), (ins i32mem:$src),
                  !strconcat(OpcodeStr, "\t{$src, $dst|$dst, $src}"),
-                 [(set VR128:$dst,
-                   (IntId (bitconvert (v4i32 (load addr:$src)))))]>, OpSize;
+       [(set VR128:$dst,
+         (IntId (bitconvert (v4i32 (scalar_to_vector (loadi32 addr:$src))))))]>,
+          OpSize;
 }
 
 defm PMOVSXBD   : SS41I_binop_rm_int4<0x21, "pmovsxbd", int_x86_sse41_pmovsxbd>;
@@ -3395,20 +3440,45 @@
 defm PMOVZXBD   : SS41I_binop_rm_int4<0x31, "pmovzxbd", int_x86_sse41_pmovzxbd>;
 defm PMOVZXWQ   : SS41I_binop_rm_int4<0x34, "pmovzxwq", int_x86_sse41_pmovzxwq>;
 
+// Common patterns involving scalar load
+def : Pat<(int_x86_sse41_pmovsxbd (vzmovl_v4i32 addr:$src)),
+          (PMOVSXBDrm addr:$src)>;
+def : Pat<(int_x86_sse41_pmovsxwq (vzmovl_v4i32 addr:$src)),
+          (PMOVSXWQrm addr:$src)>;
+
+def : Pat<(int_x86_sse41_pmovzxbd (vzmovl_v4i32 addr:$src)),
+          (PMOVZXBDrm addr:$src)>;
+def : Pat<(int_x86_sse41_pmovzxwq (vzmovl_v4i32 addr:$src)),
+          (PMOVZXWQrm addr:$src)>;
+
+
 multiclass SS41I_binop_rm_int2<bits<8> opc, string OpcodeStr, Intrinsic IntId> {
   def rr : SS48I<opc, MRMSrcReg, (outs VR128:$dst), (ins VR128:$src),
                  !strconcat(OpcodeStr, "\t{$src, $dst|$dst, $src}"),
                  [(set VR128:$dst, (IntId VR128:$src))]>, OpSize;
 
+  // Expecting a i16 load any extended to i32 value.
   def rm : SS48I<opc, MRMSrcMem, (outs VR128:$dst), (ins i16mem:$src),
                  !strconcat(OpcodeStr, "\t{$src, $dst|$dst, $src}"),
-                 [(set VR128:$dst, 
-                   (IntId (bitconvert (v4i32 (load addr:$src)))))]>, OpSize;
+                 [(set VR128:$dst, (IntId (bitconvert
+                     (v4i32 (scalar_to_vector (loadi16_anyext addr:$src))))))]>,
+                 OpSize;
 }
 
 defm PMOVSXBQ   : SS41I_binop_rm_int2<0x22, "pmovsxbq", int_x86_sse41_pmovsxbq>;
 defm PMOVZXBQ   : SS41I_binop_rm_int2<0x32, "pmovsxbq", int_x86_sse41_pmovzxbq>;
 
+// Common patterns involving scalar load
+def : Pat<(int_x86_sse41_pmovsxbq
+            (bitconvert (v4i32 (X86vzmovl
+                             (v4i32 (scalar_to_vector (loadi32 addr:$src))))))),
+          (PMOVSXBQrm addr:$src)>;
+
+def : Pat<(int_x86_sse41_pmovzxbq
+            (bitconvert (v4i32 (X86vzmovl
+                             (v4i32 (scalar_to_vector (loadi32 addr:$src))))))),
+          (PMOVZXBQrm addr:$src)>;
+
 
 /// SS41I_binop_ext8 - SSE 4.1 extract 8 bits to 32 bit reg or 8 bit mem
 multiclass SS41I_extract8<bits<8> opc, string OpcodeStr> {

Added: llvm/trunk/test/CodeGen/X86/sse41-pmovx.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/sse41-pmovx.ll?rev=56594&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/sse41-pmovx.ll (added)
+++ llvm/trunk/test/CodeGen/X86/sse41-pmovx.ll Wed Sep 24 18:27:55 2008
@@ -0,0 +1,47 @@
+; RUN: llvm-as < %s | llc -march=x86    -mattr=sse41 | not grep movd
+; RUN: llvm-as < %s | llc -march=x86    -mattr=sse41 | not grep movq
+; RUN: llvm-as < %s | llc -march=x86    -mattr=sse41 | grep pmovsxbd
+; RUN: llvm-as < %s | llc -march=x86    -mattr=sse41 | grep pmovsxwd
+; RUN: llvm-as < %s | llc -march=x86    -mattr=sse41 | grep pmovsxbq
+; RUN: llvm-as < %s | llc -march=x86-64 -mattr=sse41 | grep movq | count 1
+
+define <2 x i64> @t1(i32* %p) nounwind {
+entry:
+	%0 = load i32* %p, align 4		; <i32> [#uses=1]
+	%1 = insertelement <4 x i32> undef, i32 %0, i32 0		; <<4 x i32>> [#uses=1]
+	%2 = insertelement <4 x i32> %1, i32 0, i32 1		; <<4 x i32>> [#uses=1]
+	%3 = insertelement <4 x i32> %2, i32 0, i32 2		; <<4 x i32>> [#uses=1]
+	%4 = insertelement <4 x i32> %3, i32 0, i32 3		; <<4 x i32>> [#uses=1]
+	%5 = bitcast <4 x i32> %4 to <16 x i8>		; <<16 x i8>> [#uses=1]
+	%6 = tail call <4 x i32> @llvm.x86.sse41.pmovsxbd(<16 x i8> %5) nounwind readnone		; <<4 x i32>> [#uses=1]
+	%7 = bitcast <4 x i32> %6 to <2 x i64>		; <<2 x i64>> [#uses=1]
+	ret <2 x i64> %7
+}
+
+declare <4 x i32> @llvm.x86.sse41.pmovsxbd(<16 x i8>) nounwind readnone
+
+define <2 x i64> @t2(i64* %p) nounwind readonly {
+entry:
+	%0 = load i64* %p		; <i64> [#uses=1]
+	%tmp2 = insertelement <2 x i64> zeroinitializer, i64 %0, i32 0		; <<2 x i64>> [#uses=1]
+	%1 = bitcast <2 x i64> %tmp2 to <8 x i16>		; <<8 x i16>> [#uses=1]
+	%2 = tail call <4 x i32> @llvm.x86.sse41.pmovsxwd(<8 x i16> %1) nounwind readnone		; <<4 x i32>> [#uses=1]
+	%3 = bitcast <4 x i32> %2 to <2 x i64>		; <<2 x i64>> [#uses=1]
+	ret <2 x i64> %3
+}
+
+declare <4 x i32> @llvm.x86.sse41.pmovsxwd(<8 x i16>) nounwind readnone
+
+
+ at gv = external global i16		; <i16*> [#uses=1]
+
+define <2 x i64> @t3() nounwind {
+entry:
+	%0 = load i16* @gv, align 2		; <i16> [#uses=1]
+	%1 = insertelement <8 x i16> undef, i16 %0, i32 0		; <<8 x i16>> [#uses=1]
+	%2 = bitcast <8 x i16> %1 to <16 x i8>		; <<16 x i8>> [#uses=1]
+	%3 = tail call <2 x i64> @llvm.x86.sse41.pmovzxbq(<16 x i8> %2) nounwind readnone		; <<2 x i64>> [#uses=1]
+	ret <2 x i64> %3
+}
+
+declare <2 x i64> @llvm.x86.sse41.pmovzxbq(<16 x i8>) nounwind readnone




From gohman at apple.com  Wed Sep 24 18:44:12 2008
From: gohman at apple.com (Dan Gohman)
Date: Wed, 24 Sep 2008 23:44:12 -0000
Subject: [llvm-commits] [llvm] r56596 -
	/llvm/trunk/lib/CodeGen/LowerSubregs.cpp
Message-ID: <200809242344.m8ONiCm5028276@zion.cs.uiuc.edu>

Author: djg
Date: Wed Sep 24 18:44:12 2008
New Revision: 56596

URL: http://llvm.org/viewvc/llvm-project?rev=56596&view=rev
Log:
Give LowerSubregs.cpp a top-level description.

Modified:
    llvm/trunk/lib/CodeGen/LowerSubregs.cpp

Modified: llvm/trunk/lib/CodeGen/LowerSubregs.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LowerSubregs.cpp?rev=56596&r1=56595&r2=56596&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/LowerSubregs.cpp (original)
+++ llvm/trunk/lib/CodeGen/LowerSubregs.cpp Wed Sep 24 18:44:12 2008
@@ -6,6 +6,13 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// This file defines a MachineFunction pass which runs after register
+// allocation that turns subreg insert/extract instructions into register
+// copies, as needed. This ensures correct codegen even if the coalescer
+// isn't able to remove all subreg instructions.
+//
+//===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "lowersubregs"
 #include "llvm/CodeGen/Passes.h"




From evan.cheng at apple.com  Wed Sep 24 19:14:05 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Thu, 25 Sep 2008 00:14:05 -0000
Subject: [llvm-commits] [llvm] r56597 -
	/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
Message-ID: <200809250014.m8P0E5OM029179@zion.cs.uiuc.edu>

Author: evancheng
Date: Wed Sep 24 19:14:04 2008
New Revision: 56597

URL: http://llvm.org/viewvc/llvm-project?rev=56597&view=rev
Log:
<rdar://problem/6234798> Assertion failed: (!OpInfo.AssignedRegs.Regs.empty() && "Couldn't allocate input reg!")

Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Wed Sep 24 19:14:04 2008
@@ -4940,8 +4940,11 @@
              "Don't know how to handle indirect register inputs yet!");
 
       // Copy the input into the appropriate registers.
-      assert(!OpInfo.AssignedRegs.Regs.empty() &&
-             "Couldn't allocate input reg!");
+      if (OpInfo.AssignedRegs.Regs.empty()) {
+        cerr << "Couldn't allocate output reg for constraint '"
+             << OpInfo.ConstraintCode << "'!\n";
+        exit(1);
+      }
 
       OpInfo.AssignedRegs.getCopyToRegs(InOperandVal, DAG, Chain, &Flag);
       




From evan.cheng at apple.com  Wed Sep 24 19:15:01 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Wed, 24 Sep 2008 17:15:01 -0700
Subject: [llvm-commits] [llvm] r56597 -
	/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
In-Reply-To: <200809250014.m8P0E5OM029179@zion.cs.uiuc.edu>
References: <200809250014.m8P0E5OM029179@zion.cs.uiuc.edu>
Message-ID: <16531E62-E575-4951-902A-2E7DA1459362@apple.com>

Oops. Copy and paste error. This should have said:
If target cannot find a register for the inline asm constraint, output  
an error message instead of asserting.

Evan
On Sep 24, 2008, at 5:14 PM, Evan Cheng wrote:

> Author: evancheng
> Date: Wed Sep 24 19:14:04 2008
> New Revision: 56597
>
> URL: http://llvm.org/viewvc/llvm-project?rev=56597&view=rev
> Log:
> <rdar://problem/6234798> Assertion failed: (! 
> OpInfo.AssignedRegs.Regs.empty() && "Couldn't allocate input reg!")
>
> Modified:
>    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
>
> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp?rev=56597&r1=56596&r2=56597&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp  
> (original)
> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Wed  
> Sep 24 19:14:04 2008
> @@ -4940,8 +4940,11 @@
>              "Don't know how to handle indirect register inputs  
> yet!");
>
>       // Copy the input into the appropriate registers.
> -      assert(!OpInfo.AssignedRegs.Regs.empty() &&
> -             "Couldn't allocate input reg!");
> +      if (OpInfo.AssignedRegs.Regs.empty()) {
> +        cerr << "Couldn't allocate output reg for constraint '"
> +             << OpInfo.ConstraintCode << "'!\n";
> +        exit(1);
> +      }
>
>       OpInfo.AssignedRegs.getCopyToRegs(InOperandVal, DAG, Chain,  
> &Flag);
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From gohman at apple.com  Wed Sep 24 19:37:07 2008
From: gohman at apple.com (Dan Gohman)
Date: Thu, 25 Sep 2008 00:37:07 -0000
Subject: [llvm-commits] [llvm] r56599 - in /llvm/trunk:
 include/llvm/Target/TargetMachine.h lib/CodeGen/LLVMTargetMachine.cpp
Message-ID: <200809250037.m8P0b8OC029956@zion.cs.uiuc.edu>

Author: djg
Date: Wed Sep 24 19:37:07 2008
New Revision: 56599

URL: http://llvm.org/viewvc/llvm-project?rev=56599&view=rev
Log:
Refactor the code that adds standard LLVM codegen passes into
a separate function, eliminating duplication between the
add-passes-for-file and add-passes-for-machine-code code.

Modified:
    llvm/trunk/include/llvm/Target/TargetMachine.h
    llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp

Modified: llvm/trunk/include/llvm/Target/TargetMachine.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetMachine.h?rev=56599&r1=56598&r2=56599&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/TargetMachine.h (original)
+++ llvm/trunk/include/llvm/Target/TargetMachine.h Wed Sep 24 19:37:07 2008
@@ -239,7 +239,13 @@
 ///
 class LLVMTargetMachine : public TargetMachine {
 protected: // Can only create subclasses.
-    LLVMTargetMachine() { }
+  LLVMTargetMachine() { }
+
+  /// addCommonCodeGenPasses - Add standard LLVM codegen passes used for
+  /// both emitting to assembly files or machine code output.
+  ///
+  bool addCommonCodeGenPasses(PassManagerBase &, bool /*Fast*/);
+
 public:
   
   /// addPassesToEmitFile - Add passes to the specified pass manager to get the

Modified: llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp?rev=56599&r1=56598&r2=56599&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp (original)
+++ llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp Wed Sep 24 19:37:07 2008
@@ -54,92 +54,14 @@
                                        raw_ostream &Out,
                                        CodeGenFileType FileType,
                                        bool Fast) {
-  // Standard LLVM-Level Passes.
-  
-  // Run loop strength reduction before anything else.
-  if (!Fast) {
-    PM.add(createLoopStrengthReducePass(getTargetLowering()));
-    if (PrintLSR)
-      PM.add(new PrintFunctionPass("\n\n*** Code after LSR ***\n", &cerr));
-  }
-  
-  PM.add(createGCLoweringPass());
-
-  if (!getTargetAsmInfo()->doesSupportExceptionHandling())
-    PM.add(createLowerInvokePass(getTargetLowering()));
-
-  // Make sure that no unreachable blocks are instruction selected.
-  PM.add(createUnreachableBlockEliminationPass());
-
-  if (!Fast)
-    PM.add(createCodeGenPreparePass(getTargetLowering()));
-
-  if (PrintISelInput)
-    PM.add(new PrintFunctionPass("\n\n*** Final LLVM Code input to ISel ***\n",
-                                 &cerr));
-  
-  // Ask the target for an isel.
-  if (addInstSelector(PM, Fast))
+  // Add common CodeGen passes.
+  if (addCommonCodeGenPasses(PM, Fast))
     return FileModel::Error;
 
-  // Print the instruction selected machine code...
-  if (PrintMachineCode)
-    PM.add(createMachineFunctionPrinterPass(cerr));
-
-  if (EnableLICM)
-    PM.add(createMachineLICMPass());
-  
-  if (EnableSinking)
-    PM.add(createMachineSinkingPass());
-
-  // Run pre-ra passes.
-  if (addPreRegAlloc(PM, Fast) && PrintMachineCode)
-    PM.add(createMachineFunctionPrinterPass(cerr));
-
-  // Perform register allocation to convert to a concrete x86 representation
-  PM.add(createRegisterAllocator());
-  
-  // Perform stack slot coloring.
-  if (!Fast)
-    PM.add(createStackSlotColoringPass());
-
-  if (PrintMachineCode)  // Print the register-allocated code
-    PM.add(createMachineFunctionPrinterPass(cerr));
-  
-  // Run post-ra passes.
-  if (addPostRegAlloc(PM, Fast) && PrintMachineCode)
-    PM.add(createMachineFunctionPrinterPass(cerr));
-
-  PM.add(createLowerSubregsPass());
-  
-  if (PrintMachineCode)  // Print the subreg lowered code
-    PM.add(createMachineFunctionPrinterPass(cerr));
-
-  // Insert prolog/epilog code.  Eliminate abstract frame index references...
-  PM.add(createPrologEpilogCodeInserter());
-  
-  if (PrintMachineCode)
-    PM.add(createMachineFunctionPrinterPass(cerr));
-  
-  // Second pass scheduler.
-  if (!Fast && !DisablePostRAScheduler)
-    PM.add(createPostRAScheduler());
-
-  // Branch folding must be run after regalloc and prolog/epilog insertion.
-  if (!Fast)
-    PM.add(createBranchFoldingPass(getEnableTailMergeDefault()));
-
-  PM.add(createGCMachineCodeAnalysisPass());
-  if (PrintMachineCode)
-    PM.add(createMachineFunctionPrinterPass(cerr));
-  
-  if (PrintGCInfo)
-    PM.add(createGCInfoPrinter(*cerr));
-  
   // Fold redundant debug labels.
   PM.add(createDebugLabelFoldingPass());
-  
-  if (PrintMachineCode)  // Print the register-allocated code
+
+  if (PrintMachineCode)
     PM.add(createMachineFunctionPrinterPass(cerr));
 
   if (addPreEmitPass(PM, Fast) && PrintMachineCode)
@@ -164,7 +86,7 @@
 
   return FileModel::Error;
 }
- 
+
 /// addPassesToEmitFileFinish - If the passes to emit the specified file had to
 /// be split up (e.g., to add an object writer pass), this method can be used to
 /// finish up adding passes to emit the file, if necessary.
@@ -173,7 +95,7 @@
                                                   bool Fast) {
   if (MCE)
     addSimpleCodeEmitter(PM, Fast, PrintEmittedAsm, *MCE);
-    
+
   PM.add(createGCInfoDeleter());
 
   // Delete machine code for this function
@@ -191,20 +113,41 @@
 bool LLVMTargetMachine::addPassesToEmitMachineCode(PassManagerBase &PM,
                                                    MachineCodeEmitter &MCE,
                                                    bool Fast) {
+  // Add common CodeGen passes.
+  if (addCommonCodeGenPasses(PM, Fast))
+    return true;
+
+  if (addPreEmitPass(PM, Fast) && PrintMachineCode)
+    PM.add(createMachineFunctionPrinterPass(cerr));
+
+  addCodeEmitter(PM, Fast, PrintEmittedAsm, MCE);
+
+  PM.add(createGCInfoDeleter());
+
+  // Delete machine code for this function
+  PM.add(createMachineCodeDeleter());
+
+  return false; // success!
+}
+
+/// addCommonCodeGenPasses - Add standard LLVM codegen passes used for
+/// both emitting to assembly files or machine code output.
+///
+bool LLVMTargetMachine::addCommonCodeGenPasses(PassManagerBase &PM, bool Fast) {
   // Standard LLVM-Level Passes.
-  
+
   // Run loop strength reduction before anything else.
   if (!Fast) {
     PM.add(createLoopStrengthReducePass(getTargetLowering()));
     if (PrintLSR)
       PM.add(new PrintFunctionPass("\n\n*** Code after LSR ***\n", &cerr));
   }
-  
+
   PM.add(createGCLoweringPass());
-  
+
   if (!getTargetAsmInfo()->doesSupportExceptionHandling())
     PM.add(createLowerInvokePass(getTargetLowering()));
-  
+
   // Make sure that no unreachable blocks are instruction selected.
   PM.add(createUnreachableBlockEliminationPass());
 
@@ -215,6 +158,8 @@
     PM.add(new PrintFunctionPass("\n\n*** Final LLVM Code input to ISel ***\n",
                                  &cerr));
 
+  // Standard Lower-Level Passes.
+
   // Ask the target for an isel.
   if (addInstSelector(PM, Fast))
     return true;
@@ -225,7 +170,7 @@
 
   if (EnableLICM)
     PM.add(createMachineLICMPass());
-  
+
   if (EnableSinking)
     PM.add(createMachineSinkingPass());
 
@@ -240,29 +185,29 @@
   if (!Fast)
     PM.add(createStackSlotColoringPass());
 
-  if (PrintMachineCode)
+  if (PrintMachineCode)  // Print the register-allocated code
     PM.add(createMachineFunctionPrinterPass(cerr));
-    
+
   // Run post-ra passes.
   if (addPostRegAlloc(PM, Fast) && PrintMachineCode)
     PM.add(createMachineFunctionPrinterPass(cerr));
 
-  if (PrintMachineCode)  // Print the register-allocated code
+  if (PrintMachineCode)
     PM.add(createMachineFunctionPrinterPass(cerr));
-  
+
   PM.add(createLowerSubregsPass());
-  
+
   if (PrintMachineCode)  // Print the subreg lowered code
     PM.add(createMachineFunctionPrinterPass(cerr));
 
   // Insert prolog/epilog code.  Eliminate abstract frame index references...
   PM.add(createPrologEpilogCodeInserter());
-  
+
   if (PrintMachineCode)
     PM.add(createMachineFunctionPrinterPass(cerr));
-  
+
   // Second pass scheduler.
-  if (!Fast)
+  if (!Fast && !DisablePostRAScheduler)
     PM.add(createPostRAScheduler());
 
   // Branch folding must be run after regalloc and prolog/epilog insertion.
@@ -273,19 +218,9 @@
 
   if (PrintMachineCode)
     PM.add(createMachineFunctionPrinterPass(cerr));
-  
+
   if (PrintGCInfo)
     PM.add(createGCInfoPrinter(*cerr));
-  
-  if (addPreEmitPass(PM, Fast) && PrintMachineCode)
-    PM.add(createMachineFunctionPrinterPass(cerr));
 
-  addCodeEmitter(PM, Fast, PrintEmittedAsm, MCE);
-  
-  PM.add(createGCInfoDeleter());
-  
-  // Delete machine code for this function
-  PM.add(createMachineCodeDeleter());
-  
-  return false; // success!
+  return false;
 }




From evan.cheng at apple.com  Wed Sep 24 19:49:51 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Thu, 25 Sep 2008 00:49:51 -0000
Subject: [llvm-commits] [llvm] r56600 -
	/llvm/trunk/lib/Target/X86/X86InstrSSE.td
Message-ID: <200809250049.m8P0nqs7030352@zion.cs.uiuc.edu>

Author: evancheng
Date: Wed Sep 24 19:49:51 2008
New Revision: 56600

URL: http://llvm.org/viewvc/llvm-project?rev=56600&view=rev
Log:
pmovsxbq etc. requires sse4.1.

Modified:
    llvm/trunk/lib/Target/X86/X86InstrSSE.td

Modified: llvm/trunk/lib/Target/X86/X86InstrSSE.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrSSE.td?rev=56600&r1=56599&r2=56600&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86InstrSSE.td (original)
+++ llvm/trunk/lib/Target/X86/X86InstrSSE.td Wed Sep 24 19:49:51 2008
@@ -3442,14 +3442,14 @@
 
 // Common patterns involving scalar load
 def : Pat<(int_x86_sse41_pmovsxbd (vzmovl_v4i32 addr:$src)),
-          (PMOVSXBDrm addr:$src)>;
+          (PMOVSXBDrm addr:$src)>, Requires<[HasSSE41]>;
 def : Pat<(int_x86_sse41_pmovsxwq (vzmovl_v4i32 addr:$src)),
-          (PMOVSXWQrm addr:$src)>;
+          (PMOVSXWQrm addr:$src)>, Requires<[HasSSE41]>;
 
 def : Pat<(int_x86_sse41_pmovzxbd (vzmovl_v4i32 addr:$src)),
-          (PMOVZXBDrm addr:$src)>;
+          (PMOVZXBDrm addr:$src)>, Requires<[HasSSE41]>;
 def : Pat<(int_x86_sse41_pmovzxwq (vzmovl_v4i32 addr:$src)),
-          (PMOVZXWQrm addr:$src)>;
+          (PMOVZXWQrm addr:$src)>, Requires<[HasSSE41]>;
 
 
 multiclass SS41I_binop_rm_int2<bits<8> opc, string OpcodeStr, Intrinsic IntId> {
@@ -3472,12 +3472,12 @@
 def : Pat<(int_x86_sse41_pmovsxbq
             (bitconvert (v4i32 (X86vzmovl
                              (v4i32 (scalar_to_vector (loadi32 addr:$src))))))),
-          (PMOVSXBQrm addr:$src)>;
+          (PMOVSXBQrm addr:$src)>, Requires<[HasSSE41]>;
 
 def : Pat<(int_x86_sse41_pmovzxbq
             (bitconvert (v4i32 (X86vzmovl
                              (v4i32 (scalar_to_vector (loadi32 addr:$src))))))),
-          (PMOVZXBQrm addr:$src)>;
+          (PMOVZXBQrm addr:$src)>, Requires<[HasSSE41]>;
 
 
 /// SS41I_binop_ext8 - SSE 4.1 extract 8 bits to 32 bit reg or 8 bit mem




From gohman at apple.com  Wed Sep 24 20:06:54 2008
From: gohman at apple.com (Dan Gohman)
Date: Thu, 25 Sep 2008 01:06:54 -0000
Subject: [llvm-commits] [llvm] r56602 -
	/llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp
Message-ID: <200809250106.m8P16t5Y030821@zion.cs.uiuc.edu>

Author: djg
Date: Wed Sep 24 20:06:50 2008
New Revision: 56602

URL: http://llvm.org/viewvc/llvm-project?rev=56602&view=rev
Log:
Add debug output to this pass.

Modified:
    llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp

Modified: llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp?rev=56602&r1=56601&r2=56602&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp (original)
+++ llvm/trunk/lib/CodeGen/DeadMachineInstructionElim.cpp Wed Sep 24 20:06:50 2008
@@ -16,6 +16,7 @@
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineRegisterInfo.h"
 #include "llvm/Support/Compiler.h"
+#include "llvm/Support/Debug.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
 using namespace llvm;
@@ -109,6 +110,7 @@
 
       // If the instruction is dead, delete it!
       if (isDead(MI)) {
+        DOUT << "DeadMachineInstructionElim: DELETING: " << *MI;
         AnyChanges = true;
         MI->eraseFromParent();
         MIE = MBB->rend();




From gohman at apple.com  Wed Sep 24 20:14:53 2008
From: gohman at apple.com (Dan Gohman)
Date: Thu, 25 Sep 2008 01:14:53 -0000
Subject: [llvm-commits] [llvm] r56604 - in /llvm/trunk:
 include/llvm/Target/TargetOptions.h lib/CodeGen/LLVMTargetMachine.cpp
 lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
Message-ID: <200809250114.m8P1Esnn001237@zion.cs.uiuc.edu>

Author: djg
Date: Wed Sep 24 20:14:49 2008
New Revision: 56604

URL: http://llvm.org/viewvc/llvm-project?rev=56604&view=rev
Log:
Enable DeadMachineInstructionElim when Fast-ISel is enabled.

Modified:
    llvm/trunk/include/llvm/Target/TargetOptions.h
    llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp

Modified: llvm/trunk/include/llvm/Target/TargetOptions.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetOptions.h?rev=56604&r1=56603&r2=56604&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/TargetOptions.h (original)
+++ llvm/trunk/include/llvm/Target/TargetOptions.h Wed Sep 24 20:14:49 2008
@@ -101,6 +101,12 @@
   /// DisableJumpTables - This flag indicates jump tables should not be 
   /// generated.
   extern bool DisableJumpTables;
+
+  /// FastISel - This flag enables fast-path instruction selection
+  /// which trades away generated code quality in favor of reducing
+  /// compile time.
+  extern bool EnableFastISel;
+
 } // End llvm namespace
 
 #endif

Modified: llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp?rev=56604&r1=56603&r2=56604&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp (original)
+++ llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp Wed Sep 24 20:14:49 2008
@@ -25,6 +25,10 @@
 #include "llvm/Support/raw_ostream.h"
 using namespace llvm;
 
+namespace llvm {
+  bool EnableFastISel;
+}
+
 static cl::opt<bool> PrintLSR("print-lsr-output", cl::Hidden,
     cl::desc("Print LLVM IR produced by the loop-reduce pass"));
 static cl::opt<bool> PrintISelInput("print-isel-input", cl::Hidden,
@@ -49,6 +53,11 @@
                        cl::desc("Disable scheduling after register allocation"),
                        cl::init(true));
 
+static cl::opt<bool, true>
+FastISelOption("fast-isel", cl::Hidden,
+               cl::desc("Enable the experimental \"fast\" instruction selector"),
+               cl::location(EnableFastISel));
+
 FileModel::Model
 LLVMTargetMachine::addPassesToEmitFile(PassManagerBase &PM,
                                        raw_ostream &Out,
@@ -168,6 +177,10 @@
   if (PrintMachineCode)
     PM.add(createMachineFunctionPrinterPass(cerr));
 
+  // If we're using Fast-ISel, clean up the mess.
+  if (EnableFastISel)
+    PM.add(createDeadMachineInstructionElimPass());
+
   if (EnableLICM)
     PM.add(createMachineLICMPass());
 

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Wed Sep 24 20:14:49 2008
@@ -56,9 +56,6 @@
 static cl::opt<bool>
 EnableLegalizeTypes("enable-legalize-types", cl::Hidden);
 static cl::opt<bool>
-EnableFastISel("fast-isel", cl::Hidden,
-          cl::desc("Enable the experimental \"fast\" instruction selector"));
-static cl::opt<bool>
 EnableFastISelVerbose("fast-isel-verbose", cl::Hidden,
           cl::desc("Enable verbose messages in the experimental \"fast\" "
                    "instruction selector"));




From gohman at apple.com  Wed Sep 24 20:28:51 2008
From: gohman at apple.com (Dan Gohman)
Date: Thu, 25 Sep 2008 01:28:51 -0000
Subject: [llvm-commits] [llvm] r56605 -
	/llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp
Message-ID: <200809250128.m8P1SpCm001662@zion.cs.uiuc.edu>

Author: djg
Date: Wed Sep 24 20:28:51 2008
New Revision: 56605

URL: http://llvm.org/viewvc/llvm-project?rev=56605&view=rev
Log:
Fix a recent fast-isel coverage regression - don't bail out before
giving the target a chance to materialize constants.

Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp Wed Sep 24 20:28:51 2008
@@ -75,16 +75,17 @@
   } else if (isa<UndefValue>(V)) {
     Reg = createResultReg(TLI.getRegClassFor(VT));
     BuildMI(MBB, TII.get(TargetInstrInfo::IMPLICIT_DEF), Reg);
-  } else {
-    return 0;
   }
   
+  // If target-independent code couldn't handle the value, give target-specific
+  // code a try.
   if (!Reg && isa<Constant>(V))
     Reg = TargetMaterializeConstant(cast<Constant>(V));
   
   // Don't cache constant materializations in the general ValueMap.
   // To do so would require tracking what uses they dominate.
-  LocalValueMap[V] = Reg;
+  if (Reg != 0)
+    LocalValueMap[V] = Reg;
   return Reg;
 }
 




From isanbard at gmail.com  Thu Sep 25 00:21:38 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 24 Sep 2008 22:21:38 -0700
Subject: [llvm-commits] [llvm] r56587 - in /llvm/trunk/lib/Target/ARM:
	ARMTargetAsmInfo.cpp ARMTargetAsmInfo.h ARMTargetMachine.cpp
In-Reply-To: <200809242222.m8OMMRIR025473@zion.cs.uiuc.edu>
References: <200809242222.m8OMMRIR025473@zion.cs.uiuc.edu>
Message-ID: <7B5863AB-4734-42D9-B544-06EEB0950188@gmail.com>

Anton,

This patch is causing a failure in the build. Please investigate.  
Reverting just this patch doesn't compile. I may have to revert all of  
your patches.

-bw

llvm[2]: Linking Debug executable llc
Undefined symbols:
    
"llvm::ARMTargetAsmInfo<llvm::TargetAsmInfo>::getInlineAsmLength(char  
const*) const", referenced from:
       vtable for llvm::ARMTargetAsmInfo<llvm::TargetAsmInfo>in  
LLVMARMCodeGen.o
    
"llvm 
::X86TargetAsmInfo 
<llvm::TargetAsmInfo>::ExpandInlineAsm(llvm::CallInst*) const",  
referenced from:
       vtable for llvm::X86COFFTargetAsmInfoin LLVMX86CodeGen.o
       vtable for llvm::X86TargetAsmInfo<llvm::TargetAsmInfo>in  
LLVMX86CodeGen.o
       vtable for llvm::X86WinTargetAsmInfoin LLVMX86CodeGen.o
ld: symbol(s) not found
collect2: ld returned 1 exit status
make[2]: *** [/Users/void/llvm/llvm.obj/Debug/bin/llc] Error 1
make[1]: *** [llc/.makeall] Error 2
make: *** [all] Error 1


On Sep 24, 2008, at 3:22 PM, Anton Korobeynikov wrote:

> Author: asl
> Date: Wed Sep 24 17:22:27 2008
> New Revision: 56587
>
> URL: http://llvm.org/viewvc/llvm-project?rev=56587&view=rev
> Log:
> Get rid of virtual inheritance for ARM TAI
>
> Modified:
>    llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp
>    llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h
>    llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp
>
> Modified: llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp?rev=56587&r1=56586&r2=56587&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp (original)
> +++ llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp Wed Sep 24  
> 17:22:27 2008
> @@ -17,7 +17,7 @@
> #include <cctype>
> using namespace llvm;
>
> -static const char *const arm_asm_table[] = {
> +const char *const llvm::arm_asm_table[] = {
>                                       "{r0}", "r0",
>                                       "{r1}", "r1",
>                                       "{r2}", "r2",
> @@ -42,21 +42,10 @@
>                                       "{cc}", "cc",
>                                       0,0};
>
> -ARMTargetAsmInfo::ARMTargetAsmInfo(const ARMTargetMachine &TM) {
> -  AsmTransCBE = arm_asm_table;
> -
> -  AlignmentIsInBytes = false;
> -  Data64bitsDirective = 0;
> -  CommentString = "@";
> -  ConstantPoolSection = "\t.text\n";
> -  COMMDirectiveTakesAlignment = false;
> -  InlineAsmStart = "@ InlineAsm Start";
> -  InlineAsmEnd = "@ InlineAsm End";
> -  LCOMMDirective = "\t.lcomm\t";
> -}
> +TEMPLATE_INSTANTIATION(class ARMTargetAsmInfo<TargetAsmInfo>);
>
> ARMDarwinTargetAsmInfo::ARMDarwinTargetAsmInfo(const  
> ARMTargetMachine &TM):
> -  ARMTargetAsmInfo(TM), DarwinTargetAsmInfo(TM) {
> +  ARMTargetAsmInfo<DarwinTargetAsmInfo>(TM) {
>   Subtarget = &DTM->getSubtarget<ARMSubtarget>();
>
>   GlobalPrefix = "_";
> @@ -104,7 +93,7 @@
> }
>
> ARMELFTargetAsmInfo::ARMELFTargetAsmInfo(const ARMTargetMachine &TM):
> -  ARMTargetAsmInfo(TM), ELFTargetAsmInfo(TM) {
> +  ARMTargetAsmInfo<ELFTargetAsmInfo>(TM) {
>   Subtarget = &ETM->getSubtarget<ARMSubtarget>();
>
>   NeedsSet = false;
> @@ -138,13 +127,15 @@
>
> /// Count the number of comma-separated arguments.
> /// Do not try to detect errors.
> -unsigned ARMTargetAsmInfo::countArguments(const char* p) const {
> +template <class BaseTAI>
> +unsigned ARMTargetAsmInfo<BaseTAI>::countArguments(const char* p)  
> const {
>   unsigned count = 0;
>   while (*p && isspace(*p) && *p != '\n')
>     p++;
>   count++;
> -  while (*p && *p!='\n' &&
> -         strncmp(p, CommentString, strlen(CommentString))!=0) {
> +  while (*p && *p!='\n' &&
> +         strncmp(p, BaseTAI::CommentString,
> +                 strlen(BaseTAI::CommentString))!=0) {
>     if (*p==',')
>       count++;
>     p++;
> @@ -154,7 +145,8 @@
>
> /// Count the length of a string enclosed in quote characters.
> /// Do not try to detect errors.
> -unsigned ARMTargetAsmInfo::countString(const char* p) const {
> +template <class BaseTAI>
> +unsigned ARMTargetAsmInfo<BaseTAI>::countString(const char* p)  
> const {
>   unsigned count = 0;
>   while (*p && isspace(*p) && *p!='\n')
>     p++;
> @@ -166,7 +158,8 @@
> }
>
> /// ARM-specific version of TargetAsmInfo::getInlineAsmLength.
> -unsigned ARMTargetAsmInfo::getInlineAsmLength(const char *s) const {
> +template <class BaseTAI>
> +unsigned ARMTargetAsmInfo<BaseTAI>::getInlineAsmLength(const char  
> *s) const {
>   // Make a lowercase-folded version of s for counting purposes.
>   char *q, *s_copy = (char *)malloc(strlen(s) + 1);
>   strcpy(s_copy, s);
> @@ -192,7 +185,7 @@
>           break;
>         }
>       // Ignore everything from comment char(s) to EOL
> -      if (strncmp(Str, CommentString, strlen(CommentString))==-0)
> +      if (strncmp(Str, BaseTAI::CommentString,  
> strlen(BaseTAI::CommentString))==-0)
>         atInsnStart = false;
>       // FIXME do something like the following for non-Darwin
>       else if (*Str == '.' && Subtarget->isTargetDarwin()) {
> @@ -282,7 +275,7 @@
>           Length += 4;    // ARM
>       }
>     }
> -    if (*Str == '\n' || *Str == SeparatorChar)
> +    if (*Str == '\n' || *Str == BaseTAI::SeparatorChar)
>       atInsnStart = true;
>   }
>   free(s_copy);
>
> Modified: llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h?rev=56587&r1=56586&r2=56587&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h (original)
> +++ llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h Wed Sep 24 17:22:27  
> 2008
> @@ -14,19 +14,31 @@
> #ifndef ARMTARGETASMINFO_H
> #define ARMTARGETASMINFO_H
>
> +#include "ARMTargetMachine.h"
> #include "llvm/Target/TargetAsmInfo.h"
> #include "llvm/Target/ELFTargetAsmInfo.h"
> #include "llvm/Target/DarwinTargetAsmInfo.h"
> -
> -#include "ARMSubtarget.h"
> +#include "llvm/Support/Compiler.h"
>
> namespace llvm {
>
> -  // Forward declaration.
> -  class ARMTargetMachine;
> +  extern const char *const arm_asm_table[];
>
> -  struct ARMTargetAsmInfo : public virtual TargetAsmInfo {
> -    explicit ARMTargetAsmInfo(const ARMTargetMachine &TM);
> +  template <class BaseTAI>
> +  struct ARMTargetAsmInfo : public BaseTAI {
> +    explicit ARMTargetAsmInfo(const ARMTargetMachine &TM):
> +      BaseTAI(TM) {
> +      BaseTAI::AsmTransCBE = arm_asm_table;
> +
> +      BaseTAI::AlignmentIsInBytes = false;
> +      BaseTAI::Data64bitsDirective = 0;
> +      BaseTAI::CommentString = "@";
> +      BaseTAI::ConstantPoolSection = "\t.text\n";
> +      BaseTAI::COMMDirectiveTakesAlignment = false;
> +      BaseTAI::InlineAsmStart = "@ InlineAsm Start";
> +      BaseTAI::InlineAsmEnd = "@ InlineAsm End";
> +      BaseTAI::LCOMMDirective = "\t.lcomm\t";
> +    }
>
>     const ARMSubtarget *Subtarget;
>
> @@ -35,13 +47,15 @@
>     unsigned countString(const char *p) const;
>   };
>
> -  struct ARMDarwinTargetAsmInfo : public virtual ARMTargetAsmInfo,
> -                                  public virtual  
> DarwinTargetAsmInfo {
> +  typedef ARMTargetAsmInfo<TargetAsmInfo> ARMGenericTargetAsmInfo;
> +
> +  EXTERN_TEMPLATE_INSTANTIATION(class  
> ARMTargetAsmInfo<TargetAsmInfo>);
> +
> +  struct ARMDarwinTargetAsmInfo : public  
> ARMTargetAsmInfo<DarwinTargetAsmInfo> {
>     explicit ARMDarwinTargetAsmInfo(const ARMTargetMachine &TM);
>   };
>
> -  struct ARMELFTargetAsmInfo : public virtual ARMTargetAsmInfo,
> -                               public virtual ELFTargetAsmInfo {
> +  struct ARMELFTargetAsmInfo : public  
> ARMTargetAsmInfo<ELFTargetAsmInfo> {
>     explicit ARMELFTargetAsmInfo(const ARMTargetMachine &TM);
>   };
>
>
> Modified: llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp?rev=56587&r1=56586&r2=56587&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp (original)
> +++ llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp Wed Sep 24  
> 17:22:27 2008
> @@ -120,7 +120,7 @@
>    case ARMSubtarget::isELF:
>     return new ARMELFTargetAsmInfo(*this);
>    default:
> -    return new ARMTargetAsmInfo(*this);
> +    return new ARMGenericTargetAsmInfo(*this);
>   }
> }
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From isanbard at gmail.com  Thu Sep 25 00:22:58 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 24 Sep 2008 22:22:58 -0700
Subject: [llvm-commits] [llvm] r56585 - in /llvm/trunk:
	include/llvm/Target/TargetAsmInfo.h lib/Target/TargetAsmInfo.cpp
	lib/Target/X86/X86TargetAsmInfo.cpp
	lib/Target/X86/X86TargetAsmInfo.h
	lib/Target/X86/X86TargetMachine.cpp
In-Reply-To: <200809242221.m8OMLe9P025410@zion.cs.uiuc.edu>
References: <200809242221.m8OMLe9P025410@zion.cs.uiuc.edu>
Message-ID: <687DE706-36A0-49BB-9E86-2C91B9AD3994@gmail.com>

Anton,

This patch is causing a build failure. Please investigate. I may have  
to revert all of your patches from 9/24.

-bw

llvm[2]: Linking Debug executable llc
Undefined symbols:
    
"llvm::ARMTargetAsmInfo<llvm::TargetAsmInfo>::getInlineAsmLength(char  
const*) const", referenced from:
       vtable for llvm::ARMTargetAsmInfo<llvm::TargetAsmInfo>in  
LLVMARMCodeGen.o
    
"llvm 
::X86TargetAsmInfo 
<llvm::TargetAsmInfo>::ExpandInlineAsm(llvm::CallInst*) const",  
referenced from:
       vtable for llvm::X86COFFTargetAsmInfoin LLVMX86CodeGen.o
       vtable for llvm::X86TargetAsmInfo<llvm::TargetAsmInfo>in  
LLVMX86CodeGen.o
       vtable for llvm::X86WinTargetAsmInfoin LLVMX86CodeGen.o
ld: symbol(s) not found
collect2: ld returned 1 exit status
make[2]: *** [/Users/void/llvm/llvm.obj/Debug/bin/llc] Error 1
make[1]: *** [llc/.makeall] Error 2
make: *** [all] Error 1

On Sep 24, 2008, at 3:21 PM, Anton Korobeynikov wrote:

> Author: asl
> Date: Wed Sep 24 17:21:39 2008
> New Revision: 56585
>
> URL: http://llvm.org/viewvc/llvm-project?rev=56585&view=rev
> Log:
> Use crazy template-based inheritance instead of virtual one.
>
> Modified:
>    llvm/trunk/include/llvm/Target/TargetAsmInfo.h
>    llvm/trunk/lib/Target/TargetAsmInfo.cpp
>    llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp
>    llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h
>    llvm/trunk/lib/Target/X86/X86TargetMachine.cpp
>
> Modified: llvm/trunk/include/llvm/Target/TargetAsmInfo.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetAsmInfo.h?rev=56585&r1=56584&r2=56585&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/include/llvm/Target/TargetAsmInfo.h (original)
> +++ llvm/trunk/include/llvm/Target/TargetAsmInfo.h Wed Sep 24  
> 17:21:39 2008
> @@ -124,6 +124,7 @@
>   private:
>     mutable StringMap<Section> Sections;
>     mutable SectionFlags::FlagsStringsMapType FlagsStrings;
> +    void fillDefaultValues();
>   protected:
>     // 
> ===------------------------------------------------------------------ 
> ===//
>     // Properties to be set by the target writer, used to configure  
> asm printer.
> @@ -510,6 +511,7 @@
>
>   public:
>     TargetAsmInfo();
> +    TargetAsmInfo(const TargetMachine &TM);
>     virtual ~TargetAsmInfo();
>
>     const Section* getNamedSection(const char *Name,
>
> Modified: llvm/trunk/lib/Target/TargetAsmInfo.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetAsmInfo.cpp?rev=56585&r1=56584&r2=56585&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Target/TargetAsmInfo.cpp (original)
> +++ llvm/trunk/lib/Target/TargetAsmInfo.cpp Wed Sep 24 17:21:39 2008
> @@ -25,100 +25,108 @@
>
> using namespace llvm;
>
> -TargetAsmInfo::TargetAsmInfo() :
> -  TextSection(0),
> -  DataSection(0),
> -  BSSSection("\t.bss"),
> -  BSSSection_(0),
> -  ReadOnlySection(0),
> -  SmallDataSection(0),
> -  SmallBSSSection(0),
> -  SmallRODataSection(0),
> -  TLSDataSection(0),
> -  TLSBSSSection(0),
> -  ZeroFillDirective(0),
> -  NonexecutableStackDirective(0),
> -  NeedsSet(false),
> -  MaxInstLength(4),
> -  PCSymbol("$"),
> -  SeparatorChar(';'),
> -  CommentString("#"),
> -  GlobalPrefix(""),
> -  PrivateGlobalPrefix("."),
> -  LessPrivateGlobalPrefix(""),
> -  JumpTableSpecialLabelPrefix(0),
> -  GlobalVarAddrPrefix(""),
> -  GlobalVarAddrSuffix(""),
> -  FunctionAddrPrefix(""),
> -  FunctionAddrSuffix(""),
> -  PersonalityPrefix(""),
> -  PersonalitySuffix(""),
> -  NeedsIndirectEncoding(false),
> -  InlineAsmStart("#APP"),
> -  InlineAsmEnd("#NO_APP"),
> -  AssemblerDialect(0),
> -  StringConstantPrefix(".str"),
> -  ZeroDirective("\t.zero\t"),
> -  ZeroDirectiveSuffix(0),
> -  AsciiDirective("\t.ascii\t"),
> -  AscizDirective("\t.asciz\t"),
> -  Data8bitsDirective("\t.byte\t"),
> -  Data16bitsDirective("\t.short\t"),
> -  Data32bitsDirective("\t.long\t"),
> -  Data64bitsDirective("\t.quad\t"),
> -  AlignDirective("\t.align\t"),
> -  AlignmentIsInBytes(true),
> -  TextAlignFillValue(0),
> -  SwitchToSectionDirective("\t.section\t"),
> -  TextSectionStartSuffix(""),
> -  DataSectionStartSuffix(""),
> -  SectionEndDirectiveSuffix(0),
> -  ConstantPoolSection("\t.section .rodata"),
> -  JumpTableDataSection("\t.section .rodata"),
> -  JumpTableDirective(0),
> -  CStringSection(0),
> -  CStringSection_(0),
> -  StaticCtorsSection("\t.section .ctors,\"aw\", at progbits"),
> -  StaticDtorsSection("\t.section .dtors,\"aw\", at progbits"),
> -  GlobalDirective("\t.globl\t"),
> -  SetDirective(0),
> -  LCOMMDirective(0),
> -  COMMDirective("\t.comm\t"),
> -  COMMDirectiveTakesAlignment(true),
> -  HasDotTypeDotSizeDirective(true),
> -  UsedDirective(0),
> -  WeakRefDirective(0),
> -  WeakDefDirective(0),
> -  HiddenDirective("\t.hidden\t"),
> -  ProtectedDirective("\t.protected\t"),
> -  AbsoluteDebugSectionOffsets(false),
> -  AbsoluteEHSectionOffsets(false),
> -  HasLEB128(false),
> -  HasDotLocAndDotFile(false),
> -  SupportsDebugInformation(false),
> -  SupportsExceptionHandling(false),
> -  DwarfRequiresFrameSection(true),
> -  GlobalEHDirective(0),
> -  SupportsWeakOmittedEHFrame(true),
> -  DwarfSectionOffsetDirective(0),
> -  DwarfAbbrevSection(".debug_abbrev"),
> -  DwarfInfoSection(".debug_info"),
> -  DwarfLineSection(".debug_line"),
> -  DwarfFrameSection(".debug_frame"),
> -  DwarfPubNamesSection(".debug_pubnames"),
> -  DwarfPubTypesSection(".debug_pubtypes"),
> -  DwarfStrSection(".debug_str"),
> -  DwarfLocSection(".debug_loc"),
> -  DwarfARangesSection(".debug_aranges"),
> -  DwarfRangesSection(".debug_ranges"),
> -  DwarfMacInfoSection(".debug_macinfo"),
> -  DwarfEHFrameSection(".eh_frame"),
> -  DwarfExceptionSection(".gcc_except_table"),
> -  AsmTransCBE(0) {
> +void TargetAsmInfo::fillDefaultValues() {
> +  BSSSection = "\t.bss";
> +  BSSSection_ = 0;
> +  ReadOnlySection = 0;
> +  SmallDataSection = 0;
> +  SmallBSSSection = 0;
> +  SmallRODataSection = 0;
> +  TLSDataSection = 0;
> +  TLSBSSSection = 0;
> +  ZeroFillDirective = 0;
> +  NonexecutableStackDirective = 0;
> +  NeedsSet = false;
> +  MaxInstLength = 4;
> +  PCSymbol = "$";
> +  SeparatorChar = ';';
> +  CommentString = "#";
> +  GlobalPrefix = "";
> +  PrivateGlobalPrefix = ".";
> +  LessPrivateGlobalPrefix = "";
> +  JumpTableSpecialLabelPrefix = 0;
> +  GlobalVarAddrPrefix = "";
> +  GlobalVarAddrSuffix = "";
> +  FunctionAddrPrefix = "";
> +  FunctionAddrSuffix = "";
> +  PersonalityPrefix = "";
> +  PersonalitySuffix = "";
> +  NeedsIndirectEncoding = false;
> +  InlineAsmStart = "#APP";
> +  InlineAsmEnd = "#NO_APP";
> +  AssemblerDialect = 0;
> +  StringConstantPrefix = ".str";
> +  ZeroDirective = "\t.zero\t";
> +  ZeroDirectiveSuffix = 0;
> +  AsciiDirective = "\t.ascii\t";
> +  AscizDirective = "\t.asciz\t";
> +  Data8bitsDirective = "\t.byte\t";
> +  Data16bitsDirective = "\t.short\t";
> +  Data32bitsDirective = "\t.long\t";
> +  Data64bitsDirective = "\t.quad\t";
> +  AlignDirective = "\t.align\t";
> +  AlignmentIsInBytes = true;
> +  TextAlignFillValue = 0;
> +  SwitchToSectionDirective = "\t.section\t";
> +  TextSectionStartSuffix = "";
> +  DataSectionStartSuffix = "";
> +  SectionEndDirectiveSuffix = 0;
> +  ConstantPoolSection = "\t.section .rodata";
> +  JumpTableDataSection = "\t.section .rodata";
> +  JumpTableDirective = 0;
> +  CStringSection = 0;
> +  CStringSection_ = 0;
> +  // FIXME: Flags are ELFish - replace with normal section stuff.
> +  StaticCtorsSection = "\t.section .ctors,\"aw\", at progbits";
> +  StaticDtorsSection = "\t.section .dtors,\"aw\", at progbits";
> +  GlobalDirective = "\t.globl\t";
> +  SetDirective = 0;
> +  LCOMMDirective = 0;
> +  COMMDirective = "\t.comm\t";
> +  COMMDirectiveTakesAlignment = true;
> +  HasDotTypeDotSizeDirective = true;
> +  UsedDirective = 0;
> +  WeakRefDirective = 0;
> +  WeakDefDirective = 0;
> +  // FIXME: These are ELFish - move to ELFTAI.
> +  HiddenDirective = "\t.hidden\t";
> +  ProtectedDirective = "\t.protected\t";
> +  AbsoluteDebugSectionOffsets = false;
> +  AbsoluteEHSectionOffsets = false;
> +  HasLEB128 = false;
> +  HasDotLocAndDotFile = false;
> +  SupportsDebugInformation = false;
> +  SupportsExceptionHandling = false;
> +  DwarfRequiresFrameSection = true;
> +  GlobalEHDirective = 0;
> +  SupportsWeakOmittedEHFrame = true;
> +  DwarfSectionOffsetDirective = 0;
> +  DwarfAbbrevSection = ".debug_abbrev";
> +  DwarfInfoSection = ".debug_info";
> +  DwarfLineSection = ".debug_line";
> +  DwarfFrameSection = ".debug_frame";
> +  DwarfPubNamesSection = ".debug_pubnames";
> +  DwarfPubTypesSection = ".debug_pubtypes";
> +  DwarfStrSection = ".debug_str";
> +  DwarfLocSection = ".debug_loc";
> +  DwarfARangesSection = ".debug_aranges";
> +  DwarfRangesSection = ".debug_ranges";
> +  DwarfMacInfoSection = ".debug_macinfo";
> +  DwarfEHFrameSection = ".eh_frame";
> +  DwarfExceptionSection = ".gcc_except_table";
> +  AsmTransCBE = 0;
>   TextSection = getUnnamedSection("\t.text", SectionFlags::Code);
>   DataSection = getUnnamedSection("\t.data", SectionFlags::Writeable);
> }
>
> +TargetAsmInfo::TargetAsmInfo() {
> +  fillDefaultValues();
> +}
> +
> +TargetAsmInfo::TargetAsmInfo(const TargetMachine &TM) {
> +  fillDefaultValues();
> +}
> +
> TargetAsmInfo::~TargetAsmInfo() {
> }
>
>
> Modified: llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp?rev=56585&r1=56584&r2=56585&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp (original)
> +++ llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp Wed Sep 24  
> 17:21:39 2008
> @@ -25,27 +25,20 @@
> using namespace llvm;
> using namespace llvm::dwarf;
>
> -static const char *const x86_asm_table[] = {
> -                                      "{si}", "S",
> -                                      "{di}", "D",
> -                                      "{ax}", "a",
> -                                      "{cx}", "c",
> -                                      "{memory}", "memory",
> -                                      "{flags}", "",
> -                                      "{dirflag}", "",
> -                                      "{fpsr}", "",
> -                                      "{cc}", "cc",
> -                                      0,0};
> -
> -X86TargetAsmInfo::X86TargetAsmInfo(const X86TargetMachine &TM) {
> -  const X86Subtarget *Subtarget = &TM.getSubtarget<X86Subtarget>();
> +const char *const llvm::x86_asm_table[] = {
> +  "{si}", "S",
> +  "{di}", "D",
> +  "{ax}", "a",
> +  "{cx}", "c",
> +  "{memory}", "memory",
> +  "{flags}", "",
> +  "{dirflag}", "",
> +  "{fpsr}", "",
> +  "{cc}", "cc",
> +  0,0};
>
> -  AsmTransCBE = x86_asm_table;
> -
> -  AssemblerDialect = Subtarget->getAsmFlavor();
> -}
> -
> -bool X86TargetAsmInfo::LowerToBSwap(CallInst *CI) const {
> +template <class BaseTAI>
> +bool X86TargetAsmInfo<BaseTAI>::LowerToBSwap(CallInst *CI) const {
>   // FIXME: this should verify that we are targetting a 486 or  
> better.  If not,
>   // we will turn this bswap into something that will be lowered to  
> logical ops
>   // instead of emitting the bswap asm.  For now, we don't support  
> 486 or lower
> @@ -74,7 +67,8 @@
>   return true;
> }
>
> -bool X86TargetAsmInfo::ExpandInlineAsm(CallInst *CI) const {
> +template <class BaseTAI>
> +bool X86TargetAsmInfo<BaseTAI>::ExpandInlineAsm(CallInst *CI) const {
>   InlineAsm *IA = cast<InlineAsm>(CI->getCalledValue());
>   std::vector<InlineAsm::ConstraintInfo> Constraints = IA- 
> >ParseConstraints();
>
> @@ -125,7 +119,7 @@
> }
>
> X86DarwinTargetAsmInfo::X86DarwinTargetAsmInfo(const  
> X86TargetMachine &TM):
> -  X86TargetAsmInfo(TM), DarwinTargetAsmInfo(TM) {
> +  X86TargetAsmInfo<DarwinTargetAsmInfo>(TM) {
>   const X86Subtarget* Subtarget = &DTM->getSubtarget<X86Subtarget>();
>   bool is64Bit = Subtarget->is64Bit();
>
> @@ -225,7 +219,7 @@
> }
>
> X86ELFTargetAsmInfo::X86ELFTargetAsmInfo(const X86TargetMachine &TM):
> -  X86TargetAsmInfo(TM), ELFTargetAsmInfo(TM) {
> +  X86TargetAsmInfo<ELFTargetAsmInfo>(TM) {
>
>   CStringSection = ".rodata.str";
>   PrivateGlobalPrefix = ".L";
> @@ -302,7 +296,7 @@
> }
>
> X86COFFTargetAsmInfo::X86COFFTargetAsmInfo(const X86TargetMachine  
> &TM):
> -  X86TargetAsmInfo(TM) {
> +  X86GenericTargetAsmInfo(TM) {
>   X86TM = &TM;
>
>   GlobalPrefix = "_";
> @@ -408,7 +402,7 @@
> }
>
> X86WinTargetAsmInfo::X86WinTargetAsmInfo(const X86TargetMachine &TM):
> -  X86TargetAsmInfo(TM) {
> +  X86GenericTargetAsmInfo(TM) {
>   GlobalPrefix = "_";
>   CommentString = ";";
>
>
> Modified: llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h?rev=56585&r1=56584&r2=56585&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h (original)
> +++ llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h Wed Sep 24 17:21:39  
> 2008
> @@ -14,17 +14,24 @@
> #ifndef X86TARGETASMINFO_H
> #define X86TARGETASMINFO_H
>
> +#include "X86TargetMachine.h"
> #include "llvm/Target/TargetAsmInfo.h"
> #include "llvm/Target/ELFTargetAsmInfo.h"
> #include "llvm/Target/DarwinTargetAsmInfo.h"
>
> namespace llvm {
>
> -  // Forward declaration.
> -  class X86TargetMachine;
> +  extern const char *const x86_asm_table[];
>
> -  struct X86TargetAsmInfo : public virtual TargetAsmInfo {
> -    explicit X86TargetAsmInfo(const X86TargetMachine &TM);
> +  template <class BaseTAI>
> +  struct X86TargetAsmInfo : public BaseTAI {
> +    explicit X86TargetAsmInfo(const X86TargetMachine &TM):
> +      BaseTAI(TM) {
> +      const X86Subtarget *Subtarget =  
> &TM.getSubtarget<X86Subtarget>();
> +
> +      BaseTAI::AsmTransCBE = x86_asm_table;
> +      BaseTAI::AssemblerDialect = Subtarget->getAsmFlavor();
> +    }
>
>     virtual bool ExpandInlineAsm(CallInst *CI) const;
>
> @@ -32,21 +39,21 @@
>     bool LowerToBSwap(CallInst *CI) const;
>   };
>
> -  struct X86DarwinTargetAsmInfo : public X86TargetAsmInfo,
> -                                  public DarwinTargetAsmInfo {
> +  typedef X86TargetAsmInfo<TargetAsmInfo> X86GenericTargetAsmInfo;
> +
> +  struct X86DarwinTargetAsmInfo : public  
> X86TargetAsmInfo<DarwinTargetAsmInfo> {
>     explicit X86DarwinTargetAsmInfo(const X86TargetMachine &TM);
>     virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target  
> Reason,
>                                            bool Global) const;
>   };
>
> -  struct X86ELFTargetAsmInfo : public X86TargetAsmInfo,
> -                               public ELFTargetAsmInfo {
> +  struct X86ELFTargetAsmInfo : public  
> X86TargetAsmInfo<ELFTargetAsmInfo> {
>     explicit X86ELFTargetAsmInfo(const X86TargetMachine &TM);
>     virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target  
> Reason,
>                                            bool Global) const;
>   };
>
> -  struct X86COFFTargetAsmInfo : public X86TargetAsmInfo {
> +  struct X86COFFTargetAsmInfo : public X86GenericTargetAsmInfo {
>     explicit X86COFFTargetAsmInfo(const X86TargetMachine &TM);
>     virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target  
> Reason,
>                                            bool Global) const;
> @@ -57,9 +64,11 @@
>     const X86TargetMachine *X86TM;
>   };
>
> -  struct X86WinTargetAsmInfo : public X86TargetAsmInfo {
> +  struct X86WinTargetAsmInfo : public X86GenericTargetAsmInfo {
>     explicit X86WinTargetAsmInfo(const X86TargetMachine &TM);
>   };
> +
> } // namespace llvm
>
> #endif
> +
>
> Modified: llvm/trunk/lib/Target/X86/X86TargetMachine.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetMachine.cpp?rev=56585&r1=56584&r2=56585&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Target/X86/X86TargetMachine.cpp (original)
> +++ llvm/trunk/lib/Target/X86/X86TargetMachine.cpp Wed Sep 24  
> 17:21:39 2008
> @@ -54,7 +54,7 @@
>      case X86Subtarget::isWindows:
>       return new X86WinTargetAsmInfo(*this);
>      default:
> -      return new X86TargetAsmInfo(*this);
> +      return new X86GenericTargetAsmInfo(*this);
>     }
> }
>
>
>
> _______________________________________________
> 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  Thu Sep 25 02:13:40 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Thu, 25 Sep 2008 00:13:40 -0700
Subject: [llvm-commits] [llvm] r56592 - in /llvm/trunk:
	lib/CodeGen/RegAllocLocal.cpp
	lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
	lib/CodeGen/SelectionDAG/SelectionDAGBuild.h
	test/CodeGen/PowerPC/2007-04-30-InlineAsmEarlyClobber.ll
	test/CodeGen/X86/2008-09-17-inline-asm-1.ll
	test/CodeGen/X86/2008-09-18-inline-asm-2.ll
In-Reply-To: <200809242313.m8OND9xW027138@zion.cs.uiuc.edu>
References: <200809242313.m8OND9xW027138@zion.cs.uiuc.edu>
Message-ID: <935847D9-A566-43F0-8225-20F81FA555E7@apple.com>


On Sep 24, 2008, at 4:13 PM, Dale Johannesen wrote:

Thanks Dale. Some comments:

>
> +    // If any physical regs are earlyclobber, spill any value they  
> might
> +    // have in them, then mark them unallocatable.
>
> +    // If any virtual regs are earlyclobber, allocate them now  
> (before
> +    // freeing inputs that are killed).

Ok. Sounds reasonable. Can you factor this chunk out to a separate  
function?

>
> +    if (MI->getOpcode()==TargetInstrInfo::INLINEASM) {
> +      for (unsigned i = 0; i != MI->getNumOperands(); ++i) {
> +        MachineOperand& MO = MI->getOperand(i);
> +        if (MO.isRegister() && MO.isDef() && MO.isEarlyClobber() &&
> +            MO.getReg()) {

if (!MO.isRegister() || !MO.isDef() ...)
   continue;

to reduce indentation...

>
> +          if (TargetRegisterInfo::isVirtualRegister(MO.getReg())) {
> +            unsigned DestVirtReg = MO.getReg();
> +            unsigned DestPhysReg;
> +
> +            // If DestVirtReg already has a value, use it.
> +            if (!(DestPhysReg = getVirt2PhysRegMapSlot(DestVirtReg)))
> +              DestPhysReg = getReg(MBB, MI, DestVirtReg);
> +            MF->getRegInfo().setPhysRegUsed(DestPhysReg);
> +            markVirtRegModified(DestVirtReg);
> +            getVirtRegLastUse(DestVirtReg) =
> +                   std::make_pair((MachineInstr*)0, 0);
> +            DOUT << "  Assigning " << TRI->getName(DestPhysReg)
> +                 << " to %reg" << DestVirtReg << "\n";
> +            MO.setReg(DestPhysReg);  // Assign the earlyclobber  
> register
> +          } else {
> +            unsigned Reg = MO.getReg();
> +            if (PhysRegsUsed[Reg] == -2) continue;  // Something  
> like ESP.
> +            // These are extra physical register defs when a sub- 
> register
> +            // is defined (def of a sub-register is a read/mod/ 
> write of the
> +            // larger registers). Ignore.
> +            if (isReadModWriteImplicitDef(MI, MO.getReg())) continue;

I don't think this check is necessary. Defs introduced due to partial  
register def cannot be marked early clobber.

>
> +
> +            MF->getRegInfo().setPhysRegUsed(Reg);
> +            spillPhysReg(MBB, MI, Reg, true); // Spill any existing  
> value in reg

You may need to spill all registers which aliases Reg, no?

>
> +            PhysRegsUsed[Reg] = 0;            // It is free and  
> reserved now
> +            AddToPhysRegsUseOrder(Reg);
> +
> +            for (const unsigned *AliasSet = TRI- 
> >getSubRegisters(Reg);
> +                 *AliasSet; ++AliasSet) {
> +              if (PhysRegsUsed[*AliasSet] != -2) {
> +                MF->getRegInfo().setPhysRegUsed(*AliasSet);
> +                PhysRegsUsed[*AliasSet] = 0;  // It is free and  
> reserved now
> +                AddToPhysRegsUseOrder(*AliasSet);
> +              }
> +            }
> +          }
> +        }
> +      }
> +    }

I think this approach can work. But is it any simpler than a dumb  
solution: 1) Don't process inlineasm early clobber first,  handle them  
the same way. 2) When allocating for a earlyclobber def (source  
operands are already allocated), just avoid allocating any registers  
which conflict with any source. 3) When allocating for a source, check  
if there is a earlyclobber def that's already assigned a physical  
register. What do you think?

Evan
>
> +
>     // Get the used operands into registers.  This has the potential  
> to spill
>     // incoming values if we are out of registers.  Note that we  
> completely
>     // ignore physical register uses here.  We assume that if an  
> explicit
> @@ -778,6 +827,7 @@
>     for (unsigned i = 0, e = MI->getNumOperands(); i != e; ++i) {
>       MachineOperand& MO = MI->getOperand(i);
>       if (MO.isRegister() && MO.isDef() && !MO.isImplicit() &&  
> MO.getReg() &&
> +          !MO.isEarlyClobber() &&
>           TargetRegisterInfo::isPhysicalRegister(MO.getReg())) {
>         unsigned Reg = MO.getReg();
>         if (PhysRegsUsed[Reg] == -2) continue;  // Something like ESP.
> @@ -839,6 +889,7 @@
>     for (unsigned i = 0, e = MI->getNumOperands(); i != e; ++i) {
>       MachineOperand& MO = MI->getOperand(i);
>       if (MO.isRegister() && MO.isDef() && MO.getReg() &&
> +          !MO.isEarlyClobber() &&
>           TargetRegisterInfo::isVirtualRegister(MO.getReg())) {
>         unsigned DestVirtReg = MO.getReg();
>         unsigned DestPhysReg;
>
> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp?rev=56592&r1=56591&r2=56592&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp  
> (original)
> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Wed  
> Sep 24 18:13:09 2008
> @@ -4465,12 +4465,10 @@
> /// allocation.  This produces generally horrible, but correct, code.
> ///
> ///   OpInfo describes the operand.
> -///   HasEarlyClobber is true if there are any early clobber  
> constraints (=&r)
> -///     or any explicitly clobbered registers.
> ///   Input and OutputRegs are the set of already allocated physical  
> registers.
> ///
> void SelectionDAGLowering::
> -GetRegistersForValue(SDISelAsmOperandInfo &OpInfo, bool  
> HasEarlyClobber,
> +GetRegistersForValue(SDISelAsmOperandInfo &OpInfo,
>                      std::set<unsigned> &OutputRegs,
>                      std::set<unsigned> &InputRegs) {
>   // Compute whether this value requires an input register, an  
> output register,
> @@ -4481,10 +4479,9 @@
>   case InlineAsm::isOutput:
>     isOutReg = true;
>
> -    // If this is an early-clobber output, or if there is an input
> -    // constraint that matches this, we need to reserve the input  
> register
> -    // so no other inputs allocate to it.
> -    isInReg = OpInfo.isEarlyClobber || OpInfo.hasMatchingInput;
> +    // If there is an input constraint that matches this, we need  
> to reserve
> +    // the input register so no other inputs allocate to it.
> +    isInReg = OpInfo.hasMatchingInput;
>     break;
>   case InlineAsm::isInput:
>     isInReg = true;
> @@ -4551,16 +4548,11 @@
>   std::vector<unsigned> RegClassRegs;
>   const TargetRegisterClass *RC = PhysReg.second;
>   if (RC) {
> -    // If this is an early clobber or tied register, our regalloc  
> doesn't know
> -    // how to maintain the constraint.  If it isn't, go ahead and  
> create vreg
> +    // If this is a tied register, our regalloc doesn't know how to  
> maintain
> +    // the constraint.  If it isn't, go ahead and create vreg
>     // and let the regalloc do the right thing.
> -    if (!OpInfo.hasMatchingInput && !OpInfo.isEarlyClobber &&
> -        // If there is some other early clobber and this is an  
> input register,
> -        // then we are forced to pre-allocate the input reg so it  
> doesn't
> -        // conflict with the earlyclobber.
> -        !(OpInfo.Type == InlineAsm::isInput && HasEarlyClobber)) {
> +    if (!OpInfo.hasMatchingInput) {
>       RegVT = *PhysReg.second->vt_begin();
> -
>       if (OpInfo.ConstraintVT == MVT::Other)
>         ValueVT = RegVT;
>
> @@ -4664,11 +4656,6 @@
>   std::vector<InlineAsm::ConstraintInfo>
>     ConstraintInfos = IA->ParseConstraints();
>
> -  // SawEarlyClobber - Keep track of whether we saw an earlyclobber  
> output
> -  // constraint.  If so, we can't let the register allocator  
> allocate any input
> -  // registers, because it will not know to avoid the  
> earlyclobbered output reg.
> -  bool SawEarlyClobber = false;
> -
>   bool hasMemory = hasInlineAsmMemConstraint(ConstraintInfos, TLI);
>
>   unsigned ArgNo = 0;   // ArgNo - The argument of the CallInst.
> @@ -4744,24 +4731,6 @@
>     // Compute the constraint code and ConstraintType to use.
>     TLI.ComputeConstraintToUse(OpInfo, OpInfo.CallOperand,  
> hasMemory, &DAG);
>
> -    // Keep track of whether we see an earlyclobber.
> -    SawEarlyClobber |= OpInfo.isEarlyClobber;
> -
> -    // If we see a clobber of a register, it is an early clobber.
> -    if (!SawEarlyClobber &&
> -        OpInfo.Type == InlineAsm::isClobber &&
> -        OpInfo.ConstraintType == TargetLowering::C_Register) {
> -      // Note that we want to ignore things that we don't track  
> here, like
> -      // dirflag, fpsr, flags, etc.
> -      std::pair<unsigned, const TargetRegisterClass*> PhysReg =
> -        TLI.getRegForInlineAsmConstraint(OpInfo.ConstraintCode,
> -                                         OpInfo.ConstraintVT);
> -      if (PhysReg.first || PhysReg.second) {
> -        // This is a register we know of.
> -        SawEarlyClobber = true;
> -      }
> -    }
> -
>     // If this is a memory input, and if the operand is not  
> indirect, do what we
>     // need to to provide an address for the memory input.
>     if (OpInfo.ConstraintType == TargetLowering::C_Memory &&
> @@ -4802,7 +4771,7 @@
>     // If this constraint is for a specific register, allocate it  
> before
>     // anything else.
>     if (OpInfo.ConstraintType == TargetLowering::C_Register)
> -      GetRegistersForValue(OpInfo, SawEarlyClobber, OutputRegs,  
> InputRegs);
> +      GetRegistersForValue(OpInfo, OutputRegs, InputRegs);
>   }
>   ConstraintInfos.clear();
>
> @@ -4815,7 +4784,7 @@
>     // C_Register operands have already been allocated, Other/Memory  
> don't need
>     // to be.
>     if (OpInfo.ConstraintType == TargetLowering::C_RegisterClass)
> -      GetRegistersForValue(OpInfo, SawEarlyClobber, OutputRegs,  
> InputRegs);
> +      GetRegistersForValue(OpInfo, OutputRegs, InputRegs);
>   }
>
>   // AsmNodeOperands - The operands for the ISD::INLINEASM node.
>
> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.h?rev=56592&r1=56591&r2=56592&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.h (original)
> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.h Wed Sep  
> 24 18:13:09 2008
> @@ -398,7 +398,7 @@
>     N = NewN;
>   }
>
> -  void GetRegistersForValue(SDISelAsmOperandInfo &OpInfo, bool  
> HasEarlyClobber,
> +  void GetRegistersForValue(SDISelAsmOperandInfo &OpInfo,
>                             std::set<unsigned> &OutputRegs,
>                             std::set<unsigned> &InputRegs);
>
>
> Modified: llvm/trunk/test/CodeGen/PowerPC/2007-04-30- 
> InlineAsmEarlyClobber.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/2007-04-30-InlineAsmEarlyClobber.ll?rev=56592&r1=56591&r2=56592&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/test/CodeGen/PowerPC/2007-04-30- 
> InlineAsmEarlyClobber.ll (original)
> +++ llvm/trunk/test/CodeGen/PowerPC/2007-04-30- 
> InlineAsmEarlyClobber.ll Wed Sep 24 18:13:09 2008
> @@ -1,5 +1,8 @@
> -; RUN: llvm-as < %s | llc | grep {subfc r2,r5,r4}
> -; RUN: llvm-as < %s | llc | grep {subfze r4,r3}
> +; RUN: llvm-as < %s | llc | grep {subfc r3,r5,r4}
> +; RUN: llvm-as < %s | llc | grep {subfze r4,r2}
> +; RUN: llvm-as < %s | llc -regalloc=local | grep {subfc r5,r2,r4}
> +; RUN: llvm-as < %s | llc -regalloc=local | grep {subfze r2,r3}
> +; The first argument of subfc must not be the same as any other  
> register.
>
> ; PR1357
>
>
> Modified: llvm/trunk/test/CodeGen/X86/2008-09-17-inline-asm-1.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2008-09-17-inline-asm-1.ll?rev=56592&r1=56591&r2=56592&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/test/CodeGen/X86/2008-09-17-inline-asm-1.ll (original)
> +++ llvm/trunk/test/CodeGen/X86/2008-09-17-inline-asm-1.ll Wed Sep  
> 24 18:13:09 2008
> @@ -2,6 +2,10 @@
> ; RUN: llvm-as < %s | llc -march=x86 | not grep "movl %edx, %edx"
> ; RUN: llvm-as < %s | llc -march=x86 | not grep "movl (%eax), %eax"
> ; RUN: llvm-as < %s | llc -march=x86 | not grep "movl (%edx), %edx"
> +; RUN: llvm-as < %s | llc -march=x86 -regalloc=local | not grep  
> "movl %eax, %eax"
> +; RUN: llvm-as < %s | llc -march=x86 -regalloc=local | not grep  
> "movl %edx, %edx"
> +; RUN: llvm-as < %s | llc -march=x86 -regalloc=local | not grep  
> "movl (%eax), %eax"
> +; RUN: llvm-as < %s | llc -march=x86 -regalloc=local | not grep  
> "movl (%edx), %edx"
>
> ; %0 must not be put in EAX or EDX.
> ; In the first asm, $0 and $2 must not be put in EAX.
>
> Added: llvm/trunk/test/CodeGen/X86/2008-09-18-inline-asm-2.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2008-09-18-inline-asm-2.ll?rev=56592&view=auto
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/test/CodeGen/X86/2008-09-18-inline-asm-2.ll (added)
> +++ llvm/trunk/test/CodeGen/X86/2008-09-18-inline-asm-2.ll Wed Sep  
> 24 18:13:09 2008
> @@ -0,0 +1,26 @@
> +; RUN: llvm-as < %s | llc -march=x86 | grep "#%ebp %eax %edx  
> 8(%esi) %ebx (%edi)"
> +; RUN: llvm-as < %s | llc -march=x86 -regalloc=local | grep "#%ecx  
> %eax %edx 8(%edi) %ebx (%esi)"
> +; The 1st, 2nd, 3rd and 5th registers above must all be different.   
> The registers
> +; referenced in the 4th and 6th operands must not be the same as  
> the 1st or 5th
> +; operand.  There are many combinations that work; this is what llc  
> puts out now.
> +; ModuleID = '<stdin>'
> +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32- 
> i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64- 
> f80:128:128"
> +target triple = "i386-apple-darwin8"
> +	%struct.foo = type { i32, i32, i8* }
> +
> +define i32 @get(%struct.foo* %c, i8* %state) nounwind {
> +entry:
> +	%0 = getelementptr %struct.foo* %c, i32 0, i32 0		; <i32*> [#uses=2]
> +	%1 = getelementptr %struct.foo* %c, i32 0, i32 1		; <i32*> [#uses=2]
> +	%2 = getelementptr %struct.foo* %c, i32 0, i32 2		; <i8**> [#uses=2]
> +	%3 = load i32* %0, align 4		; <i32> [#uses=1]
> +	%4 = load i32* %1, align 4		; <i32> [#uses=1]
> +	%5 = load i8* %state, align 1		; <i8> [#uses=1]
> +	%asmtmp = tail call { i32, i32, i32, i32 } asm sideeffect "#$0 $1  
> $2 $3 $4 $5", "=&r,=r,=r,=*m,=&q,=*imr,1,2,*m, 
> 5,~{dirflag},~{fpsr},~{flags},~{cx}"(i8** %2, i8* %state, i32 %3,  
> i32 %4, i8** %2, i8 %5) nounwind		; <{ i32, i32, i32, i32 }> [#uses=3]
> +	%asmresult = extractvalue { i32, i32, i32, i32 } %asmtmp, 0		;  
> <i32> [#uses=1]
> +	%asmresult1 = extractvalue { i32, i32, i32, i32 } %asmtmp, 1		;  
> <i32> [#uses=1]
> +	store i32 %asmresult1, i32* %0
> +	%asmresult2 = extractvalue { i32, i32, i32, i32 } %asmtmp, 2		;  
> <i32> [#uses=1]
> +	store i32 %asmresult2, i32* %1
> +	ret i32 %asmresult
> +}
>
>
> _______________________________________________
> 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  Thu Sep 25 02:37:33 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Thu, 25 Sep 2008 00:37:33 -0700
Subject: [llvm-commits] [llvm] r56585 - in /llvm/trunk:
	include/llvm/Target/TargetAsmInfo.h lib/Target/TargetAsmInfo.cpp
	lib/Target/X86/X86TargetAsmInfo.cpp	lib/Target/X86/X86TargetAsmInfo.h
	lib/Target/X86/X86TargetMachine.cpp
In-Reply-To: <687DE706-36A0-49BB-9E86-2C91B9AD3994@gmail.com>
References: <200809242221.m8OMLe9P025410@zion.cs.uiuc.edu>
	<687DE706-36A0-49BB-9E86-2C91B9AD3994@gmail.com>
Message-ID: <96CE2C1B-69ED-4433-80D7-499C45209708@apple.com>

I've backed 56585 - 56589 out for now. Anton, please fix.

Thanks,

Evan

On Sep 24, 2008, at 10:22 PM, Bill Wendling wrote:

> Anton,
>
> This patch is causing a build failure. Please investigate. I may have
> to revert all of your patches from 9/24.
>
> -bw
>
> llvm[2]: Linking Debug executable llc
> Undefined symbols:
>
> "llvm::ARMTargetAsmInfo<llvm::TargetAsmInfo>::getInlineAsmLength(char
> const*) const", referenced from:
>       vtable for llvm::ARMTargetAsmInfo<llvm::TargetAsmInfo>in
> LLVMARMCodeGen.o
>
> "llvm
> ::X86TargetAsmInfo
> <llvm::TargetAsmInfo>::ExpandInlineAsm(llvm::CallInst*) const",
> referenced from:
>       vtable for llvm::X86COFFTargetAsmInfoin LLVMX86CodeGen.o
>       vtable for llvm::X86TargetAsmInfo<llvm::TargetAsmInfo>in
> LLVMX86CodeGen.o
>       vtable for llvm::X86WinTargetAsmInfoin LLVMX86CodeGen.o
> ld: symbol(s) not found
> collect2: ld returned 1 exit status
> make[2]: *** [/Users/void/llvm/llvm.obj/Debug/bin/llc] Error 1
> make[1]: *** [llc/.makeall] Error 2
> make: *** [all] Error 1
>
> On Sep 24, 2008, at 3:21 PM, Anton Korobeynikov wrote:
>
>> Author: asl
>> Date: Wed Sep 24 17:21:39 2008
>> New Revision: 56585
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=56585&view=rev
>> Log:
>> Use crazy template-based inheritance instead of virtual one.
>>
>> Modified:
>>   llvm/trunk/include/llvm/Target/TargetAsmInfo.h
>>   llvm/trunk/lib/Target/TargetAsmInfo.cpp
>>   llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp
>>   llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h
>>   llvm/trunk/lib/Target/X86/X86TargetMachine.cpp
>>
>> Modified: llvm/trunk/include/llvm/Target/TargetAsmInfo.h
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetAsmInfo.h?rev=56585&r1=56584&r2=56585&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- llvm/trunk/include/llvm/Target/TargetAsmInfo.h (original)
>> +++ llvm/trunk/include/llvm/Target/TargetAsmInfo.h Wed Sep 24
>> 17:21:39 2008
>> @@ -124,6 +124,7 @@
>>  private:
>>    mutable StringMap<Section> Sections;
>>    mutable SectionFlags::FlagsStringsMapType FlagsStrings;
>> +    void fillDefaultValues();
>>  protected:
>>    //
>> ===------------------------------------------------------------------
>> ===//
>>    // Properties to be set by the target writer, used to configure
>> asm printer.
>> @@ -510,6 +511,7 @@
>>
>>  public:
>>    TargetAsmInfo();
>> +    TargetAsmInfo(const TargetMachine &TM);
>>    virtual ~TargetAsmInfo();
>>
>>    const Section* getNamedSection(const char *Name,
>>
>> Modified: llvm/trunk/lib/Target/TargetAsmInfo.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetAsmInfo.cpp?rev=56585&r1=56584&r2=56585&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- llvm/trunk/lib/Target/TargetAsmInfo.cpp (original)
>> +++ llvm/trunk/lib/Target/TargetAsmInfo.cpp Wed Sep 24 17:21:39 2008
>> @@ -25,100 +25,108 @@
>>
>> using namespace llvm;
>>
>> -TargetAsmInfo::TargetAsmInfo() :
>> -  TextSection(0),
>> -  DataSection(0),
>> -  BSSSection("\t.bss"),
>> -  BSSSection_(0),
>> -  ReadOnlySection(0),
>> -  SmallDataSection(0),
>> -  SmallBSSSection(0),
>> -  SmallRODataSection(0),
>> -  TLSDataSection(0),
>> -  TLSBSSSection(0),
>> -  ZeroFillDirective(0),
>> -  NonexecutableStackDirective(0),
>> -  NeedsSet(false),
>> -  MaxInstLength(4),
>> -  PCSymbol("$"),
>> -  SeparatorChar(';'),
>> -  CommentString("#"),
>> -  GlobalPrefix(""),
>> -  PrivateGlobalPrefix("."),
>> -  LessPrivateGlobalPrefix(""),
>> -  JumpTableSpecialLabelPrefix(0),
>> -  GlobalVarAddrPrefix(""),
>> -  GlobalVarAddrSuffix(""),
>> -  FunctionAddrPrefix(""),
>> -  FunctionAddrSuffix(""),
>> -  PersonalityPrefix(""),
>> -  PersonalitySuffix(""),
>> -  NeedsIndirectEncoding(false),
>> -  InlineAsmStart("#APP"),
>> -  InlineAsmEnd("#NO_APP"),
>> -  AssemblerDialect(0),
>> -  StringConstantPrefix(".str"),
>> -  ZeroDirective("\t.zero\t"),
>> -  ZeroDirectiveSuffix(0),
>> -  AsciiDirective("\t.ascii\t"),
>> -  AscizDirective("\t.asciz\t"),
>> -  Data8bitsDirective("\t.byte\t"),
>> -  Data16bitsDirective("\t.short\t"),
>> -  Data32bitsDirective("\t.long\t"),
>> -  Data64bitsDirective("\t.quad\t"),
>> -  AlignDirective("\t.align\t"),
>> -  AlignmentIsInBytes(true),
>> -  TextAlignFillValue(0),
>> -  SwitchToSectionDirective("\t.section\t"),
>> -  TextSectionStartSuffix(""),
>> -  DataSectionStartSuffix(""),
>> -  SectionEndDirectiveSuffix(0),
>> -  ConstantPoolSection("\t.section .rodata"),
>> -  JumpTableDataSection("\t.section .rodata"),
>> -  JumpTableDirective(0),
>> -  CStringSection(0),
>> -  CStringSection_(0),
>> -  StaticCtorsSection("\t.section .ctors,\"aw\", at progbits"),
>> -  StaticDtorsSection("\t.section .dtors,\"aw\", at progbits"),
>> -  GlobalDirective("\t.globl\t"),
>> -  SetDirective(0),
>> -  LCOMMDirective(0),
>> -  COMMDirective("\t.comm\t"),
>> -  COMMDirectiveTakesAlignment(true),
>> -  HasDotTypeDotSizeDirective(true),
>> -  UsedDirective(0),
>> -  WeakRefDirective(0),
>> -  WeakDefDirective(0),
>> -  HiddenDirective("\t.hidden\t"),
>> -  ProtectedDirective("\t.protected\t"),
>> -  AbsoluteDebugSectionOffsets(false),
>> -  AbsoluteEHSectionOffsets(false),
>> -  HasLEB128(false),
>> -  HasDotLocAndDotFile(false),
>> -  SupportsDebugInformation(false),
>> -  SupportsExceptionHandling(false),
>> -  DwarfRequiresFrameSection(true),
>> -  GlobalEHDirective(0),
>> -  SupportsWeakOmittedEHFrame(true),
>> -  DwarfSectionOffsetDirective(0),
>> -  DwarfAbbrevSection(".debug_abbrev"),
>> -  DwarfInfoSection(".debug_info"),
>> -  DwarfLineSection(".debug_line"),
>> -  DwarfFrameSection(".debug_frame"),
>> -  DwarfPubNamesSection(".debug_pubnames"),
>> -  DwarfPubTypesSection(".debug_pubtypes"),
>> -  DwarfStrSection(".debug_str"),
>> -  DwarfLocSection(".debug_loc"),
>> -  DwarfARangesSection(".debug_aranges"),
>> -  DwarfRangesSection(".debug_ranges"),
>> -  DwarfMacInfoSection(".debug_macinfo"),
>> -  DwarfEHFrameSection(".eh_frame"),
>> -  DwarfExceptionSection(".gcc_except_table"),
>> -  AsmTransCBE(0) {
>> +void TargetAsmInfo::fillDefaultValues() {
>> +  BSSSection = "\t.bss";
>> +  BSSSection_ = 0;
>> +  ReadOnlySection = 0;
>> +  SmallDataSection = 0;
>> +  SmallBSSSection = 0;
>> +  SmallRODataSection = 0;
>> +  TLSDataSection = 0;
>> +  TLSBSSSection = 0;
>> +  ZeroFillDirective = 0;
>> +  NonexecutableStackDirective = 0;
>> +  NeedsSet = false;
>> +  MaxInstLength = 4;
>> +  PCSymbol = "$";
>> +  SeparatorChar = ';';
>> +  CommentString = "#";
>> +  GlobalPrefix = "";
>> +  PrivateGlobalPrefix = ".";
>> +  LessPrivateGlobalPrefix = "";
>> +  JumpTableSpecialLabelPrefix = 0;
>> +  GlobalVarAddrPrefix = "";
>> +  GlobalVarAddrSuffix = "";
>> +  FunctionAddrPrefix = "";
>> +  FunctionAddrSuffix = "";
>> +  PersonalityPrefix = "";
>> +  PersonalitySuffix = "";
>> +  NeedsIndirectEncoding = false;
>> +  InlineAsmStart = "#APP";
>> +  InlineAsmEnd = "#NO_APP";
>> +  AssemblerDialect = 0;
>> +  StringConstantPrefix = ".str";
>> +  ZeroDirective = "\t.zero\t";
>> +  ZeroDirectiveSuffix = 0;
>> +  AsciiDirective = "\t.ascii\t";
>> +  AscizDirective = "\t.asciz\t";
>> +  Data8bitsDirective = "\t.byte\t";
>> +  Data16bitsDirective = "\t.short\t";
>> +  Data32bitsDirective = "\t.long\t";
>> +  Data64bitsDirective = "\t.quad\t";
>> +  AlignDirective = "\t.align\t";
>> +  AlignmentIsInBytes = true;
>> +  TextAlignFillValue = 0;
>> +  SwitchToSectionDirective = "\t.section\t";
>> +  TextSectionStartSuffix = "";
>> +  DataSectionStartSuffix = "";
>> +  SectionEndDirectiveSuffix = 0;
>> +  ConstantPoolSection = "\t.section .rodata";
>> +  JumpTableDataSection = "\t.section .rodata";
>> +  JumpTableDirective = 0;
>> +  CStringSection = 0;
>> +  CStringSection_ = 0;
>> +  // FIXME: Flags are ELFish - replace with normal section stuff.
>> +  StaticCtorsSection = "\t.section .ctors,\"aw\", at progbits";
>> +  StaticDtorsSection = "\t.section .dtors,\"aw\", at progbits";
>> +  GlobalDirective = "\t.globl\t";
>> +  SetDirective = 0;
>> +  LCOMMDirective = 0;
>> +  COMMDirective = "\t.comm\t";
>> +  COMMDirectiveTakesAlignment = true;
>> +  HasDotTypeDotSizeDirective = true;
>> +  UsedDirective = 0;
>> +  WeakRefDirective = 0;
>> +  WeakDefDirective = 0;
>> +  // FIXME: These are ELFish - move to ELFTAI.
>> +  HiddenDirective = "\t.hidden\t";
>> +  ProtectedDirective = "\t.protected\t";
>> +  AbsoluteDebugSectionOffsets = false;
>> +  AbsoluteEHSectionOffsets = false;
>> +  HasLEB128 = false;
>> +  HasDotLocAndDotFile = false;
>> +  SupportsDebugInformation = false;
>> +  SupportsExceptionHandling = false;
>> +  DwarfRequiresFrameSection = true;
>> +  GlobalEHDirective = 0;
>> +  SupportsWeakOmittedEHFrame = true;
>> +  DwarfSectionOffsetDirective = 0;
>> +  DwarfAbbrevSection = ".debug_abbrev";
>> +  DwarfInfoSection = ".debug_info";
>> +  DwarfLineSection = ".debug_line";
>> +  DwarfFrameSection = ".debug_frame";
>> +  DwarfPubNamesSection = ".debug_pubnames";
>> +  DwarfPubTypesSection = ".debug_pubtypes";
>> +  DwarfStrSection = ".debug_str";
>> +  DwarfLocSection = ".debug_loc";
>> +  DwarfARangesSection = ".debug_aranges";
>> +  DwarfRangesSection = ".debug_ranges";
>> +  DwarfMacInfoSection = ".debug_macinfo";
>> +  DwarfEHFrameSection = ".eh_frame";
>> +  DwarfExceptionSection = ".gcc_except_table";
>> +  AsmTransCBE = 0;
>>  TextSection = getUnnamedSection("\t.text", SectionFlags::Code);
>>  DataSection = getUnnamedSection("\t.data", SectionFlags::Writeable);
>> }
>>
>> +TargetAsmInfo::TargetAsmInfo() {
>> +  fillDefaultValues();
>> +}
>> +
>> +TargetAsmInfo::TargetAsmInfo(const TargetMachine &TM) {
>> +  fillDefaultValues();
>> +}
>> +
>> TargetAsmInfo::~TargetAsmInfo() {
>> }
>>
>>
>> Modified: llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp?rev=56585&r1=56584&r2=56585&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp (original)
>> +++ llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp Wed Sep 24
>> 17:21:39 2008
>> @@ -25,27 +25,20 @@
>> using namespace llvm;
>> using namespace llvm::dwarf;
>>
>> -static const char *const x86_asm_table[] = {
>> -                                      "{si}", "S",
>> -                                      "{di}", "D",
>> -                                      "{ax}", "a",
>> -                                      "{cx}", "c",
>> -                                      "{memory}", "memory",
>> -                                      "{flags}", "",
>> -                                      "{dirflag}", "",
>> -                                      "{fpsr}", "",
>> -                                      "{cc}", "cc",
>> -                                      0,0};
>> -
>> -X86TargetAsmInfo::X86TargetAsmInfo(const X86TargetMachine &TM) {
>> -  const X86Subtarget *Subtarget = &TM.getSubtarget<X86Subtarget>();
>> +const char *const llvm::x86_asm_table[] = {
>> +  "{si}", "S",
>> +  "{di}", "D",
>> +  "{ax}", "a",
>> +  "{cx}", "c",
>> +  "{memory}", "memory",
>> +  "{flags}", "",
>> +  "{dirflag}", "",
>> +  "{fpsr}", "",
>> +  "{cc}", "cc",
>> +  0,0};
>>
>> -  AsmTransCBE = x86_asm_table;
>> -
>> -  AssemblerDialect = Subtarget->getAsmFlavor();
>> -}
>> -
>> -bool X86TargetAsmInfo::LowerToBSwap(CallInst *CI) const {
>> +template <class BaseTAI>
>> +bool X86TargetAsmInfo<BaseTAI>::LowerToBSwap(CallInst *CI) const {
>>  // FIXME: this should verify that we are targetting a 486 or
>> better.  If not,
>>  // we will turn this bswap into something that will be lowered to
>> logical ops
>>  // instead of emitting the bswap asm.  For now, we don't support
>> 486 or lower
>> @@ -74,7 +67,8 @@
>>  return true;
>> }
>>
>> -bool X86TargetAsmInfo::ExpandInlineAsm(CallInst *CI) const {
>> +template <class BaseTAI>
>> +bool X86TargetAsmInfo<BaseTAI>::ExpandInlineAsm(CallInst *CI)  
>> const {
>>  InlineAsm *IA = cast<InlineAsm>(CI->getCalledValue());
>>  std::vector<InlineAsm::ConstraintInfo> Constraints = IA-
>>> ParseConstraints();
>>
>> @@ -125,7 +119,7 @@
>> }
>>
>> X86DarwinTargetAsmInfo::X86DarwinTargetAsmInfo(const
>> X86TargetMachine &TM):
>> -  X86TargetAsmInfo(TM), DarwinTargetAsmInfo(TM) {
>> +  X86TargetAsmInfo<DarwinTargetAsmInfo>(TM) {
>>  const X86Subtarget* Subtarget = &DTM->getSubtarget<X86Subtarget>();
>>  bool is64Bit = Subtarget->is64Bit();
>>
>> @@ -225,7 +219,7 @@
>> }
>>
>> X86ELFTargetAsmInfo::X86ELFTargetAsmInfo(const X86TargetMachine &TM):
>> -  X86TargetAsmInfo(TM), ELFTargetAsmInfo(TM) {
>> +  X86TargetAsmInfo<ELFTargetAsmInfo>(TM) {
>>
>>  CStringSection = ".rodata.str";
>>  PrivateGlobalPrefix = ".L";
>> @@ -302,7 +296,7 @@
>> }
>>
>> X86COFFTargetAsmInfo::X86COFFTargetAsmInfo(const X86TargetMachine
>> &TM):
>> -  X86TargetAsmInfo(TM) {
>> +  X86GenericTargetAsmInfo(TM) {
>>  X86TM = &TM;
>>
>>  GlobalPrefix = "_";
>> @@ -408,7 +402,7 @@
>> }
>>
>> X86WinTargetAsmInfo::X86WinTargetAsmInfo(const X86TargetMachine &TM):
>> -  X86TargetAsmInfo(TM) {
>> +  X86GenericTargetAsmInfo(TM) {
>>  GlobalPrefix = "_";
>>  CommentString = ";";
>>
>>
>> Modified: llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h?rev=56585&r1=56584&r2=56585&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h (original)
>> +++ llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h Wed Sep 24 17:21:39
>> 2008
>> @@ -14,17 +14,24 @@
>> #ifndef X86TARGETASMINFO_H
>> #define X86TARGETASMINFO_H
>>
>> +#include "X86TargetMachine.h"
>> #include "llvm/Target/TargetAsmInfo.h"
>> #include "llvm/Target/ELFTargetAsmInfo.h"
>> #include "llvm/Target/DarwinTargetAsmInfo.h"
>>
>> namespace llvm {
>>
>> -  // Forward declaration.
>> -  class X86TargetMachine;
>> +  extern const char *const x86_asm_table[];
>>
>> -  struct X86TargetAsmInfo : public virtual TargetAsmInfo {
>> -    explicit X86TargetAsmInfo(const X86TargetMachine &TM);
>> +  template <class BaseTAI>
>> +  struct X86TargetAsmInfo : public BaseTAI {
>> +    explicit X86TargetAsmInfo(const X86TargetMachine &TM):
>> +      BaseTAI(TM) {
>> +      const X86Subtarget *Subtarget =
>> &TM.getSubtarget<X86Subtarget>();
>> +
>> +      BaseTAI::AsmTransCBE = x86_asm_table;
>> +      BaseTAI::AssemblerDialect = Subtarget->getAsmFlavor();
>> +    }
>>
>>    virtual bool ExpandInlineAsm(CallInst *CI) const;
>>
>> @@ -32,21 +39,21 @@
>>    bool LowerToBSwap(CallInst *CI) const;
>>  };
>>
>> -  struct X86DarwinTargetAsmInfo : public X86TargetAsmInfo,
>> -                                  public DarwinTargetAsmInfo {
>> +  typedef X86TargetAsmInfo<TargetAsmInfo> X86GenericTargetAsmInfo;
>> +
>> +  struct X86DarwinTargetAsmInfo : public
>> X86TargetAsmInfo<DarwinTargetAsmInfo> {
>>    explicit X86DarwinTargetAsmInfo(const X86TargetMachine &TM);
>>    virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target
>> Reason,
>>                                           bool Global) const;
>>  };
>>
>> -  struct X86ELFTargetAsmInfo : public X86TargetAsmInfo,
>> -                               public ELFTargetAsmInfo {
>> +  struct X86ELFTargetAsmInfo : public
>> X86TargetAsmInfo<ELFTargetAsmInfo> {
>>    explicit X86ELFTargetAsmInfo(const X86TargetMachine &TM);
>>    virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target
>> Reason,
>>                                           bool Global) const;
>>  };
>>
>> -  struct X86COFFTargetAsmInfo : public X86TargetAsmInfo {
>> +  struct X86COFFTargetAsmInfo : public X86GenericTargetAsmInfo {
>>    explicit X86COFFTargetAsmInfo(const X86TargetMachine &TM);
>>    virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target
>> Reason,
>>                                           bool Global) const;
>> @@ -57,9 +64,11 @@
>>    const X86TargetMachine *X86TM;
>>  };
>>
>> -  struct X86WinTargetAsmInfo : public X86TargetAsmInfo {
>> +  struct X86WinTargetAsmInfo : public X86GenericTargetAsmInfo {
>>    explicit X86WinTargetAsmInfo(const X86TargetMachine &TM);
>>  };
>> +
>> } // namespace llvm
>>
>> #endif
>> +
>>
>> Modified: llvm/trunk/lib/Target/X86/X86TargetMachine.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetMachine.cpp?rev=56585&r1=56584&r2=56585&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/Target/X86/X86TargetMachine.cpp (original)
>> +++ llvm/trunk/lib/Target/X86/X86TargetMachine.cpp Wed Sep 24
>> 17:21:39 2008
>> @@ -54,7 +54,7 @@
>>     case X86Subtarget::isWindows:
>>      return new X86WinTargetAsmInfo(*this);
>>     default:
>> -      return new X86TargetAsmInfo(*this);
>> +      return new X86GenericTargetAsmInfo(*this);
>>    }
>> }
>>
>>
>>
>> _______________________________________________
>> 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 evan.cheng at apple.com  Thu Sep 25 02:38:10 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Thu, 25 Sep 2008 07:38:10 -0000
Subject: [llvm-commits] [llvm] r56607 - in /llvm/trunk:
 include/llvm/Target/DarwinTargetAsmInfo.h
 include/llvm/Target/ELFTargetAsmInfo.h include/llvm/Target/TargetAsmInfo.h
 lib/Target/ARM/ARMTargetAsmInfo.cpp lib/Target/ARM/ARMTargetAsmInfo.h
 lib/Target/ARM/ARMTargetMachine.cpp lib/Target/PowerPC/PPCTargetAsmInfo.cpp
 lib/Target/PowerPC/PPCTargetAsmInfo.h lib/Target/TargetAsmInfo.cpp
 lib/Target/X86/X86TargetAsmInfo.cpp lib/Target/X86/X86TargetAsmInfo.h
 lib/Target/X86/X86TargetMachine.cpp
Message-ID: <200809250738.m8P7cBLj015133@zion.cs.uiuc.edu>

Author: evancheng
Date: Thu Sep 25 02:38:08 2008
New Revision: 56607

URL: http://llvm.org/viewvc/llvm-project?rev=56607&view=rev
Log:
Temporarily backing out 56585:56589 to unbreak the build.

Modified:
    llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h
    llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h
    llvm/trunk/include/llvm/Target/TargetAsmInfo.h
    llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp
    llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h
    llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp
    llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp
    llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h
    llvm/trunk/lib/Target/TargetAsmInfo.cpp
    llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp
    llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h
    llvm/trunk/lib/Target/X86/X86TargetMachine.cpp

Modified: llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h?rev=56607&r1=56606&r2=56607&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h (original)
+++ llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h Thu Sep 25 02:38:08 2008
@@ -24,7 +24,7 @@
   class Type;
   class Mangler;
 
-  struct DarwinTargetAsmInfo: public TargetAsmInfo {
+  struct DarwinTargetAsmInfo: public virtual TargetAsmInfo {
     const Section* TextCoalSection;
     const Section* ConstDataCoalSection;
     const Section* ConstDataSection;

Modified: llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h?rev=56607&r1=56606&r2=56607&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h (original)
+++ llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h Thu Sep 25 02:38:08 2008
@@ -23,7 +23,7 @@
   class GlobalVariable;
   class Type;
 
-  struct ELFTargetAsmInfo: public TargetAsmInfo {
+  struct ELFTargetAsmInfo: public virtual TargetAsmInfo {
     explicit ELFTargetAsmInfo(const TargetMachine &TM);
 
     virtual const Section* SelectSectionForGlobal(const GlobalValue *GV) const;

Modified: llvm/trunk/include/llvm/Target/TargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetAsmInfo.h?rev=56607&r1=56606&r2=56607&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/TargetAsmInfo.h (original)
+++ llvm/trunk/include/llvm/Target/TargetAsmInfo.h Thu Sep 25 02:38:08 2008
@@ -124,7 +124,6 @@
   private:
     mutable StringMap<Section> Sections;
     mutable SectionFlags::FlagsStringsMapType FlagsStrings;
-    void fillDefaultValues();
   protected:
     //===------------------------------------------------------------------===//
     // Properties to be set by the target writer, used to configure asm printer.
@@ -511,7 +510,6 @@
 
   public:
     TargetAsmInfo();
-    TargetAsmInfo(const TargetMachine &TM);
     virtual ~TargetAsmInfo();
 
     const Section* getNamedSection(const char *Name,

Modified: llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp?rev=56607&r1=56606&r2=56607&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp Thu Sep 25 02:38:08 2008
@@ -17,7 +17,7 @@
 #include <cctype>
 using namespace llvm;
 
-const char *const llvm::arm_asm_table[] = {
+static const char *const arm_asm_table[] = {
                                       "{r0}", "r0",
                                       "{r1}", "r1",
                                       "{r2}", "r2",
@@ -42,10 +42,21 @@
                                       "{cc}", "cc",
                                       0,0};
 
-TEMPLATE_INSTANTIATION(class ARMTargetAsmInfo<TargetAsmInfo>);
+ARMTargetAsmInfo::ARMTargetAsmInfo(const ARMTargetMachine &TM) {
+  AsmTransCBE = arm_asm_table;
+
+  AlignmentIsInBytes = false;
+  Data64bitsDirective = 0;
+  CommentString = "@";
+  ConstantPoolSection = "\t.text\n";
+  COMMDirectiveTakesAlignment = false;
+  InlineAsmStart = "@ InlineAsm Start";
+  InlineAsmEnd = "@ InlineAsm End";
+  LCOMMDirective = "\t.lcomm\t";
+}
 
 ARMDarwinTargetAsmInfo::ARMDarwinTargetAsmInfo(const ARMTargetMachine &TM):
-  ARMTargetAsmInfo<DarwinTargetAsmInfo>(TM) {
+  ARMTargetAsmInfo(TM), DarwinTargetAsmInfo(TM) {
   Subtarget = &DTM->getSubtarget<ARMSubtarget>();
 
   GlobalPrefix = "_";
@@ -93,7 +104,7 @@
 }
 
 ARMELFTargetAsmInfo::ARMELFTargetAsmInfo(const ARMTargetMachine &TM):
-  ARMTargetAsmInfo<ELFTargetAsmInfo>(TM) {
+  ARMTargetAsmInfo(TM), ELFTargetAsmInfo(TM) {
   Subtarget = &ETM->getSubtarget<ARMSubtarget>();
 
   NeedsSet = false;
@@ -127,15 +138,13 @@
 
 /// Count the number of comma-separated arguments.
 /// Do not try to detect errors.
-template <class BaseTAI>
-unsigned ARMTargetAsmInfo<BaseTAI>::countArguments(const char* p) const {
+unsigned ARMTargetAsmInfo::countArguments(const char* p) const {
   unsigned count = 0;
   while (*p && isspace(*p) && *p != '\n')
     p++;
   count++;
-  while (*p && *p!='\n' &&
-         strncmp(p, BaseTAI::CommentString,
-                 strlen(BaseTAI::CommentString))!=0) {
+  while (*p && *p!='\n' && 
+         strncmp(p, CommentString, strlen(CommentString))!=0) {
     if (*p==',')
       count++;
     p++;
@@ -145,8 +154,7 @@
 
 /// Count the length of a string enclosed in quote characters.
 /// Do not try to detect errors.
-template <class BaseTAI>
-unsigned ARMTargetAsmInfo<BaseTAI>::countString(const char* p) const {
+unsigned ARMTargetAsmInfo::countString(const char* p) const {
   unsigned count = 0;
   while (*p && isspace(*p) && *p!='\n')
     p++;
@@ -158,8 +166,7 @@
 }
 
 /// ARM-specific version of TargetAsmInfo::getInlineAsmLength.
-template <class BaseTAI>
-unsigned ARMTargetAsmInfo<BaseTAI>::getInlineAsmLength(const char *s) const {
+unsigned ARMTargetAsmInfo::getInlineAsmLength(const char *s) const {
   // Make a lowercase-folded version of s for counting purposes.
   char *q, *s_copy = (char *)malloc(strlen(s) + 1);
   strcpy(s_copy, s);
@@ -185,7 +192,7 @@
           break;
         }
       // Ignore everything from comment char(s) to EOL
-      if (strncmp(Str, BaseTAI::CommentString, strlen(BaseTAI::CommentString))==-0)
+      if (strncmp(Str, CommentString, strlen(CommentString))==-0)
         atInsnStart = false;
       // FIXME do something like the following for non-Darwin
       else if (*Str == '.' && Subtarget->isTargetDarwin()) {
@@ -275,7 +282,7 @@
           Length += 4;    // ARM
       }
     }
-    if (*Str == '\n' || *Str == BaseTAI::SeparatorChar)
+    if (*Str == '\n' || *Str == SeparatorChar)
       atInsnStart = true;
   }
   free(s_copy);

Modified: llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h?rev=56607&r1=56606&r2=56607&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h (original)
+++ llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h Thu Sep 25 02:38:08 2008
@@ -14,31 +14,19 @@
 #ifndef ARMTARGETASMINFO_H
 #define ARMTARGETASMINFO_H
 
-#include "ARMTargetMachine.h"
 #include "llvm/Target/TargetAsmInfo.h"
 #include "llvm/Target/ELFTargetAsmInfo.h"
 #include "llvm/Target/DarwinTargetAsmInfo.h"
-#include "llvm/Support/Compiler.h"
+
+#include "ARMSubtarget.h"
 
 namespace llvm {
 
-  extern const char *const arm_asm_table[];
+  // Forward declaration.
+  class ARMTargetMachine;
 
-  template <class BaseTAI>
-  struct ARMTargetAsmInfo : public BaseTAI {
-    explicit ARMTargetAsmInfo(const ARMTargetMachine &TM):
-      BaseTAI(TM) {
-      BaseTAI::AsmTransCBE = arm_asm_table;
-
-      BaseTAI::AlignmentIsInBytes = false;
-      BaseTAI::Data64bitsDirective = 0;
-      BaseTAI::CommentString = "@";
-      BaseTAI::ConstantPoolSection = "\t.text\n";
-      BaseTAI::COMMDirectiveTakesAlignment = false;
-      BaseTAI::InlineAsmStart = "@ InlineAsm Start";
-      BaseTAI::InlineAsmEnd = "@ InlineAsm End";
-      BaseTAI::LCOMMDirective = "\t.lcomm\t";
-    }
+  struct ARMTargetAsmInfo : public virtual TargetAsmInfo {
+    explicit ARMTargetAsmInfo(const ARMTargetMachine &TM);
 
     const ARMSubtarget *Subtarget;
 
@@ -47,15 +35,13 @@
     unsigned countString(const char *p) const;
   };
 
-  typedef ARMTargetAsmInfo<TargetAsmInfo> ARMGenericTargetAsmInfo;
-
-  EXTERN_TEMPLATE_INSTANTIATION(class ARMTargetAsmInfo<TargetAsmInfo>);
-
-  struct ARMDarwinTargetAsmInfo : public ARMTargetAsmInfo<DarwinTargetAsmInfo> {
+  struct ARMDarwinTargetAsmInfo : public virtual ARMTargetAsmInfo,
+                                  public virtual DarwinTargetAsmInfo {
     explicit ARMDarwinTargetAsmInfo(const ARMTargetMachine &TM);
   };
 
-  struct ARMELFTargetAsmInfo : public ARMTargetAsmInfo<ELFTargetAsmInfo> {
+  struct ARMELFTargetAsmInfo : public virtual ARMTargetAsmInfo,
+                               public virtual ELFTargetAsmInfo {
     explicit ARMELFTargetAsmInfo(const ARMTargetMachine &TM);
   };
 

Modified: llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp?rev=56607&r1=56606&r2=56607&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp Thu Sep 25 02:38:08 2008
@@ -120,7 +120,7 @@
    case ARMSubtarget::isELF:
     return new ARMELFTargetAsmInfo(*this);
    default:
-    return new ARMGenericTargetAsmInfo(*this);
+    return new ARMTargetAsmInfo(*this);
   }
 }
 

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

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp Thu Sep 25 02:38:08 2008
@@ -19,10 +19,21 @@
 using namespace llvm;
 using namespace llvm::dwarf;
 
-TEMPLATE_INSTANTIATION(class PPCTargetAsmInfo<TargetAsmInfo>);
+PPCTargetAsmInfo::PPCTargetAsmInfo(const PPCTargetMachine &TM) {
+  bool isPPC64 = TM.getSubtargetImpl()->isPPC64();
+
+  ZeroDirective = "\t.space\t";
+  SetDirective = "\t.set";
+  Data64bitsDirective = isPPC64 ? "\t.quad\t" : 0;  
+  AlignmentIsInBytes = false;
+  LCOMMDirective = "\t.lcomm\t";
+  InlineAsmStart = "# InlineAsm Start";
+  InlineAsmEnd = "# InlineAsm End";
+  AssemblerDialect = TM.getSubtargetImpl()->getAsmFlavor();
+}
 
 PPCDarwinTargetAsmInfo::PPCDarwinTargetAsmInfo(const PPCTargetMachine &TM):
-  PPCTargetAsmInfo<DarwinTargetAsmInfo>(TM) {
+  PPCTargetAsmInfo(TM), DarwinTargetAsmInfo(TM) {
   PCSymbol = ".";
   CommentString = ";";
   GlobalPrefix = "_";
@@ -92,7 +103,7 @@
 
 
 PPCLinuxTargetAsmInfo::PPCLinuxTargetAsmInfo(const PPCTargetMachine &TM) :
-  PPCTargetAsmInfo<ELFTargetAsmInfo>(TM) {
+  PPCTargetAsmInfo(TM), ELFTargetAsmInfo(TM) {
   CommentString = "#";
   GlobalPrefix = "";
   PrivateGlobalPrefix = "";

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

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h Thu Sep 25 02:38:08 2008
@@ -14,43 +14,28 @@
 #ifndef PPCTARGETASMINFO_H
 #define PPCTARGETASMINFO_H
 
-#include "PPCTargetMachine.h"
 #include "llvm/Target/TargetAsmInfo.h"
 #include "llvm/Target/DarwinTargetAsmInfo.h"
 #include "llvm/Target/ELFTargetAsmInfo.h"
-#include "llvm/Support/Compiler.h"
 
 namespace llvm {
 
-  template <class BaseTAI>
-  struct PPCTargetAsmInfo : public BaseTAI {
-    explicit PPCTargetAsmInfo(const PPCTargetMachine &TM):
-      BaseTAI(TM) {
-      const PPCSubtarget *Subtarget = &TM.getSubtarget<PPCSubtarget>();
-      bool isPPC64 = Subtarget->isPPC64();
-
-      BaseTAI::ZeroDirective = "\t.space\t";
-      BaseTAI::SetDirective = "\t.set";
-      BaseTAI::Data64bitsDirective = isPPC64 ? "\t.quad\t" : 0;
-      BaseTAI::AlignmentIsInBytes = false;
-      BaseTAI::LCOMMDirective = "\t.lcomm\t";
-      BaseTAI::InlineAsmStart = "# InlineAsm Start";
-      BaseTAI::InlineAsmEnd = "# InlineAsm End";
-      BaseTAI::AssemblerDialect = Subtarget->getAsmFlavor();
-    }
-  };
-
-  typedef PPCTargetAsmInfo<TargetAsmInfo> PPCGenericTargetAsmInfo;
+  // Forward declaration.
+  class PPCTargetMachine;
 
-  EXTERN_TEMPLATE_INSTANTIATION(class PPCTargetAsmInfo<TargetAsmInfo>);
+  struct PPCTargetAsmInfo : public virtual TargetAsmInfo {
+    explicit PPCTargetAsmInfo(const PPCTargetMachine &TM);
+  };
 
-  struct PPCDarwinTargetAsmInfo : public PPCTargetAsmInfo<DarwinTargetAsmInfo> {
+  struct PPCDarwinTargetAsmInfo : public PPCTargetAsmInfo,
+                                  public DarwinTargetAsmInfo {
     explicit PPCDarwinTargetAsmInfo(const PPCTargetMachine &TM);
     virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target Reason,
                                            bool Global) const;
   };
 
-  struct PPCLinuxTargetAsmInfo : public PPCTargetAsmInfo<ELFTargetAsmInfo> {
+  struct PPCLinuxTargetAsmInfo : public PPCTargetAsmInfo,
+                                 public ELFTargetAsmInfo {
     explicit PPCLinuxTargetAsmInfo(const PPCTargetMachine &TM);
     virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target Reason,
                                            bool Global) const;

Modified: llvm/trunk/lib/Target/TargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetAsmInfo.cpp?rev=56607&r1=56606&r2=56607&view=diff

==============================================================================
--- llvm/trunk/lib/Target/TargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/TargetAsmInfo.cpp Thu Sep 25 02:38:08 2008
@@ -25,108 +25,100 @@
 
 using namespace llvm;
 
-void TargetAsmInfo::fillDefaultValues() {
-  BSSSection = "\t.bss";
-  BSSSection_ = 0;
-  ReadOnlySection = 0;
-  SmallDataSection = 0;
-  SmallBSSSection = 0;
-  SmallRODataSection = 0;
-  TLSDataSection = 0;
-  TLSBSSSection = 0;
-  ZeroFillDirective = 0;
-  NonexecutableStackDirective = 0;
-  NeedsSet = false;
-  MaxInstLength = 4;
-  PCSymbol = "$";
-  SeparatorChar = ';';
-  CommentString = "#";
-  GlobalPrefix = "";
-  PrivateGlobalPrefix = ".";
-  LessPrivateGlobalPrefix = "";
-  JumpTableSpecialLabelPrefix = 0;
-  GlobalVarAddrPrefix = "";
-  GlobalVarAddrSuffix = "";
-  FunctionAddrPrefix = "";
-  FunctionAddrSuffix = "";
-  PersonalityPrefix = "";
-  PersonalitySuffix = "";
-  NeedsIndirectEncoding = false;
-  InlineAsmStart = "#APP";
-  InlineAsmEnd = "#NO_APP";
-  AssemblerDialect = 0;
-  StringConstantPrefix = ".str";
-  ZeroDirective = "\t.zero\t";
-  ZeroDirectiveSuffix = 0;
-  AsciiDirective = "\t.ascii\t";
-  AscizDirective = "\t.asciz\t";
-  Data8bitsDirective = "\t.byte\t";
-  Data16bitsDirective = "\t.short\t";
-  Data32bitsDirective = "\t.long\t";
-  Data64bitsDirective = "\t.quad\t";
-  AlignDirective = "\t.align\t";
-  AlignmentIsInBytes = true;
-  TextAlignFillValue = 0;
-  SwitchToSectionDirective = "\t.section\t";
-  TextSectionStartSuffix = "";
-  DataSectionStartSuffix = "";
-  SectionEndDirectiveSuffix = 0;
-  ConstantPoolSection = "\t.section .rodata";
-  JumpTableDataSection = "\t.section .rodata";
-  JumpTableDirective = 0;
-  CStringSection = 0;
-  CStringSection_ = 0;
-  // FIXME: Flags are ELFish - replace with normal section stuff.
-  StaticCtorsSection = "\t.section .ctors,\"aw\", at progbits";
-  StaticDtorsSection = "\t.section .dtors,\"aw\", at progbits";
-  GlobalDirective = "\t.globl\t";
-  SetDirective = 0;
-  LCOMMDirective = 0;
-  COMMDirective = "\t.comm\t";
-  COMMDirectiveTakesAlignment = true;
-  HasDotTypeDotSizeDirective = true;
-  UsedDirective = 0;
-  WeakRefDirective = 0;
-  WeakDefDirective = 0;
-  // FIXME: These are ELFish - move to ELFTAI.
-  HiddenDirective = "\t.hidden\t";
-  ProtectedDirective = "\t.protected\t";
-  AbsoluteDebugSectionOffsets = false;
-  AbsoluteEHSectionOffsets = false;
-  HasLEB128 = false;
-  HasDotLocAndDotFile = false;
-  SupportsDebugInformation = false;
-  SupportsExceptionHandling = false;
-  DwarfRequiresFrameSection = true;
-  GlobalEHDirective = 0;
-  SupportsWeakOmittedEHFrame = true;
-  DwarfSectionOffsetDirective = 0;
-  DwarfAbbrevSection = ".debug_abbrev";
-  DwarfInfoSection = ".debug_info";
-  DwarfLineSection = ".debug_line";
-  DwarfFrameSection = ".debug_frame";
-  DwarfPubNamesSection = ".debug_pubnames";
-  DwarfPubTypesSection = ".debug_pubtypes";
-  DwarfStrSection = ".debug_str";
-  DwarfLocSection = ".debug_loc";
-  DwarfARangesSection = ".debug_aranges";
-  DwarfRangesSection = ".debug_ranges";
-  DwarfMacInfoSection = ".debug_macinfo";
-  DwarfEHFrameSection = ".eh_frame";
-  DwarfExceptionSection = ".gcc_except_table";
-  AsmTransCBE = 0;
+TargetAsmInfo::TargetAsmInfo() :
+  TextSection(0),
+  DataSection(0),
+  BSSSection("\t.bss"),
+  BSSSection_(0),
+  ReadOnlySection(0),
+  SmallDataSection(0),
+  SmallBSSSection(0),
+  SmallRODataSection(0),
+  TLSDataSection(0),
+  TLSBSSSection(0),
+  ZeroFillDirective(0),
+  NonexecutableStackDirective(0),
+  NeedsSet(false),
+  MaxInstLength(4),
+  PCSymbol("$"),
+  SeparatorChar(';'),
+  CommentString("#"),
+  GlobalPrefix(""),
+  PrivateGlobalPrefix("."),
+  LessPrivateGlobalPrefix(""),
+  JumpTableSpecialLabelPrefix(0),
+  GlobalVarAddrPrefix(""),
+  GlobalVarAddrSuffix(""),
+  FunctionAddrPrefix(""),
+  FunctionAddrSuffix(""),
+  PersonalityPrefix(""),
+  PersonalitySuffix(""),
+  NeedsIndirectEncoding(false),
+  InlineAsmStart("#APP"),
+  InlineAsmEnd("#NO_APP"),
+  AssemblerDialect(0),
+  StringConstantPrefix(".str"),
+  ZeroDirective("\t.zero\t"),
+  ZeroDirectiveSuffix(0),
+  AsciiDirective("\t.ascii\t"),
+  AscizDirective("\t.asciz\t"),
+  Data8bitsDirective("\t.byte\t"),
+  Data16bitsDirective("\t.short\t"),
+  Data32bitsDirective("\t.long\t"),
+  Data64bitsDirective("\t.quad\t"),
+  AlignDirective("\t.align\t"),
+  AlignmentIsInBytes(true),
+  TextAlignFillValue(0),
+  SwitchToSectionDirective("\t.section\t"),
+  TextSectionStartSuffix(""),
+  DataSectionStartSuffix(""),
+  SectionEndDirectiveSuffix(0),
+  ConstantPoolSection("\t.section .rodata"),
+  JumpTableDataSection("\t.section .rodata"),
+  JumpTableDirective(0),
+  CStringSection(0),
+  CStringSection_(0),
+  StaticCtorsSection("\t.section .ctors,\"aw\", at progbits"),
+  StaticDtorsSection("\t.section .dtors,\"aw\", at progbits"),
+  GlobalDirective("\t.globl\t"),
+  SetDirective(0),
+  LCOMMDirective(0),
+  COMMDirective("\t.comm\t"),
+  COMMDirectiveTakesAlignment(true),
+  HasDotTypeDotSizeDirective(true),
+  UsedDirective(0),
+  WeakRefDirective(0),
+  WeakDefDirective(0),
+  HiddenDirective("\t.hidden\t"),
+  ProtectedDirective("\t.protected\t"),
+  AbsoluteDebugSectionOffsets(false),
+  AbsoluteEHSectionOffsets(false),
+  HasLEB128(false),
+  HasDotLocAndDotFile(false),
+  SupportsDebugInformation(false),
+  SupportsExceptionHandling(false),
+  DwarfRequiresFrameSection(true),
+  GlobalEHDirective(0),
+  SupportsWeakOmittedEHFrame(true),
+  DwarfSectionOffsetDirective(0),
+  DwarfAbbrevSection(".debug_abbrev"),
+  DwarfInfoSection(".debug_info"),
+  DwarfLineSection(".debug_line"),
+  DwarfFrameSection(".debug_frame"),
+  DwarfPubNamesSection(".debug_pubnames"),
+  DwarfPubTypesSection(".debug_pubtypes"),
+  DwarfStrSection(".debug_str"),
+  DwarfLocSection(".debug_loc"),
+  DwarfARangesSection(".debug_aranges"),
+  DwarfRangesSection(".debug_ranges"),
+  DwarfMacInfoSection(".debug_macinfo"),
+  DwarfEHFrameSection(".eh_frame"),
+  DwarfExceptionSection(".gcc_except_table"),
+  AsmTransCBE(0) {
   TextSection = getUnnamedSection("\t.text", SectionFlags::Code);
   DataSection = getUnnamedSection("\t.data", SectionFlags::Writeable);
 }
 
-TargetAsmInfo::TargetAsmInfo() {
-  fillDefaultValues();
-}
-
-TargetAsmInfo::TargetAsmInfo(const TargetMachine &TM) {
-  fillDefaultValues();
-}
-
 TargetAsmInfo::~TargetAsmInfo() {
 }
 

Modified: llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp?rev=56607&r1=56606&r2=56607&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp Thu Sep 25 02:38:08 2008
@@ -25,22 +25,27 @@
 using namespace llvm;
 using namespace llvm::dwarf;
 
-const char *const llvm::x86_asm_table[] = {
-  "{si}", "S",
-  "{di}", "D",
-  "{ax}", "a",
-  "{cx}", "c",
-  "{memory}", "memory",
-  "{flags}", "",
-  "{dirflag}", "",
-  "{fpsr}", "",
-  "{cc}", "cc",
-  0,0};
+static const char *const x86_asm_table[] = {
+                                      "{si}", "S",
+                                      "{di}", "D",
+                                      "{ax}", "a",
+                                      "{cx}", "c",
+                                      "{memory}", "memory",
+                                      "{flags}", "",
+                                      "{dirflag}", "",
+                                      "{fpsr}", "",
+                                      "{cc}", "cc",
+                                      0,0};
+
+X86TargetAsmInfo::X86TargetAsmInfo(const X86TargetMachine &TM) {
+  const X86Subtarget *Subtarget = &TM.getSubtarget<X86Subtarget>();
 
-TEMPLATE_INSTANTIATION(class X86TargetAsmInfo<TargetAsmInfo>);
+  AsmTransCBE = x86_asm_table;
 
-template <class BaseTAI>
-bool X86TargetAsmInfo<BaseTAI>::LowerToBSwap(CallInst *CI) const {
+  AssemblerDialect = Subtarget->getAsmFlavor();
+}
+
+bool X86TargetAsmInfo::LowerToBSwap(CallInst *CI) const {
   // FIXME: this should verify that we are targetting a 486 or better.  If not,
   // we will turn this bswap into something that will be lowered to logical ops
   // instead of emitting the bswap asm.  For now, we don't support 486 or lower
@@ -69,8 +74,7 @@
   return true;
 }
 
-template <class BaseTAI>
-bool X86TargetAsmInfo<BaseTAI>::ExpandInlineAsm(CallInst *CI) const {
+bool X86TargetAsmInfo::ExpandInlineAsm(CallInst *CI) const {
   InlineAsm *IA = cast<InlineAsm>(CI->getCalledValue());
   std::vector<InlineAsm::ConstraintInfo> Constraints = IA->ParseConstraints();
 
@@ -121,7 +125,7 @@
 }
 
 X86DarwinTargetAsmInfo::X86DarwinTargetAsmInfo(const X86TargetMachine &TM):
-  X86TargetAsmInfo<DarwinTargetAsmInfo>(TM) {
+  X86TargetAsmInfo(TM), DarwinTargetAsmInfo(TM) {
   const X86Subtarget* Subtarget = &DTM->getSubtarget<X86Subtarget>();
   bool is64Bit = Subtarget->is64Bit();
 
@@ -221,7 +225,7 @@
 }
 
 X86ELFTargetAsmInfo::X86ELFTargetAsmInfo(const X86TargetMachine &TM):
-  X86TargetAsmInfo<ELFTargetAsmInfo>(TM) {
+  X86TargetAsmInfo(TM), ELFTargetAsmInfo(TM) {
 
   CStringSection = ".rodata.str";
   PrivateGlobalPrefix = ".L";
@@ -298,7 +302,7 @@
 }
 
 X86COFFTargetAsmInfo::X86COFFTargetAsmInfo(const X86TargetMachine &TM):
-  X86GenericTargetAsmInfo(TM) {
+  X86TargetAsmInfo(TM) {
   X86TM = &TM;
 
   GlobalPrefix = "_";
@@ -404,7 +408,7 @@
 }
 
 X86WinTargetAsmInfo::X86WinTargetAsmInfo(const X86TargetMachine &TM):
-  X86GenericTargetAsmInfo(TM) {
+  X86TargetAsmInfo(TM) {
   GlobalPrefix = "_";
   CommentString = ";";
 

Modified: llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h?rev=56607&r1=56606&r2=56607&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h (original)
+++ llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h Thu Sep 25 02:38:08 2008
@@ -14,25 +14,17 @@
 #ifndef X86TARGETASMINFO_H
 #define X86TARGETASMINFO_H
 
-#include "X86TargetMachine.h"
 #include "llvm/Target/TargetAsmInfo.h"
 #include "llvm/Target/ELFTargetAsmInfo.h"
 #include "llvm/Target/DarwinTargetAsmInfo.h"
-#include "llvm/Support/Compiler.h"
 
 namespace llvm {
 
-  extern const char *const x86_asm_table[];
+  // Forward declaration.
+  class X86TargetMachine;
 
-  template <class BaseTAI>
-  struct X86TargetAsmInfo : public BaseTAI {
-    explicit X86TargetAsmInfo(const X86TargetMachine &TM):
-      BaseTAI(TM) {
-      const X86Subtarget *Subtarget = &TM.getSubtarget<X86Subtarget>();
-
-      BaseTAI::AsmTransCBE = x86_asm_table;
-      BaseTAI::AssemblerDialect = Subtarget->getAsmFlavor();
-    }
+  struct X86TargetAsmInfo : public virtual TargetAsmInfo {
+    explicit X86TargetAsmInfo(const X86TargetMachine &TM);
 
     virtual bool ExpandInlineAsm(CallInst *CI) const;
 
@@ -40,23 +32,21 @@
     bool LowerToBSwap(CallInst *CI) const;
   };
 
-  typedef X86TargetAsmInfo<TargetAsmInfo> X86GenericTargetAsmInfo;
-
-  EXTERN_TEMPLATE_INSTANTIATION(class X86TargetAsmInfo<TargetAsmInfo>);
-
-  struct X86DarwinTargetAsmInfo : public X86TargetAsmInfo<DarwinTargetAsmInfo> {
+  struct X86DarwinTargetAsmInfo : public X86TargetAsmInfo,
+                                  public DarwinTargetAsmInfo {
     explicit X86DarwinTargetAsmInfo(const X86TargetMachine &TM);
     virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target Reason,
                                            bool Global) const;
   };
 
-  struct X86ELFTargetAsmInfo : public X86TargetAsmInfo<ELFTargetAsmInfo> {
+  struct X86ELFTargetAsmInfo : public X86TargetAsmInfo,
+                               public ELFTargetAsmInfo {
     explicit X86ELFTargetAsmInfo(const X86TargetMachine &TM);
     virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target Reason,
                                            bool Global) const;
   };
 
-  struct X86COFFTargetAsmInfo : public X86GenericTargetAsmInfo {
+  struct X86COFFTargetAsmInfo : public X86TargetAsmInfo {
     explicit X86COFFTargetAsmInfo(const X86TargetMachine &TM);
     virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target Reason,
                                            bool Global) const;
@@ -67,11 +57,9 @@
     const X86TargetMachine *X86TM;
   };
 
-  struct X86WinTargetAsmInfo : public X86GenericTargetAsmInfo {
+  struct X86WinTargetAsmInfo : public X86TargetAsmInfo {
     explicit X86WinTargetAsmInfo(const X86TargetMachine &TM);
   };
-
 } // namespace llvm
 
 #endif
-

Modified: llvm/trunk/lib/Target/X86/X86TargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetMachine.cpp?rev=56607&r1=56606&r2=56607&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetMachine.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86TargetMachine.cpp Thu Sep 25 02:38:08 2008
@@ -54,7 +54,7 @@
      case X86Subtarget::isWindows:
       return new X86WinTargetAsmInfo(*this);
      default:
-      return new X86GenericTargetAsmInfo(*this);
+      return new X86TargetAsmInfo(*this);
     }
 }
 




From baldrick at free.fr  Thu Sep 25 03:24:52 2008
From: baldrick at free.fr (Duncan Sands)
Date: Thu, 25 Sep 2008 10:24:52 +0200
Subject: [llvm-commits]
 =?iso-8859-1?q?=5Bllvm=5D_r55638=09-=09/llvm/trunk?=
 =?iso-8859-1?q?/include/llvm/Function=2Eh?=
In-Reply-To: <1E87DEA3-DC60-4806-9E87-B8299D0B430F@apple.com>
References: <200809021833.m82IXtBb013569@zion.cs.uiuc.edu>
	<200809242111.26563.baldrick@free.fr>
	<1E87DEA3-DC60-4806-9E87-B8299D0B430F@apple.com>
Message-ID: <200809251024.52922.baldrick@free.fr>

> >> The pass that updates readonly and readone status can look at call
> >> llvm.log parameters and do the right thing.
> >
> > Not if there are several calls to it with different parameters,
> > which may be the case with link time optimization.
> 
> Would it be possible for you to give an example here ? Thx.

Module A is compiled with -ffast-math.  All calls to llvm.log
are therefore of the form:
  %x = call double @llvm.log(double %a, i1 0, i1 0) readnone

Module B is compiled without -ffast-math and with errno math.
All calls to llvm.log are therefore of the form:
  %y = call double @llvm.log(double %b, i1 1, i1 1)

[In both modules llvm.log is declared as:
 double llvm.log(double, i1, i1)
i.e. with no readonly/readnone attributes.]

Now llvm-link modules A and B to form module C.  In module C you
have two calls to llvm.log:
  %x = call double @llvm.log(double %a, i1 0, i1 0) readnone
  %y = call double @llvm.log(double %b, i1 1, i1 1)
while llvm.log itself is still declared as
 double llvm.log(double, i1, i1)

The optimizers understand that the first call does not access
memory while the second call does (writes errno), because alias
analysis automatically looks at both the attributes of the callsite
and of the callee (this is the situation right now).

> >  Also, this
> > is a general mechanism - imagine it being used not for an llvm
> > intrinsic but for a routine from a runtime library; then llvm
> > wouldn't know about the special properties of the function.  But
> > that's ok, it doesn't have to!
> 
> Sorry for being dense. I do not understand.
> If I am using a library function F then I want the optimizer to know  
> whether F is readonly or not. I do not care whether llvm.log() called  
> by F is readonly or not.

What does readonly mean?  It means that there are no stores to non-local
memory.  Define a call to be a readonly call if that particular call does
not store to non-local memory.  You can imagine a clever alias analysis
that is capable of working out whether a particular call is readonly: it
would look at the parameters of the callsite, look at the callee, analyse
control flow in the callee given the particular parameter values passed,
observe that for these particular parameter values there are no stores to
non-local memory, and deduce that this particular call was a readonly call.
Note that another call to the *same function* may not be a readonly call.
Define a function to be readonly if it never writes to non-local memory,
no matter what parameter values are passed to it.

Thus if a function is readonly then all calls to it are readonly calls.
If a function is not readonly then some calls to it might nonetheless
be readonly calls.

We have the infrastructure already corresponding to these notions:
if a function is marked with the 'readonly' attribute then it is
a readonly function.  If a callsite is marked with the 'readonly'
attribute or if the callee function is marked with the 'readonly'
attribute then it is a readonly call (the onlyReadsMemory CallSite
method implements this logic; it is used by alias analysis and a
bunch of other places).

Ciao,

Duncan.

PS: This infrastructure also makes it possible to mark indirect calls
"readonly".

PPS: I think it is pointless to discuss whether having readonly attributes
on callsites is useful or not.  It clearly *might* be useful.  What is better
to discuss is whether the usefulness (it is not very useful) outweighs the
costs.  Is there a benefit to eliminating this facility?  How much benefit
is there, and does it outweigh the loss?  Personally I don't see any reason
to eliminate it, and if readonly is left alone then my love for logic and
consistency tells me that noinline and alwaysinline should be done this way
too.


From gohman at apple.com  Thu Sep 25 10:24:29 2008
From: gohman at apple.com (Dan Gohman)
Date: Thu, 25 Sep 2008 15:24:29 -0000
Subject: [llvm-commits] [llvm] r56608 -
	/llvm/trunk/lib/Target/X86/X86FastISel.cpp
Message-ID: <200809251524.m8PFOTvZ006794@zion.cs.uiuc.edu>

Author: djg
Date: Thu Sep 25 10:24:26 2008
New Revision: 56608

URL: http://llvm.org/viewvc/llvm-project?rev=56608&view=rev
Log:
PIC support in X86FastISel.

Modified:
    llvm/trunk/lib/Target/X86/X86FastISel.cpp

Modified: llvm/trunk/lib/Target/X86/X86FastISel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86FastISel.cpp?rev=56608&r1=56607&r2=56608&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86FastISel.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86FastISel.cpp Thu Sep 25 10:24:26 2008
@@ -40,6 +40,10 @@
   ///
   unsigned StackPtr;
 
+  /// GlobalBaseReg - keeps track of the virtual register mapped onto global
+  /// base register.
+  unsigned GlobalBaseReg;
+
   /// X86ScalarSSEf32, X86ScalarSSEf64 - Select between SSE or x87 
   /// floating point ops.
   /// When SSE is available, use it for f32 operations.
@@ -56,6 +60,7 @@
     : FastISel(mf, mmi, vm, bm, am) {
     Subtarget = &TM.getSubtarget<X86Subtarget>();
     StackPtr = Subtarget->is64Bit() ? X86::RSP : X86::ESP;
+    GlobalBaseReg = 0;
     X86ScalarSSEf64 = Subtarget->hasSSE2();
     X86ScalarSSEf32 = Subtarget->hasSSE1();
   }
@@ -98,6 +103,12 @@
 
   CCAssignFn *CCAssignFnForCall(unsigned CC, bool isTailCall = false);
 
+  unsigned getGlobalBaseReg();
+
+  const X86InstrInfo *getInstrInfo() const {
+    return static_cast<const X86InstrInfo *>(TM.getInstrInfo());
+  }
+
   unsigned TargetMaterializeConstant(Constant *C);
 
   unsigned TargetMaterializeAlloca(AllocaInst *C);
@@ -127,6 +138,16 @@
   return (AllowI1 && VT == MVT::i1) || TLI.isTypeLegal(VT);
 }
 
+/// getGlobalBaseReg - Return the the global base register. Output
+/// instructions required to initialize the global base register, if necessary.
+///
+unsigned X86FastISel::getGlobalBaseReg() {
+  assert(!Subtarget->is64Bit() && "X86-64 PIC uses RIP relative addressing");
+  if (!GlobalBaseReg)
+    GlobalBaseReg = getInstrInfo()->initializeGlobalBaseReg(MBB->getParent());
+  return GlobalBaseReg;
+}
+
 #include "X86GenCallingConv.inc"
 
 /// CCAssignFnForCall - Selects the correct CCAssignFn for a given calling
@@ -375,11 +396,25 @@
 
   // Handle constant address.
   if (GlobalValue *GV = dyn_cast<GlobalValue>(V)) {
+    // Can't handle alternate code models yet.
+    if (TM.getCodeModel() != CodeModel::Default &&
+        TM.getCodeModel() != CodeModel::Small)
+      return false;
+
+    // Set up the basic address.
+    AM.GV = GV;
+    if (!isCall &&
+        TM.getRelocationModel() == Reloc::PIC_ &&
+        !Subtarget->is64Bit())
+      AM.Base.Reg = getGlobalBaseReg();
+
+    // Emit an extra load if the ABI requires it.
     if (Subtarget->GVRequiresExtraLoad(GV, TM, isCall)) {
       // Check to see if we've already materialized this
       // value in a register in this block.
       if (unsigned Reg = LocalValueMap[V]) {
         AM.Base.Reg = Reg;
+        AM.GV = 0;
         return true;
       }
       // Issue load from stub if necessary.
@@ -392,14 +427,12 @@
         Opc = X86::MOV64rm;
         RC  = X86::GR64RegisterClass;
       }
-      AM.Base.Reg = createResultReg(RC);
-      X86AddressMode LocalAM;
-      LocalAM.GV = GV;
-      addFullAddress(BuildMI(MBB, TII.get(Opc), AM.Base.Reg), LocalAM);
+      unsigned ResultReg = createResultReg(RC);
+      addFullAddress(BuildMI(MBB, TII.get(Opc), ResultReg), AM);
+      AM.Base.Reg = ResultReg;
+      AM.GV = 0;
       // Prevent loading GV stub multiple times in same MBB.
       LocalValueMap[V] = AM.Base.Reg;
-    } else {
-      AM.GV = GV;
     }
     return true;
   }
@@ -957,6 +990,17 @@
     }
   }
 
+  // ELF / PIC requires GOT in the EBX register before function calls via PLT
+  // GOT pointer.  
+  if (!Subtarget->is64Bit() &&
+      TM.getRelocationModel() == Reloc::PIC_ &&
+      Subtarget->isPICStyleGOT()) {
+    TargetRegisterClass *RC = X86::GR32RegisterClass;
+    unsigned Base = getGlobalBaseReg();
+    bool Emitted = TII.copyRegToReg(*MBB, MBB->end(), X86::EBX, Base, RC, RC);
+    assert(Emitted && "Failed to emit a copy instruction!");
+  }
+
   // Issue the call.
   unsigned CallOpc = CalleeOp
     ? (Subtarget->is64Bit() ? X86::CALL64r       : X86::CALL32r)
@@ -964,6 +1008,13 @@
   MachineInstrBuilder MIB = CalleeOp
     ? BuildMI(MBB, TII.get(CallOpc)).addReg(CalleeOp)
     : BuildMI(MBB, TII.get(CallOpc)).addGlobalAddress(GV);
+
+  // Add an implicit use GOT pointer in EBX.
+  if (!Subtarget->is64Bit() &&
+      TM.getRelocationModel() == Reloc::PIC_ &&
+      Subtarget->isPICStyleGOT())
+    MIB.addReg(X86::EBX);
+
   // Add implicit physical register uses to the call.
   while (!RegArgs.empty()) {
     MIB.addReg(RegArgs.back());
@@ -1065,10 +1116,6 @@
 }
 
 unsigned X86FastISel::TargetMaterializeConstant(Constant *C) {
-  // Can't handle PIC-mode yet.
-  if (TM.getRelocationModel() == Reloc::PIC_)
-    return 0;
-  
   MVT VT;
   if (!isTypeLegal(C->getType(), TLI, VT))
     return false;




From gohman at apple.com  Thu Sep 25 12:05:26 2008
From: gohman at apple.com (Dan Gohman)
Date: Thu, 25 Sep 2008 17:05:26 -0000
Subject: [llvm-commits] [llvm] r56610 - in /llvm/trunk:
 include/llvm/CodeGen/FastISel.h lib/CodeGen/SelectionDAG/FastISel.cpp
 lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
 lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
Message-ID: <200809251705.m8PH5Rwo009666@zion.cs.uiuc.edu>

Author: djg
Date: Thu Sep 25 12:05:24 2008
New Revision: 56610

URL: http://llvm.org/viewvc/llvm-project?rev=56610&view=rev
Log:
FastISel support for debug info.

Modified:
    llvm/trunk/include/llvm/CodeGen/FastISel.h
    llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp

Modified: llvm/trunk/include/llvm/CodeGen/FastISel.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/FastISel.h?rev=56610&r1=56609&r2=56610&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/FastISel.h (original)
+++ llvm/trunk/include/llvm/CodeGen/FastISel.h Thu Sep 25 12:05:24 2008
@@ -258,6 +258,8 @@
 
   bool SelectGetElementPtr(User *I);
 
+  bool SelectCall(User *I);
+
   bool SelectBitCast(User *I);
   
   bool SelectCast(User *I, ISD::NodeType Opcode);

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp Thu Sep 25 12:05:24 2008
@@ -11,9 +11,13 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "llvm/Function.h"
+#include "llvm/GlobalVariable.h"
 #include "llvm/Instructions.h"
+#include "llvm/IntrinsicInst.h"
 #include "llvm/CodeGen/FastISel.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
+#include "llvm/CodeGen/MachineModuleInfo.h"
 #include "llvm/CodeGen/MachineRegisterInfo.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Target/TargetInstrInfo.h"
@@ -260,6 +264,93 @@
   return true;
 }
 
+bool FastISel::SelectCall(User *I) {
+  Function *F = cast<CallInst>(I)->getCalledFunction();
+  if (!F) return false;
+
+  unsigned IID = F->getIntrinsicID();
+  switch (IID) {
+  default: break;
+  case Intrinsic::dbg_stoppoint: {
+    DbgStopPointInst *SPI = cast<DbgStopPointInst>(I);
+    if (MMI && SPI->getContext() && MMI->Verify(SPI->getContext())) {
+      DebugInfoDesc *DD = MMI->getDescFor(SPI->getContext());
+      assert(DD && "Not a debug information descriptor");
+      const CompileUnitDesc *CompileUnit = cast<CompileUnitDesc>(DD);
+      unsigned SrcFile = MMI->RecordSource(CompileUnit);
+      unsigned Line = SPI->getLine();
+      unsigned Col = SPI->getColumn();
+      unsigned ID = MMI->RecordSourceLine(Line, Col, SrcFile);
+      const TargetInstrDesc &II = TII.get(TargetInstrInfo::DBG_LABEL);
+      BuildMI(MBB, II).addImm(ID);
+    }
+    return true;
+  }
+  case Intrinsic::dbg_region_start: {
+    DbgRegionStartInst *RSI = cast<DbgRegionStartInst>(I);
+    if (MMI && RSI->getContext() && MMI->Verify(RSI->getContext())) {
+      unsigned ID = MMI->RecordRegionStart(RSI->getContext());
+      const TargetInstrDesc &II = TII.get(TargetInstrInfo::DBG_LABEL);
+      BuildMI(MBB, II).addImm(ID);
+    }
+    return true;
+  }
+  case Intrinsic::dbg_region_end: {
+    DbgRegionEndInst *REI = cast<DbgRegionEndInst>(I);
+    if (MMI && REI->getContext() && MMI->Verify(REI->getContext())) {
+      unsigned ID = MMI->RecordRegionEnd(REI->getContext());
+      const TargetInstrDesc &II = TII.get(TargetInstrInfo::DBG_LABEL);
+      BuildMI(MBB, II).addImm(ID);
+    }
+    return true;
+  }
+  case Intrinsic::dbg_func_start: {
+    if (!MMI) return true;
+    DbgFuncStartInst *FSI = cast<DbgFuncStartInst>(I);
+    Value *SP = FSI->getSubprogram();
+    if (SP && MMI->Verify(SP)) {
+      // llvm.dbg.func.start implicitly defines a dbg_stoppoint which is
+      // what (most?) gdb expects.
+      DebugInfoDesc *DD = MMI->getDescFor(SP);
+      assert(DD && "Not a debug information descriptor");
+      SubprogramDesc *Subprogram = cast<SubprogramDesc>(DD);
+      const CompileUnitDesc *CompileUnit = Subprogram->getFile();
+      unsigned SrcFile = MMI->RecordSource(CompileUnit);
+      // Record the source line but does create a label. It will be emitted
+      // at asm emission time.
+      MMI->RecordSourceLine(Subprogram->getLine(), 0, SrcFile);
+    }
+    return true;
+  }
+  case Intrinsic::dbg_declare: {
+    DbgDeclareInst *DI = cast<DbgDeclareInst>(I);
+    Value *Variable = DI->getVariable();
+    if (MMI && Variable && MMI->Verify(Variable)) {
+      // Determine the address of the declared object.
+      Value *Address = DI->getAddress();
+      if (BitCastInst *BCI = dyn_cast<BitCastInst>(Address))
+        Address = BCI->getOperand(0);
+      AllocaInst *AI = dyn_cast<AllocaInst>(Address);
+      // Don't handle byval struct arguments, for example.
+      if (!AI) break;
+      DenseMap<const AllocaInst*, int>::iterator SI =
+        StaticAllocaMap.find(AI);
+      assert(SI != StaticAllocaMap.end() && "Invalid dbg.declare!");
+      int FI = SI->second;
+
+      // Determine the debug globalvariable.
+      GlobalValue *GV = cast<GlobalVariable>(Variable);
+
+      // Build the DECLARE instruction.
+      const TargetInstrDesc &II = TII.get(TargetInstrInfo::DECLARE);
+      BuildMI(MBB, II).addFrameIndex(FI).addGlobalAddress(GV);
+    }
+    return true;
+  }
+  }
+  return false;
+}
+
 bool FastISel::SelectCast(User *I, ISD::NodeType Opcode) {
   MVT SrcVT = TLI.getValueType(I->getOperand(0)->getType());
   MVT DstVT = TLI.getValueType(I->getType());
@@ -424,6 +515,9 @@
     // Dynamic-sized alloca is not handled yet.
     return false;
     
+  case Instruction::Call:
+    return SelectCall(I);
+  
   case Instruction::BitCast:
     return SelectBitCast(I);
 

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Thu Sep 25 12:05:24 2008
@@ -246,7 +246,9 @@
 static bool isOnlyUsedInEntryBlock(Argument *A, bool EnableFastISel) {
   // With FastISel active, we may be splitting blocks, so force creation
   // of virtual registers for all non-dead arguments.
-  if (EnableFastISel)
+  // Don't force virtual registers for byval arguments though, because
+  // fast-isel can't handle those in all cases.
+  if (EnableFastISel && !A->hasByValAttr())
     return A->use_empty();
 
   BasicBlock *Entry = A->getParent()->begin();

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Thu Sep 25 12:05:24 2008
@@ -718,12 +718,27 @@
     BasicBlock::iterator BI = Begin;
 
     // Lower any arguments needed in this block if this is the entry block.
-    if (LLVMBB == &Fn.getEntryBlock())
+    bool SuppressFastISel = false;
+    if (LLVMBB == &Fn.getEntryBlock()) {
       LowerArguments(LLVMBB);
 
+      // If any of the arguments has the byval attribute, forgo
+      // fast-isel in the entry block.
+      if (EnableFastISel) {
+        unsigned j = 1;
+        for (Function::arg_iterator I = Fn.arg_begin(), E = Fn.arg_end();
+             I != E; ++I, ++j)
+          if (Fn.paramHasAttr(j, ParamAttr::ByVal)) {
+            cerr << "FastISel skips entry block due to byval argument";
+            SuppressFastISel = true;
+            break;
+          }
+      }
+    }
+
     // Before doing SelectionDAG ISel, see if FastISel has been requested.
     // FastISel doesn't support EH landing pads, which require special handling.
-    if (EnableFastISel && !BB->isLandingPad()) {
+    if (EnableFastISel && !SuppressFastISel && !BB->isLandingPad()) {
       if (FastISel *F = TLI.createFastISel(*FuncInfo->MF, MMI,
                                            FuncInfo->ValueMap,
                                            FuncInfo->MBBMap,
@@ -761,6 +776,9 @@
 
           // Then handle certain instructions as single-LLVM-Instruction blocks.
           if (isa<CallInst>(BI)) {
+            cerr << "FastISel missed call: ";
+            BI->dump();
+
             if (BI->getType() != Type::VoidTy) {
               unsigned &R = FuncInfo->ValueMap[BI];
               if (!R)




From dalej at apple.com  Thu Sep 25 12:11:31 2008
From: dalej at apple.com (Dale Johannesen)
Date: Thu, 25 Sep 2008 10:11:31 -0700
Subject: [llvm-commits] [llvm] r56592 - in /llvm/trunk:
	lib/CodeGen/RegAllocLocal.cpp	lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
	lib/CodeGen/SelectionDAG/SelectionDAGBuild.h
	test/CodeGen/PowerPC/2007-04-30-InlineAsmEarlyClobber.ll
	test/CodeGen/X86/2008-09-17-inline-asm-1.ll
	test/CodeGen/X86/2008-09-18-inline-asm-2.ll
In-Reply-To: <935847D9-A566-43F0-8225-20F81FA555E7@apple.com>
References: <200809242313.m8OND9xW027138@zion.cs.uiuc.edu>
	<935847D9-A566-43F0-8225-20F81FA555E7@apple.com>
Message-ID: <766DBC7F-E2D0-4021-BBCD-B14D1411D0E3@apple.com>


On Sep 25, 2008, at 12:13 AMPDT, Evan Cheng wrote:
>
> I think this approach can work. But is it any simpler than a dumb
> solution: 1) Don't process inlineasm early clobber first,  handle them
> the same way. 2) When allocating for a earlyclobber def (source
> operands are already allocated), just avoid allocating any registers
> which conflict with any source. 3) When allocating for a source, check
> if there is a earlyclobber def that's already assigned a physical
> register. What do you think?
>
> Evan

That doesn't strike me as any dumber than what I did.  However I can  
give it a try when I get back to this.




From clattner at apple.com  Thu Sep 25 12:16:08 2008
From: clattner at apple.com (Chris Lattner)
Date: Thu, 25 Sep 2008 10:16:08 -0700
Subject: [llvm-commits] [llvm] r56610 - in /llvm/trunk:
	include/llvm/CodeGen/FastISel.h
	lib/CodeGen/SelectionDAG/FastISel.cpp
	lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
	lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
In-Reply-To: <200809251705.m8PH5Rwo009666@zion.cs.uiuc.edu>
References: <200809251705.m8PH5Rwo009666@zion.cs.uiuc.edu>
Message-ID: <7D721774-2C22-416F-B566-48071FD9267B@apple.com>

On Sep 25, 2008, at 10:05 AM, Dan Gohman wrote:
> URL: http://llvm.org/viewvc/llvm-project?rev=56610&view=rev
> Log:
> FastISel support for debug info.

> +bool FastISel::SelectCall(User *I) {
> +  Function *F = cast<CallInst>(I)->getCalledFunction();

FWIW, Call's can never be ConstantExprs.  It might be better to type  
SelectCall as taking a CallInst, and put the cast in the caller.

>
>           // Then handle certain instructions as single-LLVM- 
> Instruction blocks.
>           if (isa<CallInst>(BI)) {
> +            cerr << "FastISel missed call: ";
> +            BI->dump();
> +
>             if (BI->getType() != Type::VoidTy) {
>               unsigned &R = FuncInfo->ValueMap[BI];

Should this be guarded by a DEBUG?

-Chris


From gohman at apple.com  Thu Sep 25 12:17:27 2008
From: gohman at apple.com (Dan Gohman)
Date: Thu, 25 Sep 2008 17:17:27 -0000
Subject: [llvm-commits] [llvm] r56613 -
	/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
Message-ID: <200809251717.m8PHHRXW010172@zion.cs.uiuc.edu>

Author: djg
Date: Thu Sep 25 12:17:27 2008
New Revision: 56613

URL: http://llvm.org/viewvc/llvm-project?rev=56613&view=rev
Log:
Don't forget the newline in debug output.

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=56613&r1=56612&r2=56613&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Thu Sep 25 12:17:27 2008
@@ -729,7 +729,7 @@
         for (Function::arg_iterator I = Fn.arg_begin(), E = Fn.arg_end();
              I != E; ++I, ++j)
           if (Fn.paramHasAttr(j, ParamAttr::ByVal)) {
-            cerr << "FastISel skips entry block due to byval argument";
+            cerr << "FastISel skips entry block due to byval argument\n";
             SuppressFastISel = true;
             break;
           }




From gohman at apple.com  Thu Sep 25 12:21:42 2008
From: gohman at apple.com (Dan Gohman)
Date: Thu, 25 Sep 2008 17:21:42 -0000
Subject: [llvm-commits] [llvm] r56614 -
	/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
Message-ID: <200809251721.m8PHLgDa010368@zion.cs.uiuc.edu>

Author: djg
Date: Thu Sep 25 12:21:42 2008
New Revision: 56614

URL: http://llvm.org/viewvc/llvm-project?rev=56614&view=rev
Log:
Don't print fast-isel debug messages by default. Thanks Chris!

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=56614&r1=56613&r2=56614&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Thu Sep 25 12:21:42 2008
@@ -729,7 +729,8 @@
         for (Function::arg_iterator I = Fn.arg_begin(), E = Fn.arg_end();
              I != E; ++I, ++j)
           if (Fn.paramHasAttr(j, ParamAttr::ByVal)) {
-            cerr << "FastISel skips entry block due to byval argument\n";
+            if (EnableFastISelVerbose || EnableFastISelAbort)
+              cerr << "FastISel skips entry block due to byval argument\n";
             SuppressFastISel = true;
             break;
           }
@@ -776,8 +777,10 @@
 
           // Then handle certain instructions as single-LLVM-Instruction blocks.
           if (isa<CallInst>(BI)) {
-            cerr << "FastISel missed call: ";
-            BI->dump();
+            if (EnableFastISelVerbose || EnableFastISelAbort) {
+              cerr << "FastISel missed call: ";
+              BI->dump();
+            }
 
             if (BI->getType() != Type::VoidTy) {
               unsigned &R = FuncInfo->ValueMap[BI];




From gohman at apple.com  Thu Sep 25 12:22:52 2008
From: gohman at apple.com (Dan Gohman)
Date: Thu, 25 Sep 2008 17:22:52 -0000
Subject: [llvm-commits] [llvm] r56615 -
	/llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp
Message-ID: <200809251722.m8PHMqce010411@zion.cs.uiuc.edu>

Author: djg
Date: Thu Sep 25 12:22:52 2008
New Revision: 56615

URL: http://llvm.org/viewvc/llvm-project?rev=56615&view=rev
Log:
Support for i1 XOR in FastISel. It is actually safe because
i1 operands are assumed to already by zero-extended.

Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp Thu Sep 25 12:22:52 2008
@@ -135,10 +135,11 @@
   // under the assumption that i64 won't be used if the target doesn't
   // support it.
   if (!TLI.isTypeLegal(VT)) {
-    // MVT::i1 is special. Allow AND and OR (but not XOR) because they
+    // MVT::i1 is special. Allow AND, OR, or XOR because they
     // don't require additional zeroing, which makes them easy.
     if (VT == MVT::i1 &&
-        (ISDOpcode == ISD::AND || ISDOpcode == ISD::OR))
+        (ISDOpcode == ISD::AND || ISDOpcode == ISD::OR ||
+         ISDOpcode == ISD::XOR))
       VT = TLI.getTypeToTransformTo(VT);
     else
       return false;




From gohman at apple.com  Thu Sep 25 12:37:23 2008
From: gohman at apple.com (Dan Gohman)
Date: Thu, 25 Sep 2008 17:37:23 -0000
Subject: [llvm-commits] [llvm] r56616 - /llvm/trunk/lib/VMCore/AsmWriter.cpp
Message-ID: <200809251737.m8PHbNR4011002@zion.cs.uiuc.edu>

Author: djg
Date: Thu Sep 25 12:37:20 2008
New Revision: 56616

URL: http://llvm.org/viewvc/llvm-project?rev=56616&view=rev
Log:
Avoid a spurious extra space character when printing empty structs.

Modified:
    llvm/trunk/lib/VMCore/AsmWriter.cpp

Modified: llvm/trunk/lib/VMCore/AsmWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/AsmWriter.cpp?rev=56616&r1=56615&r2=56616&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/AsmWriter.cpp (original)
+++ llvm/trunk/lib/VMCore/AsmWriter.cpp Thu Sep 25 12:37:20 2008
@@ -532,11 +532,12 @@
     Result += "{ ";
     for (StructType::element_iterator I = STy->element_begin(),
            E = STy->element_end(); I != E; ++I) {
-      if (I != STy->element_begin())
-        Result += ", ";
       calcTypeName(*I, TypeStack, TypeNames, Result);
+      if (next(I) != STy->element_end())
+        Result += ',';
+      Result += ' ';
     }
-    Result += " }";
+    Result += '}';
     if (STy->isPacked())
       Result += '>';
     break;




From dpatel at apple.com  Thu Sep 25 13:05:40 2008
From: dpatel at apple.com (Devang Patel)
Date: Thu, 25 Sep 2008 11:05:40 -0700
Subject: [llvm-commits] [llvm]
	r55638	-	/llvm/trunk/include/llvm/Function.h
In-Reply-To: <200809251024.52922.baldrick@free.fr>
References: <200809021833.m82IXtBb013569@zion.cs.uiuc.edu>
	<200809242111.26563.baldrick@free.fr>
	<1E87DEA3-DC60-4806-9E87-B8299D0B430F@apple.com>
	<200809251024.52922.baldrick@free.fr>
Message-ID: <868083FD-B64A-45C8-94EC-BAB12A2CD7BE@apple.com>

Duncan,

Thanks for explanation. I am not floating point expert but this tells  
me that in general  it makes sense to encode -ffast-math in Module A.

On Sep 25, 2008, at 1:24 AM, Duncan Sands wrote:

> Personally I don't see any reason
> to eliminate it, and if readonly is left alone then my love for  
> logic and
> consistency tells me that noinline and alwaysinline should be done  
> this way
> too.


Well, we're moving in that direction.  The only difference is
- noinline, alwaysinline, readonly etc.. will use ~0U index.
- inreg, zext and sext will not be accepted as function attributes.  
These three will be accepted as return attributes (change in .ll  
syntax) and will continue to use 0 index.

-
Devang





From dalej at apple.com  Thu Sep 25 15:47:56 2008
From: dalej at apple.com (Dale Johannesen)
Date: Thu, 25 Sep 2008 20:47:56 -0000
Subject: [llvm-commits] [llvm] r56619 - in /llvm/trunk: docs/LangRef.html
 include/llvm/CodeGen/SelectionDAGNodes.h
 lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
 lib/Target/X86/X86CallingConv.td
 test/CodeGen/X86/2008-09-25-sseregparm-1.ll
Message-ID: <200809252047.m8PKlwYe017969@zion.cs.uiuc.edu>

Author: johannes
Date: Thu Sep 25 15:47:45 2008
New Revision: 56619

URL: http://llvm.org/viewvc/llvm-project?rev=56619&view=rev
Log:
Accept 'inreg' attribute on x86 functions as
meaning sse_regparm (i.e. float/double values go
in XMM0 instead of ST0).  Update documentation
to reflect reality.


Added:
    llvm/trunk/test/CodeGen/X86/2008-09-25-sseregparm-1.ll
Modified:
    llvm/trunk/docs/LangRef.html
    llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
    llvm/trunk/lib/Target/X86/X86CallingConv.td

Modified: llvm/trunk/docs/LangRef.html
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/LangRef.html?rev=56619&r1=56618&r2=56619&view=diff

==============================================================================
--- llvm/trunk/docs/LangRef.html (original)
+++ llvm/trunk/docs/LangRef.html Thu Sep 25 15:47:45 2008
@@ -845,9 +845,11 @@
     a call to this function.</dd>
 
     <dt><tt>inreg</tt></dt>
-    <dd>This indicates that the parameter should be placed in register (if
-    possible) during assembling function call. Support for this attribute is
-    target-specific</dd>
+    <dd>This indicates that this parameter or return value should be treated
+    in a special target-dependent fashion during while emitting code for a
+    function call or return (usually, by putting it in a register as opposed 
+    to memory; in some places it is used to distinguish between two different
+    kinds of registers).  Use of this attribute is target-specific</dd>
 
     <dt><tt>byval</tt></dt>
     <dd>This indicates that the pointer parameter should really be passed by

Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h?rev=56619&r1=56618&r2=56619&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h (original)
+++ llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h Thu Sep 25 15:47:45 2008
@@ -480,8 +480,8 @@
     
     // RET - Return from function.  The first operand is the chain,
     // and any subsequent operands are pairs of return value and return value
-    // signness for the function.  This operation can have variable number of
-    // operands.
+    // attributes (see CALL for description of attributes) for the function.
+    // This operation can have variable number of operands.
     RET,
 
     // INLINEASM - Represents an inline asm block.  This node always has two

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Thu Sep 25 15:47:45 2008
@@ -913,7 +913,8 @@
       MVT VT = ValueVTs[j];
 
       // FIXME: C calling convention requires the return type to be promoted to
-      // at least 32-bit. But this is not necessary for non-C calling conventions.
+      // at least 32-bit. But this is not necessary for non-C calling
+      // conventions.
       if (VT.isInteger()) {
         MVT MinVT = TLI.getRegisterType(MVT::i32);
         if (VT.bitsLT(MinVT))
@@ -934,9 +935,13 @@
       getCopyToParts(DAG, SDValue(RetOp.getNode(), RetOp.getResNo() + j),
                      &Parts[0], NumParts, PartVT, ExtendKind);
 
+      // 'inreg' on function refers to return value
+      ISD::ArgFlagsTy Flags = ISD::ArgFlagsTy();
+      if (F->paramHasAttr(0, ParamAttr::InReg))
+        Flags.setInReg();
       for (unsigned i = 0; i < NumParts; ++i) {
         NewValues.push_back(Parts[i]);
-        NewValues.push_back(DAG.getArgFlags(ISD::ArgFlagsTy()));
+        NewValues.push_back(DAG.getArgFlags(Flags));
       }
     }
   }

Modified: llvm/trunk/lib/Target/X86/X86CallingConv.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86CallingConv.td?rev=56619&r1=56618&r2=56619&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86CallingConv.td (original)
+++ llvm/trunk/lib/Target/X86/X86CallingConv.td Thu Sep 25 15:47:45 2008
@@ -43,10 +43,14 @@
 
 // X86-32 C return-value convention.
 def RetCC_X86_32_C : CallingConv<[
-  // The X86-32 calling convention returns FP values in ST0, otherwise it is the
-  // same as the common X86 calling conv.
-  CCIfType<[f32], CCAssignToReg<[ST0, ST1]>>,
-  CCIfType<[f64], CCAssignToReg<[ST0, ST1]>>,
+  // The X86-32 calling convention returns FP values in ST0, unless marked
+  // with "inreg" (used here to distinguish one kind of reg from another,
+  // weirdly; this is really the sse-regparm calling convention) in which
+  // case they use XMM0, otherwise it is the same as the common X86 calling
+  // conv.
+  CCIfInReg<CCIfSubtarget<"hasSSE2()", 
+    CCIfType<[f32, f64], CCAssignToReg<[XMM0,XMM1,XMM2]>>>>,
+  CCIfType<[f32,f64], CCAssignToReg<[ST0, ST1]>>,
   CCDelegateTo<RetCC_X86Common>
 ]>;
 

Added: llvm/trunk/test/CodeGen/X86/2008-09-25-sseregparm-1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2008-09-25-sseregparm-1.ll?rev=56619&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/2008-09-25-sseregparm-1.ll (added)
+++ llvm/trunk/test/CodeGen/X86/2008-09-25-sseregparm-1.ll Thu Sep 25 15:47:45 2008
@@ -0,0 +1,19 @@
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movs | count 2
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep fld | count 2
+; check 'inreg' attribute for sse_regparm
+
+define double @foo1() inreg nounwind {
+  ret double 1.0
+}
+
+define float @foo2() inreg nounwind {
+  ret float 1.0
+}
+
+define double @bar() nounwind {
+  ret double 1.0
+}
+
+define float @bar2() nounwind {
+  ret float 1.0
+}




From evan.cheng at apple.com  Thu Sep 25 15:50:48 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Thu, 25 Sep 2008 20:50:48 -0000
Subject: [llvm-commits] [llvm] r56620 - in /llvm/trunk:
 lib/Target/X86/X86ISelLowering.cpp lib/Target/X86/X86ISelLowering.h
 lib/Target/X86/X86InstrSSE.td test/CodeGen/X86/vec_shuffle-22.ll
Message-ID: <200809252050.m8PKonlm018063@zion.cs.uiuc.edu>

Author: evancheng
Date: Thu Sep 25 15:50:48 2008
New Revision: 56620

URL: http://llvm.org/viewvc/llvm-project?rev=56620&view=rev
Log:
With sse3 and when the source is a load or has multiple uses, favors movddup over shuffp*, pshufd, etc. Without sse3 or when the source is from a register, make use of movlhps

Added:
    llvm/trunk/test/CodeGen/X86/vec_shuffle-22.ll
Modified:
    llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
    llvm/trunk/lib/Target/X86/X86ISelLowering.h
    llvm/trunk/lib/Target/X86/X86InstrSSE.td

Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=56620&r1=56619&r2=56620&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Thu Sep 25 15:50:48 2008
@@ -2516,6 +2516,21 @@
   return true;
 }
 
+/// isMOVDDUPMask - Return true if the specified VECTOR_SHUFFLE operand
+/// specifies a shuffle of elements that is suitable for input to MOVDDUP.
+bool X86::isMOVDDUPMask(SDNode *N) {
+  assert(N->getOpcode() == ISD::BUILD_VECTOR);
+
+  unsigned e = N->getNumOperands() / 2;
+  for (unsigned i = 0; i < e; ++i)
+    if (!isUndefOrEqual(N->getOperand(i), i))
+      return false;
+  for (unsigned i = 0; i < e; ++i)
+    if (!isUndefOrEqual(N->getOperand(e+i), i))
+      return false;
+  return true;
+}
+
 /// getShuffleSHUFImmediate - Return the appropriate immediate to shuffle
 /// the specified isShuffleMask VECTOR_SHUFFLE mask with PSHUF* and SHUFP*
 /// instructions.
@@ -2683,15 +2698,14 @@
 /// is promoted to a vector. It also returns the LoadSDNode by reference if
 /// required.
 static bool isScalarLoadToVector(SDNode *N, LoadSDNode **LD = NULL) {
-  if (N->getOpcode() == ISD::SCALAR_TO_VECTOR) {
-    N = N->getOperand(0).getNode();
-    if (ISD::isNON_EXTLoad(N)) {
-      if (LD)
-        *LD = cast<LoadSDNode>(N);
-      return true;
-    }
-  }
-  return false;
+  if (N->getOpcode() != ISD::SCALAR_TO_VECTOR)
+    return false;
+  N = N->getOperand(0).getNode();
+  if (!ISD::isNON_EXTLoad(N))
+    return false;
+  if (LD)
+    *LD = cast<LoadSDNode>(N);
+  return true;
 }
 
 /// ShouldXformToMOVLP{S|D} - Return true if the node should be transformed to
@@ -2943,6 +2957,46 @@
   return DAG.getNode(ISD::BIT_CONVERT, VT, Shuffle);
 }
 
+/// isVectorLoad - Returns true if the node is a vector load, a scalar
+/// load that's promoted to vector, or a load bitcasted.
+static bool isVectorLoad(SDValue Op) {
+  assert(Op.getValueType().isVector() && "Expected a vector type");
+  if (Op.getOpcode() == ISD::SCALAR_TO_VECTOR ||
+      Op.getOpcode() == ISD::BIT_CONVERT) {
+    return isa<LoadSDNode>(Op.getOperand(0));
+  }
+  return isa<LoadSDNode>(Op);
+}
+
+
+/// CanonicalizeMovddup - Cannonicalize movddup shuffle to v2f64.
+///
+static SDValue CanonicalizeMovddup(SDValue Op, SDValue V1, SDValue Mask,
+                                   SelectionDAG &DAG, bool HasSSE3) {
+  // If we have sse3 and shuffle has more than one use or input is a load, then
+  // use movddup. Otherwise, use movlhps.
+  bool UseMovddup = HasSSE3 && (!Op.hasOneUse() || isVectorLoad(V1));
+  MVT PVT = UseMovddup ? MVT::v2f64 : MVT::v4f32;
+  MVT VT = Op.getValueType();
+  if (VT == PVT)
+    return Op;
+  unsigned NumElems = PVT.getVectorNumElements();
+  if (NumElems == 2) {
+    SDValue Cst = DAG.getTargetConstant(0, MVT::i32);
+    Mask = DAG.getNode(ISD::BUILD_VECTOR, MVT::v2i32, Cst, Cst);
+  } else {
+    assert(NumElems == 4);
+    SDValue Cst0 = DAG.getTargetConstant(0, MVT::i32);
+    SDValue Cst1 = DAG.getTargetConstant(1, MVT::i32);
+    Mask = DAG.getNode(ISD::BUILD_VECTOR, MVT::v4i32, Cst0, Cst1, Cst0, Cst1);
+  }
+
+  V1 = DAG.getNode(ISD::BIT_CONVERT, PVT, V1);
+  SDValue Shuffle = DAG.getNode(ISD::VECTOR_SHUFFLE, PVT, V1,
+                                DAG.getNode(ISD::UNDEF, PVT), Mask);
+  return DAG.getNode(ISD::BIT_CONVERT, VT, Shuffle);
+}
+
 /// getShuffleVectorZeroOrUndef - Return a vector_shuffle of the specified
 /// vector of zero or undef vector.  This produces a shuffle where the low
 /// element of V2 is swizzled into the zero/undef vector, landing at element
@@ -3894,6 +3948,11 @@
     return PromoteSplat(Op, DAG, Subtarget->hasSSE2());
   }
 
+  // Canonicalize movddup shuffles.
+  if (V2IsUndef && Subtarget->hasSSE2() &&
+      X86::isMOVDDUPMask(PermMask.getNode()))
+    return CanonicalizeMovddup(Op, V1, PermMask, DAG, Subtarget->hasSSE3());
+
   // If the shuffle can be profitably rewritten as a narrower shuffle, then
   // do it!
   if (VT == MVT::v8i16 || VT == MVT::v16i8) {

Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.h?rev=56620&r1=56619&r2=56620&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelLowering.h (original)
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.h Thu Sep 25 15:50:48 2008
@@ -295,6 +295,10 @@
     /// specifies a splat of zero element.
     bool isSplatLoMask(SDNode *N);
 
+    /// isMOVDDUPMask - Return true if the specified VECTOR_SHUFFLE operand
+    /// specifies a shuffle of elements that is suitable for input to MOVDDUP.
+    bool isMOVDDUPMask(SDNode *N);
+
     /// getShuffleSHUFImmediate - Return the appropriate immediate to shuffle
     /// the specified isShuffleMask VECTOR_SHUFFLE mask with PSHUF* and SHUFP*
     /// instructions.

Modified: llvm/trunk/lib/Target/X86/X86InstrSSE.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrSSE.td?rev=56620&r1=56619&r2=56620&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86InstrSSE.td (original)
+++ llvm/trunk/lib/Target/X86/X86InstrSSE.td Thu Sep 25 15:50:48 2008
@@ -208,6 +208,10 @@
   return X86::isSplatLoMask(N);
 }]>;
 
+def MOVDDUP_shuffle_mask : PatLeaf<(build_vector), [{
+  return X86::isMOVDDUPMask(N);
+}]>;
+
 def MOVHLPS_shuffle_mask : PatLeaf<(build_vector), [{
   return X86::isMOVHLPSMask(N);
 }]>;
@@ -755,6 +759,11 @@
 } // AddedComplexity
 } // Constraints = "$src1 = $dst"
 
+let AddedComplexity = 15 in
+def : Pat<(v4f32 (vector_shuffle VR128:$src, (undef), MOVDDUP_shuffle_mask)),
+          (MOVLHPSrr VR128:$src, VR128:$src)>, Requires<[HasSSE1]>;
+
+
 
 
 // Arithmetic
@@ -2452,16 +2461,24 @@
 
 def MOVDDUPrr  : S3DI<0x12, MRMSrcReg, (outs VR128:$dst), (ins VR128:$src),
                       "movddup\t{$src, $dst|$dst, $src}",
-                      [(set VR128:$dst, (v2f64 (vector_shuffle
-                                                VR128:$src, (undef),
-                                                SSE_splat_lo_mask)))]>;
+                      [(set VR128:$dst,
+                         (v2f64 (vector_shuffle VR128:$src, (undef),
+                                                MOVDDUP_shuffle_mask)))]>;
 def MOVDDUPrm  : S3DI<0x12, MRMSrcMem, (outs VR128:$dst), (ins f64mem:$src),
                       "movddup\t{$src, $dst|$dst, $src}",
-                      [(set VR128:$dst,
-                        (v2f64 (vector_shuffle
-                                (scalar_to_vector (loadf64 addr:$src)),
-                                (undef),
-                                SSE_splat_lo_mask)))]>;
+                    [(set VR128:$dst,
+                      (v2f64 (vector_shuffle
+                              (scalar_to_vector (loadf64 addr:$src)),
+                              (undef), MOVDDUP_shuffle_mask)))]>;
+
+def : Pat<(vector_shuffle
+             (bc_v2f64 (v2i64 (scalar_to_vector (loadi64 addr:$src)))),
+             (undef), MOVDDUP_shuffle_mask),
+          (MOVDDUPrm addr:$src)>, Requires<[HasSSE3]>;
+def : Pat<(vector_shuffle
+            (memopv2f64 addr:$src), (undef), MOVDDUP_shuffle_mask),
+          (MOVDDUPrm addr:$src)>, Requires<[HasSSE3]>;
+
 
 // Arithmetic
 let Constraints = "$src1 = $dst" in {

Added: llvm/trunk/test/CodeGen/X86/vec_shuffle-22.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/vec_shuffle-22.ll?rev=56620&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/vec_shuffle-22.ll (added)
+++ llvm/trunk/test/CodeGen/X86/vec_shuffle-22.ll Thu Sep 25 15:50:48 2008
@@ -0,0 +1,16 @@
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2       | not grep shuf
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2,-sse3 | grep movlhps | count 2
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse3       | grep movddup | count 1
+
+define <4 x float> @t1(<4 x float> %a) nounwind  {
+entry:
+        %tmp1 = shufflevector <4 x float> %a, <4 x float> undef, <4 x i32> < i32 0, i32 1, i32 0, i32 1 >       ; <<4 x float>> [#uses=1]
+        ret <4 x float> %tmp1
+}
+
+define <4 x i32> @t2(<4 x i32>* %a) nounwind {
+entry:
+        %tmp1 = load <4 x i32>* %a;
+	%tmp2 = shufflevector <4 x i32> %tmp1, <4 x i32> undef, <4 x i32> < i32 0, i32 1, i32 0, i32 1 >		; <<4 x i32>> [#uses=1]
+	ret <4 x i32> %tmp2
+}




From asl at math.spbu.ru  Thu Sep 25 16:00:33 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Thu, 25 Sep 2008 21:00:33 -0000
Subject: [llvm-commits] [llvm] r56621 - in /llvm/trunk:
 include/llvm/Target/DarwinTargetAsmInfo.h
 include/llvm/Target/ELFTargetAsmInfo.h include/llvm/Target/TargetAsmInfo.h
 lib/Target/ARM/ARMTargetAsmInfo.cpp lib/Target/ARM/ARMTargetAsmInfo.h
 lib/Target/ARM/ARMTargetMachine.cpp lib/Target/PowerPC/PPCTargetAsmInfo.cpp
 lib/Target/PowerPC/PPCTargetAsmInfo.h lib/Target/TargetAsmInfo.cpp
 lib/Target/X86/X86TargetAsmInfo.cpp lib/Target/X86/X86TargetAsmInfo.h
 lib/Target/X86/X86TargetMachine.cpp
Message-ID: <200809252100.m8PL0YEK018341@zion.cs.uiuc.edu>

Author: asl
Date: Thu Sep 25 16:00:33 2008
New Revision: 56621

URL: http://llvm.org/viewvc/llvm-project?rev=56621&view=rev
Log:
Reapply 56585:56589 with proper fix for some gcc versions

Modified:
    llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h
    llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h
    llvm/trunk/include/llvm/Target/TargetAsmInfo.h
    llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp
    llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h
    llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp
    llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp
    llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h
    llvm/trunk/lib/Target/TargetAsmInfo.cpp
    llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp
    llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h
    llvm/trunk/lib/Target/X86/X86TargetMachine.cpp

Modified: llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h?rev=56621&r1=56620&r2=56621&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h (original)
+++ llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h Thu Sep 25 16:00:33 2008
@@ -24,7 +24,7 @@
   class Type;
   class Mangler;
 
-  struct DarwinTargetAsmInfo: public virtual TargetAsmInfo {
+  struct DarwinTargetAsmInfo: public TargetAsmInfo {
     const Section* TextCoalSection;
     const Section* ConstDataCoalSection;
     const Section* ConstDataSection;

Modified: llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h?rev=56621&r1=56620&r2=56621&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h (original)
+++ llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h Thu Sep 25 16:00:33 2008
@@ -23,7 +23,7 @@
   class GlobalVariable;
   class Type;
 
-  struct ELFTargetAsmInfo: public virtual TargetAsmInfo {
+  struct ELFTargetAsmInfo: public TargetAsmInfo {
     explicit ELFTargetAsmInfo(const TargetMachine &TM);
 
     virtual const Section* SelectSectionForGlobal(const GlobalValue *GV) const;

Modified: llvm/trunk/include/llvm/Target/TargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetAsmInfo.h?rev=56621&r1=56620&r2=56621&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/TargetAsmInfo.h (original)
+++ llvm/trunk/include/llvm/Target/TargetAsmInfo.h Thu Sep 25 16:00:33 2008
@@ -124,6 +124,7 @@
   private:
     mutable StringMap<Section> Sections;
     mutable SectionFlags::FlagsStringsMapType FlagsStrings;
+    void fillDefaultValues();
   protected:
     //===------------------------------------------------------------------===//
     // Properties to be set by the target writer, used to configure asm printer.
@@ -510,6 +511,7 @@
 
   public:
     TargetAsmInfo();
+    TargetAsmInfo(const TargetMachine &TM);
     virtual ~TargetAsmInfo();
 
     const Section* getNamedSection(const char *Name,

Modified: llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp?rev=56621&r1=56620&r2=56621&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp Thu Sep 25 16:00:33 2008
@@ -17,7 +17,7 @@
 #include <cctype>
 using namespace llvm;
 
-static const char *const arm_asm_table[] = {
+const char *const llvm::arm_asm_table[] = {
                                       "{r0}", "r0",
                                       "{r1}", "r1",
                                       "{r2}", "r2",
@@ -42,21 +42,17 @@
                                       "{cc}", "cc",
                                       0,0};
 
-ARMTargetAsmInfo::ARMTargetAsmInfo(const ARMTargetMachine &TM) {
-  AsmTransCBE = arm_asm_table;
-
-  AlignmentIsInBytes = false;
-  Data64bitsDirective = 0;
-  CommentString = "@";
-  ConstantPoolSection = "\t.text\n";
-  COMMDirectiveTakesAlignment = false;
-  InlineAsmStart = "@ InlineAsm Start";
-  InlineAsmEnd = "@ InlineAsm End";
-  LCOMMDirective = "\t.lcomm\t";
-}
+// Instantiate 'common' cases.
+TEMPLATE_INSTANTIATION(class ARMTargetAsmInfo<TargetAsmInfo>);
+TEMPLATE_INSTANTIATION(
+unsigned ARMTargetAsmInfo<TargetAsmInfo>::getInlineAsmLength(const char*) const);
+TEMPLATE_INSTANTIATION(
+  unsigned ARMTargetAsmInfo<TargetAsmInfo>::countArguments(const char*) const);
+TEMPLATE_INSTANTIATION(
+  unsigned ARMTargetAsmInfo<TargetAsmInfo>::countString(const char*) const);
 
 ARMDarwinTargetAsmInfo::ARMDarwinTargetAsmInfo(const ARMTargetMachine &TM):
-  ARMTargetAsmInfo(TM), DarwinTargetAsmInfo(TM) {
+  ARMTargetAsmInfo<DarwinTargetAsmInfo>(TM) {
   Subtarget = &DTM->getSubtarget<ARMSubtarget>();
 
   GlobalPrefix = "_";
@@ -104,7 +100,7 @@
 }
 
 ARMELFTargetAsmInfo::ARMELFTargetAsmInfo(const ARMTargetMachine &TM):
-  ARMTargetAsmInfo(TM), ELFTargetAsmInfo(TM) {
+  ARMTargetAsmInfo<ELFTargetAsmInfo>(TM) {
   Subtarget = &ETM->getSubtarget<ARMSubtarget>();
 
   NeedsSet = false;
@@ -138,13 +134,15 @@
 
 /// Count the number of comma-separated arguments.
 /// Do not try to detect errors.
-unsigned ARMTargetAsmInfo::countArguments(const char* p) const {
+template <class BaseTAI>
+unsigned ARMTargetAsmInfo<BaseTAI>::countArguments(const char* p) const {
   unsigned count = 0;
   while (*p && isspace(*p) && *p != '\n')
     p++;
   count++;
-  while (*p && *p!='\n' && 
-         strncmp(p, CommentString, strlen(CommentString))!=0) {
+  while (*p && *p!='\n' &&
+         strncmp(p, BaseTAI::CommentString,
+                 strlen(BaseTAI::CommentString))!=0) {
     if (*p==',')
       count++;
     p++;
@@ -154,7 +152,8 @@
 
 /// Count the length of a string enclosed in quote characters.
 /// Do not try to detect errors.
-unsigned ARMTargetAsmInfo::countString(const char* p) const {
+template <class BaseTAI>
+unsigned ARMTargetAsmInfo<BaseTAI>::countString(const char* p) const {
   unsigned count = 0;
   while (*p && isspace(*p) && *p!='\n')
     p++;
@@ -166,7 +165,8 @@
 }
 
 /// ARM-specific version of TargetAsmInfo::getInlineAsmLength.
-unsigned ARMTargetAsmInfo::getInlineAsmLength(const char *s) const {
+template <class BaseTAI>
+unsigned ARMTargetAsmInfo<BaseTAI>::getInlineAsmLength(const char *s) const {
   // Make a lowercase-folded version of s for counting purposes.
   char *q, *s_copy = (char *)malloc(strlen(s) + 1);
   strcpy(s_copy, s);
@@ -192,7 +192,7 @@
           break;
         }
       // Ignore everything from comment char(s) to EOL
-      if (strncmp(Str, CommentString, strlen(CommentString))==-0)
+      if (strncmp(Str, BaseTAI::CommentString, strlen(BaseTAI::CommentString))==-0)
         atInsnStart = false;
       // FIXME do something like the following for non-Darwin
       else if (*Str == '.' && Subtarget->isTargetDarwin()) {
@@ -282,7 +282,7 @@
           Length += 4;    // ARM
       }
     }
-    if (*Str == '\n' || *Str == SeparatorChar)
+    if (*Str == '\n' || *Str == BaseTAI::SeparatorChar)
       atInsnStart = true;
   }
   free(s_copy);

Modified: llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h?rev=56621&r1=56620&r2=56621&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h (original)
+++ llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h Thu Sep 25 16:00:33 2008
@@ -14,19 +14,31 @@
 #ifndef ARMTARGETASMINFO_H
 #define ARMTARGETASMINFO_H
 
+#include "ARMTargetMachine.h"
 #include "llvm/Target/TargetAsmInfo.h"
 #include "llvm/Target/ELFTargetAsmInfo.h"
 #include "llvm/Target/DarwinTargetAsmInfo.h"
-
-#include "ARMSubtarget.h"
+#include "llvm/Support/Compiler.h"
 
 namespace llvm {
 
-  // Forward declaration.
-  class ARMTargetMachine;
+  extern const char *const arm_asm_table[];
 
-  struct ARMTargetAsmInfo : public virtual TargetAsmInfo {
-    explicit ARMTargetAsmInfo(const ARMTargetMachine &TM);
+  template <class BaseTAI>
+  struct ARMTargetAsmInfo : public BaseTAI {
+    explicit ARMTargetAsmInfo(const ARMTargetMachine &TM):
+      BaseTAI(TM) {
+      BaseTAI::AsmTransCBE = arm_asm_table;
+
+      BaseTAI::AlignmentIsInBytes = false;
+      BaseTAI::Data64bitsDirective = 0;
+      BaseTAI::CommentString = "@";
+      BaseTAI::ConstantPoolSection = "\t.text\n";
+      BaseTAI::COMMDirectiveTakesAlignment = false;
+      BaseTAI::InlineAsmStart = "@ InlineAsm Start";
+      BaseTAI::InlineAsmEnd = "@ InlineAsm End";
+      BaseTAI::LCOMMDirective = "\t.lcomm\t";
+    }
 
     const ARMSubtarget *Subtarget;
 
@@ -35,13 +47,15 @@
     unsigned countString(const char *p) const;
   };
 
-  struct ARMDarwinTargetAsmInfo : public virtual ARMTargetAsmInfo,
-                                  public virtual DarwinTargetAsmInfo {
+  typedef ARMTargetAsmInfo<TargetAsmInfo> ARMGenericTargetAsmInfo;
+
+  EXTERN_TEMPLATE_INSTANTIATION(class ARMTargetAsmInfo<TargetAsmInfo>);
+
+  struct ARMDarwinTargetAsmInfo : public ARMTargetAsmInfo<DarwinTargetAsmInfo> {
     explicit ARMDarwinTargetAsmInfo(const ARMTargetMachine &TM);
   };
 
-  struct ARMELFTargetAsmInfo : public virtual ARMTargetAsmInfo,
-                               public virtual ELFTargetAsmInfo {
+  struct ARMELFTargetAsmInfo : public ARMTargetAsmInfo<ELFTargetAsmInfo> {
     explicit ARMELFTargetAsmInfo(const ARMTargetMachine &TM);
   };
 

Modified: llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp?rev=56621&r1=56620&r2=56621&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp Thu Sep 25 16:00:33 2008
@@ -120,7 +120,7 @@
    case ARMSubtarget::isELF:
     return new ARMELFTargetAsmInfo(*this);
    default:
-    return new ARMTargetAsmInfo(*this);
+    return new ARMGenericTargetAsmInfo(*this);
   }
 }
 

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

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp Thu Sep 25 16:00:33 2008
@@ -19,21 +19,10 @@
 using namespace llvm;
 using namespace llvm::dwarf;
 
-PPCTargetAsmInfo::PPCTargetAsmInfo(const PPCTargetMachine &TM) {
-  bool isPPC64 = TM.getSubtargetImpl()->isPPC64();
-
-  ZeroDirective = "\t.space\t";
-  SetDirective = "\t.set";
-  Data64bitsDirective = isPPC64 ? "\t.quad\t" : 0;  
-  AlignmentIsInBytes = false;
-  LCOMMDirective = "\t.lcomm\t";
-  InlineAsmStart = "# InlineAsm Start";
-  InlineAsmEnd = "# InlineAsm End";
-  AssemblerDialect = TM.getSubtargetImpl()->getAsmFlavor();
-}
+TEMPLATE_INSTANTIATION(class PPCTargetAsmInfo<TargetAsmInfo>);
 
 PPCDarwinTargetAsmInfo::PPCDarwinTargetAsmInfo(const PPCTargetMachine &TM):
-  PPCTargetAsmInfo(TM), DarwinTargetAsmInfo(TM) {
+  PPCTargetAsmInfo<DarwinTargetAsmInfo>(TM) {
   PCSymbol = ".";
   CommentString = ";";
   GlobalPrefix = "_";
@@ -103,7 +92,7 @@
 
 
 PPCLinuxTargetAsmInfo::PPCLinuxTargetAsmInfo(const PPCTargetMachine &TM) :
-  PPCTargetAsmInfo(TM), ELFTargetAsmInfo(TM) {
+  PPCTargetAsmInfo<ELFTargetAsmInfo>(TM) {
   CommentString = "#";
   GlobalPrefix = "";
   PrivateGlobalPrefix = "";

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

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h Thu Sep 25 16:00:33 2008
@@ -14,28 +14,43 @@
 #ifndef PPCTARGETASMINFO_H
 #define PPCTARGETASMINFO_H
 
+#include "PPCTargetMachine.h"
 #include "llvm/Target/TargetAsmInfo.h"
 #include "llvm/Target/DarwinTargetAsmInfo.h"
 #include "llvm/Target/ELFTargetAsmInfo.h"
+#include "llvm/Support/Compiler.h"
 
 namespace llvm {
 
-  // Forward declaration.
-  class PPCTargetMachine;
-
-  struct PPCTargetAsmInfo : public virtual TargetAsmInfo {
-    explicit PPCTargetAsmInfo(const PPCTargetMachine &TM);
+  template <class BaseTAI>
+  struct PPCTargetAsmInfo : public BaseTAI {
+    explicit PPCTargetAsmInfo(const PPCTargetMachine &TM):
+      BaseTAI(TM) {
+      const PPCSubtarget *Subtarget = &TM.getSubtarget<PPCSubtarget>();
+      bool isPPC64 = Subtarget->isPPC64();
+
+      BaseTAI::ZeroDirective = "\t.space\t";
+      BaseTAI::SetDirective = "\t.set";
+      BaseTAI::Data64bitsDirective = isPPC64 ? "\t.quad\t" : 0;
+      BaseTAI::AlignmentIsInBytes = false;
+      BaseTAI::LCOMMDirective = "\t.lcomm\t";
+      BaseTAI::InlineAsmStart = "# InlineAsm Start";
+      BaseTAI::InlineAsmEnd = "# InlineAsm End";
+      BaseTAI::AssemblerDialect = Subtarget->getAsmFlavor();
+    }
   };
 
-  struct PPCDarwinTargetAsmInfo : public PPCTargetAsmInfo,
-                                  public DarwinTargetAsmInfo {
+  typedef PPCTargetAsmInfo<TargetAsmInfo> PPCGenericTargetAsmInfo;
+
+  EXTERN_TEMPLATE_INSTANTIATION(class PPCTargetAsmInfo<TargetAsmInfo>);
+
+  struct PPCDarwinTargetAsmInfo : public PPCTargetAsmInfo<DarwinTargetAsmInfo> {
     explicit PPCDarwinTargetAsmInfo(const PPCTargetMachine &TM);
     virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target Reason,
                                            bool Global) const;
   };
 
-  struct PPCLinuxTargetAsmInfo : public PPCTargetAsmInfo,
-                                 public ELFTargetAsmInfo {
+  struct PPCLinuxTargetAsmInfo : public PPCTargetAsmInfo<ELFTargetAsmInfo> {
     explicit PPCLinuxTargetAsmInfo(const PPCTargetMachine &TM);
     virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target Reason,
                                            bool Global) const;

Modified: llvm/trunk/lib/Target/TargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetAsmInfo.cpp?rev=56621&r1=56620&r2=56621&view=diff

==============================================================================
--- llvm/trunk/lib/Target/TargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/TargetAsmInfo.cpp Thu Sep 25 16:00:33 2008
@@ -25,100 +25,108 @@
 
 using namespace llvm;
 
-TargetAsmInfo::TargetAsmInfo() :
-  TextSection(0),
-  DataSection(0),
-  BSSSection("\t.bss"),
-  BSSSection_(0),
-  ReadOnlySection(0),
-  SmallDataSection(0),
-  SmallBSSSection(0),
-  SmallRODataSection(0),
-  TLSDataSection(0),
-  TLSBSSSection(0),
-  ZeroFillDirective(0),
-  NonexecutableStackDirective(0),
-  NeedsSet(false),
-  MaxInstLength(4),
-  PCSymbol("$"),
-  SeparatorChar(';'),
-  CommentString("#"),
-  GlobalPrefix(""),
-  PrivateGlobalPrefix("."),
-  LessPrivateGlobalPrefix(""),
-  JumpTableSpecialLabelPrefix(0),
-  GlobalVarAddrPrefix(""),
-  GlobalVarAddrSuffix(""),
-  FunctionAddrPrefix(""),
-  FunctionAddrSuffix(""),
-  PersonalityPrefix(""),
-  PersonalitySuffix(""),
-  NeedsIndirectEncoding(false),
-  InlineAsmStart("#APP"),
-  InlineAsmEnd("#NO_APP"),
-  AssemblerDialect(0),
-  StringConstantPrefix(".str"),
-  ZeroDirective("\t.zero\t"),
-  ZeroDirectiveSuffix(0),
-  AsciiDirective("\t.ascii\t"),
-  AscizDirective("\t.asciz\t"),
-  Data8bitsDirective("\t.byte\t"),
-  Data16bitsDirective("\t.short\t"),
-  Data32bitsDirective("\t.long\t"),
-  Data64bitsDirective("\t.quad\t"),
-  AlignDirective("\t.align\t"),
-  AlignmentIsInBytes(true),
-  TextAlignFillValue(0),
-  SwitchToSectionDirective("\t.section\t"),
-  TextSectionStartSuffix(""),
-  DataSectionStartSuffix(""),
-  SectionEndDirectiveSuffix(0),
-  ConstantPoolSection("\t.section .rodata"),
-  JumpTableDataSection("\t.section .rodata"),
-  JumpTableDirective(0),
-  CStringSection(0),
-  CStringSection_(0),
-  StaticCtorsSection("\t.section .ctors,\"aw\", at progbits"),
-  StaticDtorsSection("\t.section .dtors,\"aw\", at progbits"),
-  GlobalDirective("\t.globl\t"),
-  SetDirective(0),
-  LCOMMDirective(0),
-  COMMDirective("\t.comm\t"),
-  COMMDirectiveTakesAlignment(true),
-  HasDotTypeDotSizeDirective(true),
-  UsedDirective(0),
-  WeakRefDirective(0),
-  WeakDefDirective(0),
-  HiddenDirective("\t.hidden\t"),
-  ProtectedDirective("\t.protected\t"),
-  AbsoluteDebugSectionOffsets(false),
-  AbsoluteEHSectionOffsets(false),
-  HasLEB128(false),
-  HasDotLocAndDotFile(false),
-  SupportsDebugInformation(false),
-  SupportsExceptionHandling(false),
-  DwarfRequiresFrameSection(true),
-  GlobalEHDirective(0),
-  SupportsWeakOmittedEHFrame(true),
-  DwarfSectionOffsetDirective(0),
-  DwarfAbbrevSection(".debug_abbrev"),
-  DwarfInfoSection(".debug_info"),
-  DwarfLineSection(".debug_line"),
-  DwarfFrameSection(".debug_frame"),
-  DwarfPubNamesSection(".debug_pubnames"),
-  DwarfPubTypesSection(".debug_pubtypes"),
-  DwarfStrSection(".debug_str"),
-  DwarfLocSection(".debug_loc"),
-  DwarfARangesSection(".debug_aranges"),
-  DwarfRangesSection(".debug_ranges"),
-  DwarfMacInfoSection(".debug_macinfo"),
-  DwarfEHFrameSection(".eh_frame"),
-  DwarfExceptionSection(".gcc_except_table"),
-  AsmTransCBE(0) {
+void TargetAsmInfo::fillDefaultValues() {
+  BSSSection = "\t.bss";
+  BSSSection_ = 0;
+  ReadOnlySection = 0;
+  SmallDataSection = 0;
+  SmallBSSSection = 0;
+  SmallRODataSection = 0;
+  TLSDataSection = 0;
+  TLSBSSSection = 0;
+  ZeroFillDirective = 0;
+  NonexecutableStackDirective = 0;
+  NeedsSet = false;
+  MaxInstLength = 4;
+  PCSymbol = "$";
+  SeparatorChar = ';';
+  CommentString = "#";
+  GlobalPrefix = "";
+  PrivateGlobalPrefix = ".";
+  LessPrivateGlobalPrefix = "";
+  JumpTableSpecialLabelPrefix = 0;
+  GlobalVarAddrPrefix = "";
+  GlobalVarAddrSuffix = "";
+  FunctionAddrPrefix = "";
+  FunctionAddrSuffix = "";
+  PersonalityPrefix = "";
+  PersonalitySuffix = "";
+  NeedsIndirectEncoding = false;
+  InlineAsmStart = "#APP";
+  InlineAsmEnd = "#NO_APP";
+  AssemblerDialect = 0;
+  StringConstantPrefix = ".str";
+  ZeroDirective = "\t.zero\t";
+  ZeroDirectiveSuffix = 0;
+  AsciiDirective = "\t.ascii\t";
+  AscizDirective = "\t.asciz\t";
+  Data8bitsDirective = "\t.byte\t";
+  Data16bitsDirective = "\t.short\t";
+  Data32bitsDirective = "\t.long\t";
+  Data64bitsDirective = "\t.quad\t";
+  AlignDirective = "\t.align\t";
+  AlignmentIsInBytes = true;
+  TextAlignFillValue = 0;
+  SwitchToSectionDirective = "\t.section\t";
+  TextSectionStartSuffix = "";
+  DataSectionStartSuffix = "";
+  SectionEndDirectiveSuffix = 0;
+  ConstantPoolSection = "\t.section .rodata";
+  JumpTableDataSection = "\t.section .rodata";
+  JumpTableDirective = 0;
+  CStringSection = 0;
+  CStringSection_ = 0;
+  // FIXME: Flags are ELFish - replace with normal section stuff.
+  StaticCtorsSection = "\t.section .ctors,\"aw\", at progbits";
+  StaticDtorsSection = "\t.section .dtors,\"aw\", at progbits";
+  GlobalDirective = "\t.globl\t";
+  SetDirective = 0;
+  LCOMMDirective = 0;
+  COMMDirective = "\t.comm\t";
+  COMMDirectiveTakesAlignment = true;
+  HasDotTypeDotSizeDirective = true;
+  UsedDirective = 0;
+  WeakRefDirective = 0;
+  WeakDefDirective = 0;
+  // FIXME: These are ELFish - move to ELFTAI.
+  HiddenDirective = "\t.hidden\t";
+  ProtectedDirective = "\t.protected\t";
+  AbsoluteDebugSectionOffsets = false;
+  AbsoluteEHSectionOffsets = false;
+  HasLEB128 = false;
+  HasDotLocAndDotFile = false;
+  SupportsDebugInformation = false;
+  SupportsExceptionHandling = false;
+  DwarfRequiresFrameSection = true;
+  GlobalEHDirective = 0;
+  SupportsWeakOmittedEHFrame = true;
+  DwarfSectionOffsetDirective = 0;
+  DwarfAbbrevSection = ".debug_abbrev";
+  DwarfInfoSection = ".debug_info";
+  DwarfLineSection = ".debug_line";
+  DwarfFrameSection = ".debug_frame";
+  DwarfPubNamesSection = ".debug_pubnames";
+  DwarfPubTypesSection = ".debug_pubtypes";
+  DwarfStrSection = ".debug_str";
+  DwarfLocSection = ".debug_loc";
+  DwarfARangesSection = ".debug_aranges";
+  DwarfRangesSection = ".debug_ranges";
+  DwarfMacInfoSection = ".debug_macinfo";
+  DwarfEHFrameSection = ".eh_frame";
+  DwarfExceptionSection = ".gcc_except_table";
+  AsmTransCBE = 0;
   TextSection = getUnnamedSection("\t.text", SectionFlags::Code);
   DataSection = getUnnamedSection("\t.data", SectionFlags::Writeable);
 }
 
+TargetAsmInfo::TargetAsmInfo() {
+  fillDefaultValues();
+}
+
+TargetAsmInfo::TargetAsmInfo(const TargetMachine &TM) {
+  fillDefaultValues();
+}
+
 TargetAsmInfo::~TargetAsmInfo() {
 }
 

Modified: llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp?rev=56621&r1=56620&r2=56621&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp Thu Sep 25 16:00:33 2008
@@ -25,27 +25,26 @@
 using namespace llvm;
 using namespace llvm::dwarf;
 
-static const char *const x86_asm_table[] = {
-                                      "{si}", "S",
-                                      "{di}", "D",
-                                      "{ax}", "a",
-                                      "{cx}", "c",
-                                      "{memory}", "memory",
-                                      "{flags}", "",
-                                      "{dirflag}", "",
-                                      "{fpsr}", "",
-                                      "{cc}", "cc",
-                                      0,0};
-
-X86TargetAsmInfo::X86TargetAsmInfo(const X86TargetMachine &TM) {
-  const X86Subtarget *Subtarget = &TM.getSubtarget<X86Subtarget>();
+const char *const llvm::x86_asm_table[] = {
+  "{si}", "S",
+  "{di}", "D",
+  "{ax}", "a",
+  "{cx}", "c",
+  "{memory}", "memory",
+  "{flags}", "",
+  "{dirflag}", "",
+  "{fpsr}", "",
+  "{cc}", "cc",
+  0,0};
+
+TEMPLATE_INSTANTIATION(class X86TargetAsmInfo<TargetAsmInfo>);
+TEMPLATE_INSTANTIATION(
+  bool X86TargetAsmInfo<TargetAsmInfo>::ExpandInlineAsm(CallInst*) const);
+TEMPLATE_INSTANTIATION(
+  bool X86TargetAsmInfo<TargetAsmInfo>::LowerToBSwap(CallInst*) const);
 
-  AsmTransCBE = x86_asm_table;
-
-  AssemblerDialect = Subtarget->getAsmFlavor();
-}
-
-bool X86TargetAsmInfo::LowerToBSwap(CallInst *CI) const {
+template <class BaseTAI>
+bool X86TargetAsmInfo<BaseTAI>::LowerToBSwap(CallInst *CI) const {
   // FIXME: this should verify that we are targetting a 486 or better.  If not,
   // we will turn this bswap into something that will be lowered to logical ops
   // instead of emitting the bswap asm.  For now, we don't support 486 or lower
@@ -74,7 +73,8 @@
   return true;
 }
 
-bool X86TargetAsmInfo::ExpandInlineAsm(CallInst *CI) const {
+template <class BaseTAI>
+bool X86TargetAsmInfo<BaseTAI>::ExpandInlineAsm(CallInst *CI) const {
   InlineAsm *IA = cast<InlineAsm>(CI->getCalledValue());
   std::vector<InlineAsm::ConstraintInfo> Constraints = IA->ParseConstraints();
 
@@ -125,7 +125,7 @@
 }
 
 X86DarwinTargetAsmInfo::X86DarwinTargetAsmInfo(const X86TargetMachine &TM):
-  X86TargetAsmInfo(TM), DarwinTargetAsmInfo(TM) {
+  X86TargetAsmInfo<DarwinTargetAsmInfo>(TM) {
   const X86Subtarget* Subtarget = &DTM->getSubtarget<X86Subtarget>();
   bool is64Bit = Subtarget->is64Bit();
 
@@ -225,7 +225,7 @@
 }
 
 X86ELFTargetAsmInfo::X86ELFTargetAsmInfo(const X86TargetMachine &TM):
-  X86TargetAsmInfo(TM), ELFTargetAsmInfo(TM) {
+  X86TargetAsmInfo<ELFTargetAsmInfo>(TM) {
 
   CStringSection = ".rodata.str";
   PrivateGlobalPrefix = ".L";
@@ -302,7 +302,7 @@
 }
 
 X86COFFTargetAsmInfo::X86COFFTargetAsmInfo(const X86TargetMachine &TM):
-  X86TargetAsmInfo(TM) {
+  X86GenericTargetAsmInfo(TM) {
   X86TM = &TM;
 
   GlobalPrefix = "_";
@@ -408,7 +408,7 @@
 }
 
 X86WinTargetAsmInfo::X86WinTargetAsmInfo(const X86TargetMachine &TM):
-  X86TargetAsmInfo(TM) {
+  X86GenericTargetAsmInfo(TM) {
   GlobalPrefix = "_";
   CommentString = ";";
 

Modified: llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h?rev=56621&r1=56620&r2=56621&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h (original)
+++ llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h Thu Sep 25 16:00:33 2008
@@ -14,17 +14,25 @@
 #ifndef X86TARGETASMINFO_H
 #define X86TARGETASMINFO_H
 
+#include "X86TargetMachine.h"
 #include "llvm/Target/TargetAsmInfo.h"
 #include "llvm/Target/ELFTargetAsmInfo.h"
 #include "llvm/Target/DarwinTargetAsmInfo.h"
+#include "llvm/Support/Compiler.h"
 
 namespace llvm {
 
-  // Forward declaration.
-  class X86TargetMachine;
+  extern const char *const x86_asm_table[];
 
-  struct X86TargetAsmInfo : public virtual TargetAsmInfo {
-    explicit X86TargetAsmInfo(const X86TargetMachine &TM);
+  template <class BaseTAI>
+  struct X86TargetAsmInfo : public BaseTAI {
+    explicit X86TargetAsmInfo(const X86TargetMachine &TM):
+      BaseTAI(TM) {
+      const X86Subtarget *Subtarget = &TM.getSubtarget<X86Subtarget>();
+
+      BaseTAI::AsmTransCBE = x86_asm_table;
+      BaseTAI::AssemblerDialect = Subtarget->getAsmFlavor();
+    }
 
     virtual bool ExpandInlineAsm(CallInst *CI) const;
 
@@ -32,21 +40,23 @@
     bool LowerToBSwap(CallInst *CI) const;
   };
 
-  struct X86DarwinTargetAsmInfo : public X86TargetAsmInfo,
-                                  public DarwinTargetAsmInfo {
+  typedef X86TargetAsmInfo<TargetAsmInfo> X86GenericTargetAsmInfo;
+
+  EXTERN_TEMPLATE_INSTANTIATION(class X86TargetAsmInfo<TargetAsmInfo>);
+
+  struct X86DarwinTargetAsmInfo : public X86TargetAsmInfo<DarwinTargetAsmInfo> {
     explicit X86DarwinTargetAsmInfo(const X86TargetMachine &TM);
     virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target Reason,
                                            bool Global) const;
   };
 
-  struct X86ELFTargetAsmInfo : public X86TargetAsmInfo,
-                               public ELFTargetAsmInfo {
+  struct X86ELFTargetAsmInfo : public X86TargetAsmInfo<ELFTargetAsmInfo> {
     explicit X86ELFTargetAsmInfo(const X86TargetMachine &TM);
     virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target Reason,
                                            bool Global) const;
   };
 
-  struct X86COFFTargetAsmInfo : public X86TargetAsmInfo {
+  struct X86COFFTargetAsmInfo : public X86GenericTargetAsmInfo {
     explicit X86COFFTargetAsmInfo(const X86TargetMachine &TM);
     virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target Reason,
                                            bool Global) const;
@@ -57,9 +67,11 @@
     const X86TargetMachine *X86TM;
   };
 
-  struct X86WinTargetAsmInfo : public X86TargetAsmInfo {
+  struct X86WinTargetAsmInfo : public X86GenericTargetAsmInfo {
     explicit X86WinTargetAsmInfo(const X86TargetMachine &TM);
   };
+
 } // namespace llvm
 
 #endif
+

Modified: llvm/trunk/lib/Target/X86/X86TargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetMachine.cpp?rev=56621&r1=56620&r2=56621&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetMachine.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86TargetMachine.cpp Thu Sep 25 16:00:33 2008
@@ -54,7 +54,7 @@
      case X86Subtarget::isWindows:
       return new X86WinTargetAsmInfo(*this);
      default:
-      return new X86TargetAsmInfo(*this);
+      return new X86GenericTargetAsmInfo(*this);
     }
 }
 




From dpatel at apple.com  Thu Sep 25 16:00:46 2008
From: dpatel at apple.com (Devang Patel)
Date: Thu, 25 Sep 2008 21:00:46 -0000
Subject: [llvm-commits] [llvm] r56622 - in /llvm/trunk: include/llvm-c/
 include/llvm/ include/llvm/Bitcode/ include/llvm/Support/ lib/AsmParser/
 lib/Bitcode/Reader/ lib/Bitcode/Writer/ lib/CodeGen/
 lib/CodeGen/SelectionDAG/ lib/ExecutionEngine/Interpreter/
 lib/Target/CBackend/ lib/Target/CppBackend/ lib/Target/MSIL/
 lib/Target/X86/ lib/Target/X86/AsmPrinter/ lib/Transforms/IPO/
 lib/Transforms/Scalar/ lib/Transforms/Utils/ lib/VMCore/ utils/TableGen/
Message-ID: <200809252100.m8PL0nbA018437@zion.cs.uiuc.edu>

Author: dpatel
Date: Thu Sep 25 16:00:45 2008
New Revision: 56622

URL: http://llvm.org/viewvc/llvm-project?rev=56622&view=rev
Log:
 Large mechanical patch.

s/ParamAttr/Attribute/g
s/PAList/AttrList/g
s/FnAttributeWithIndex/AttributeWithIndex/g
s/FnAttr/Attribute/g

This sets the stage 
- to implement function notes as function attributes and 
- to distinguish between function attributes and return value attributes.

This requires corresponding changes in llvm-gcc and clang.


Modified:
    llvm/trunk/include/llvm-c/Core.h
    llvm/trunk/include/llvm/Argument.h
    llvm/trunk/include/llvm/Attributes.h
    llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h
    llvm/trunk/include/llvm/Function.h
    llvm/trunk/include/llvm/Instructions.h
    llvm/trunk/include/llvm/Intrinsics.h
    llvm/trunk/include/llvm/Support/CallSite.h
    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/Reader/BitcodeReader.h
    llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
    llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.cpp
    llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.h
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
    llvm/trunk/lib/CodeGen/ShadowStackGC.cpp
    llvm/trunk/lib/ExecutionEngine/Interpreter/Execution.cpp
    llvm/trunk/lib/Target/CBackend/CBackend.cpp
    llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp
    llvm/trunk/lib/Target/MSIL/MSILWriter.cpp
    llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
    llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
    llvm/trunk/lib/Target/X86/X86FastISel.cpp
    llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
    llvm/trunk/lib/Transforms/IPO/AddReadAttrs.cpp
    llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp
    llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp
    llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
    llvm/trunk/lib/Transforms/IPO/InlineAlways.cpp
    llvm/trunk/lib/Transforms/IPO/InlineSimple.cpp
    llvm/trunk/lib/Transforms/IPO/Inliner.cpp
    llvm/trunk/lib/Transforms/IPO/LowerSetJmp.cpp
    llvm/trunk/lib/Transforms/IPO/PruneEH.cpp
    llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp
    llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp
    llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp
    llvm/trunk/lib/Transforms/Scalar/SimplifyCFGPass.cpp
    llvm/trunk/lib/Transforms/Utils/InlineCost.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/Attributes.cpp
    llvm/trunk/lib/VMCore/AutoUpgrade.cpp
    llvm/trunk/lib/VMCore/Core.cpp
    llvm/trunk/lib/VMCore/Function.cpp
    llvm/trunk/lib/VMCore/Instructions.cpp
    llvm/trunk/lib/VMCore/Verifier.cpp
    llvm/trunk/utils/TableGen/IntrinsicEmitter.cpp

Modified: llvm/trunk/include/llvm-c/Core.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm-c/Core.h?rev=56622&r1=56621&r2=56622&view=diff

==============================================================================
--- llvm/trunk/include/llvm-c/Core.h (original)
+++ llvm/trunk/include/llvm-c/Core.h Thu Sep 25 16:00:45 2008
@@ -83,18 +83,18 @@
 typedef struct LLVMOpaquePassManager *LLVMPassManagerRef;
 
 typedef enum {
-    LLVMZExtParamAttr       = 1<<0,
-    LLVMSExtParamAttr       = 1<<1,
-    LLVMNoReturnParamAttr   = 1<<2,
-    LLVMInRegParamAttr      = 1<<3,
-    LLVMStructRetParamAttr  = 1<<4,
-    LLVMNoUnwindParamAttr   = 1<<5,
-    LLVMNoAliasParamAttr    = 1<<6,
-    LLVMByValParamAttr      = 1<<7,
-    LLVMNestParamAttr       = 1<<8,
-    LLVMReadNoneParamAttr   = 1<<9,
-    LLVMReadOnlyParamAttr   = 1<<10
-} LLVMParamAttr;
+    LLVMZExtAttribute       = 1<<0,
+    LLVMSExtAttribute       = 1<<1,
+    LLVMNoReturnAttribute   = 1<<2,
+    LLVMInRegAttribute      = 1<<3,
+    LLVMStructRetAttribute  = 1<<4,
+    LLVMNoUnwindAttribute   = 1<<5,
+    LLVMNoAliasAttribute    = 1<<6,
+    LLVMByValAttribute      = 1<<7,
+    LLVMNestAttribute       = 1<<8,
+    LLVMReadNoneAttribute   = 1<<9,
+    LLVMReadOnlyAttribute   = 1<<10
+} LLVMAttribute;
 
 typedef enum {
   LLVMVoidTypeKind,        /**< type with no size */
@@ -423,8 +423,8 @@
 LLVMValueRef LLVMGetLastParam(LLVMValueRef Fn);
 LLVMValueRef LLVMGetNextParam(LLVMValueRef Arg);
 LLVMValueRef LLVMGetPreviousParam(LLVMValueRef Arg);
-void LLVMAddParamAttr(LLVMValueRef Arg, LLVMParamAttr PA);
-void LLVMRemoveParamAttr(LLVMValueRef Arg, LLVMParamAttr PA);
+void LLVMAddAttribute(LLVMValueRef Arg, LLVMAttribute PA);
+void LLVMRemoveAttribute(LLVMValueRef Arg, LLVMAttribute PA);
 void LLVMSetParamAlignment(LLVMValueRef Arg, unsigned align);
 
 /* Operations on basic blocks */
@@ -454,9 +454,9 @@
 /* Operations on call sites */
 void LLVMSetInstructionCallConv(LLVMValueRef Instr, unsigned CC);
 unsigned LLVMGetInstructionCallConv(LLVMValueRef Instr);
-void LLVMAddInstrParamAttr(LLVMValueRef Instr, unsigned index, LLVMParamAttr);
-void LLVMRemoveInstrParamAttr(LLVMValueRef Instr, unsigned index, 
-                              LLVMParamAttr);
+void LLVMAddInstrAttribute(LLVMValueRef Instr, unsigned index, LLVMAttribute);
+void LLVMRemoveInstrAttribute(LLVMValueRef Instr, unsigned index, 
+                              LLVMAttribute);
 void LLVMSetInstrParamAlignment(LLVMValueRef Instr, unsigned index, 
                                 unsigned align);
 

Modified: llvm/trunk/include/llvm/Argument.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Argument.h?rev=56622&r1=56621&r2=56622&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Argument.h (original)
+++ llvm/trunk/include/llvm/Argument.h Thu Sep 25 16:00:45 2008
@@ -60,10 +60,10 @@
   /// its containing function.
   bool hasStructRetAttr() const;
 
-  /// addAttr - Add a ParamAttr to an argument
+  /// addAttr - Add a Attribute to an argument
   void addAttr(Attributes);
   
-  /// removeAttr - Remove a ParamAttr from an argument
+  /// removeAttr - Remove a Attribute from an argument
   void removeAttr(Attributes);
 
   /// classof - Methods for support type inquiry through isa, cast, and

Modified: llvm/trunk/include/llvm/Attributes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Attributes.h?rev=56622&r1=56621&r2=56622&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Attributes.h (original)
+++ llvm/trunk/include/llvm/Attributes.h Thu Sep 25 16:00:45 2008
@@ -1,4 +1,4 @@
-//===-- llvm/Attributes.h - Container for ParamAttrs ---*---------- C++ -*-===//
+//===-- llvm/Attributes.h - Container for Attributes ---*---------- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,29 +7,29 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// This file contains the simple types necessary to represent the parameter
+// This file contains the simple types necessary to represent the
 // attributes associated with functions and their calls.
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_PARAMETER_ATTRIBUTES_H
-#define LLVM_PARAMETER_ATTRIBUTES_H
+#ifndef LLVM_ATTRIBUTES_H
+#define LLVM_ATTRIBUTES_H
 
 #include <string>
 
 namespace llvm {
 class Type;
 
-/// Attributes - A bitset of attributes for a parameter.
+/// Attributes - A bitset of attributes.
 typedef unsigned Attributes;
   
-namespace ParamAttr {
+namespace Attribute {
 
 /// Function parameters and results can have attributes to indicate how they 
 /// should be treated by optimizations and code generation. This enumeration 
-/// lists the attributes that can be associated with parameters or function 
-/// results.
-/// @brief Function parameter attributes.
+/// lists the attributes that can be associated with parameters, function 
+/// results or the function itself.
+/// @brief Function attributes.
 
 const Attributes None      = 0;     ///< No attributes have been set
 const Attributes ZExt      = 1<<0;  ///< Zero extended before/after call
@@ -43,6 +43,9 @@
 const Attributes Nest      = 1<<8;  ///< Nested function static chain
 const Attributes ReadNone  = 1<<9;  ///< Function does not access memory
 const Attributes ReadOnly  = 1<<10; ///< Function only reads from memory
+const Attributes NoInline        = 1<<11; // inline=never 
+const Attributes AlwaysInline    = 1<<12; // inline=always
+const Attributes OptimizeForSize = 1<<13; // opt_size
 const Attributes Alignment = 0xffff<<16; ///< Alignment of parameter (16 bits)
                                     // 0 = unknown, else in clear (not log)
                                     
@@ -74,27 +77,23 @@
 /// The set of Attributes set in Attributes is converted to a
 /// string of equivalent mnemonics. This is, presumably, for writing out
 /// the mnemonics for the assembly writer. 
-/// @brief Convert parameter attribute bits to text
+/// @brief Convert attribute bits to text
 std::string getAsString(Attributes Attrs);
-} // end namespace ParamAttr
+} // end namespace Attribute
 
-namespace FnAttr {
-/// Function notes are implemented as attributes stored at index ~0 in 
-/// parameter attribute list.
-const Attributes None            = 0;    
-const Attributes NoInline        = 1<<0; // inline=never 
-const Attributes AlwaysInline    = 1<<1; // inline=always
-const Attributes OptimizeForSize = 1<<2; // opt_size
-} // end namespace FnAttr
-
-/// This is just a pair of values to associate a set of parameter attributes
-/// with a parameter index. 
-struct FnAttributeWithIndex {
+namespace Attribute {
+} // end namespace Attribute
+
+/// This is just a pair of values to associate a set of attributes
+/// with an index. 
+struct AttributeWithIndex {
   Attributes Attrs; ///< The attributes that are set, or'd together.
   unsigned Index; ///< Index of the parameter for which the attributes apply.
+                  ///< Index 0 is used for return value attributes.
+                  ///< Index ~0U is used for function attributes.
   
-  static FnAttributeWithIndex get(unsigned Idx, Attributes Attrs) {
-    FnAttributeWithIndex P;
+  static AttributeWithIndex get(unsigned Idx, Attributes Attrs) {
+    AttributeWithIndex P;
     P.Index = Idx;
     P.Attrs = Attrs;
     return P;
@@ -102,66 +101,66 @@
 };
   
 //===----------------------------------------------------------------------===//
-// PAListPtr Smart Pointer
+// AttrListPtr Smart Pointer
 //===----------------------------------------------------------------------===//
 
 class AttributeListImpl;
   
-/// PAListPtr - This class manages the ref count for the opaque 
+/// AttrListPtr - This class manages the ref count for the opaque 
 /// AttributeListImpl object and provides accessors for it.
-class PAListPtr {
-  /// PAList - The parameter attributes that we are managing.  This can be null
-  /// to represent the empty parameter attributes list.
-  AttributeListImpl *PAList;
+class AttrListPtr {
+  /// AttrList - The attributes that we are managing.  This can be null
+  /// to represent the empty attributes list.
+  AttributeListImpl *AttrList;
 public:
-  PAListPtr() : PAList(0) {}
-  PAListPtr(const PAListPtr &P);
-  const PAListPtr &operator=(const PAListPtr &RHS);
-  ~PAListPtr();
+  AttrListPtr() : AttrList(0) {}
+  AttrListPtr(const AttrListPtr &P);
+  const AttrListPtr &operator=(const AttrListPtr &RHS);
+  ~AttrListPtr();
   
   //===--------------------------------------------------------------------===//
-  // Parameter Attribute List Construction and Mutation
+  // Attribute List Construction and Mutation
   //===--------------------------------------------------------------------===//
   
-  /// get - Return a ParamAttrs list with the specified parameter in it.
-  static PAListPtr get(const FnAttributeWithIndex *Attr, unsigned NumAttrs);
+  /// get - Return a Attributes list with the specified parameter in it.
+  static AttrListPtr get(const AttributeWithIndex *Attr, unsigned NumAttrs);
   
-  /// get - Return a ParamAttr list with the parameters specified by the
+  /// get - Return a Attribute list with the parameters specified by the
   /// consecutive random access iterator range.
   template <typename Iter>
-  static PAListPtr get(const Iter &I, const Iter &E) {
-    if (I == E) return PAListPtr();  // Empty list.
+  static AttrListPtr get(const Iter &I, const Iter &E) {
+    if (I == E) return AttrListPtr();  // Empty list.
     return get(&*I, static_cast<unsigned>(E-I));
   }
 
   /// addAttr - Add the specified attribute at the specified index to this
-  /// attribute list.  Since parameter attribute lists are immutable, this
+  /// attribute list.  Since attribute lists are immutable, this
   /// returns the new list.
-  PAListPtr addAttr(unsigned Idx, Attributes Attrs) const;
+  AttrListPtr addAttr(unsigned Idx, Attributes Attrs) const;
   
   /// removeAttr - Remove the specified attribute at the specified index from
-  /// this attribute list.  Since parameter attribute lists are immutable, this
+  /// this attribute list.  Since attribute lists are immutable, this
   /// returns the new list.
-  PAListPtr removeAttr(unsigned Idx, Attributes Attrs) const;
+  AttrListPtr removeAttr(unsigned Idx, Attributes Attrs) const;
   
   //===--------------------------------------------------------------------===//
-  // Parameter Attribute List Accessors
+  // Attribute List Accessors
   //===--------------------------------------------------------------------===//
   
-  /// getParamAttrs - The parameter attributes for the specified parameter are
-  /// returned.  Parameters for the result are denoted with Idx = 0.
-  Attributes getParamAttrs(unsigned Idx) const;
+  /// getAttributes - The attributes for the specified index are
+  /// returned.  Attributes for the result are denoted with Idx = 0.
+  Attributes getAttributes(unsigned Idx) const;
   
   /// paramHasAttr - Return true if the specified parameter index has the
   /// specified attribute set.
   bool paramHasAttr(unsigned Idx, Attributes Attr) const {
-    return getParamAttrs(Idx) & Attr;
+    return getAttributes(Idx) & Attr;
   }
   
   /// getParamAlignment - Return the alignment for the specified function
   /// parameter.
   unsigned getParamAlignment(unsigned Idx) const {
-    return (getParamAttrs(Idx) & ParamAttr::Alignment) >> 16;
+    return (getAttributes(Idx) & Attribute::Alignment) >> 16;
   }
   
   /// hasAttrSomewhere - Return true if the specified attribute is set for at
@@ -169,29 +168,29 @@
   bool hasAttrSomewhere(Attributes Attr) const;
 
   /// operator==/!= - Provide equality predicates.
-  bool operator==(const PAListPtr &RHS) const { return PAList == RHS.PAList; }
-  bool operator!=(const PAListPtr &RHS) const { return PAList != RHS.PAList; }
+  bool operator==(const AttrListPtr &RHS) const { return AttrList == RHS.AttrList; }
+  bool operator!=(const AttrListPtr &RHS) const { return AttrList != RHS.AttrList; }
   
   void dump() const;
 
   //===--------------------------------------------------------------------===//
-  // Parameter Attribute List Introspection
+  // Attribute List Introspection
   //===--------------------------------------------------------------------===//
   
   /// getRawPointer - Return a raw pointer that uniquely identifies this
-  /// parameter attribute list. 
+  /// attribute list. 
   void *getRawPointer() const {
-    return PAList;
+    return AttrList;
   }
   
-  // Parameter attributes are stored as a dense set of slots, where there is one
+  // Attributes are stored as a dense set of slots, where there is one
   // slot for each argument that has an attribute.  This allows walking over the
   // dense set instead of walking the sparse list of attributes.
   
-  /// isEmpty - Return true if no parameters have an attribute.
+  /// isEmpty - Return true if there are no attributes.
   ///
   bool isEmpty() const {
-    return PAList == 0;
+    return AttrList == 0;
   }
   
   /// getNumSlots - Return the number of slots used in this attribute list. 
@@ -199,12 +198,12 @@
   /// (including the function itself).
   unsigned getNumSlots() const;
   
-  /// getSlot - Return the FnAttributeWithIndex at the specified slot.  This
-  /// holds a parameter number plus a set of attributes.
-  const FnAttributeWithIndex &getSlot(unsigned Slot) const;
+  /// getSlot - Return the AttributeWithIndex at the specified slot.  This
+  /// holds a index number plus a set of attributes.
+  const AttributeWithIndex &getSlot(unsigned Slot) const;
   
 private:
-  explicit PAListPtr(AttributeListImpl *L);
+  explicit AttrListPtr(AttributeListImpl *L);
 };
 
 } // End llvm namespace

Modified: llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h?rev=56622&r1=56621&r2=56622&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h (original)
+++ llvm/trunk/include/llvm/Bitcode/LLVMBitCodes.h Thu Sep 25 16:00:45 2008
@@ -64,7 +64,7 @@
   };
   
   /// PARAMATTR blocks have code for defining a parameter attribute set.
-  enum ParamAttrCodes {
+  enum AttributeCodes {
     PARAMATTR_CODE_ENTRY = 1   // ENTRY: [paramidx0, attr0, paramidx1, attr1...]
   };
   

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

==============================================================================
--- llvm/trunk/include/llvm/Function.h (original)
+++ llvm/trunk/include/llvm/Function.h Thu Sep 25 16:00:45 2008
@@ -69,7 +69,7 @@
   BasicBlockListType  BasicBlocks;        ///< The basic blocks
   mutable ArgumentListType ArgumentList;  ///< The formal arguments
   ValueSymbolTable *SymTab;               ///< Symbol table of args/instructions
-  PAListPtr ParamAttrs;                   ///< Parameter attributes
+  AttrListPtr AttributeList;                   ///< Parameter attributes
 
   // The Calling Convention is stored in Value::SubclassData.
   /*unsigned CallingConvention;*/
@@ -140,13 +140,13 @@
     SubclassData = (SubclassData & 1) | (CC << 1);
   }
   
-  /// getParamAttrs - Return the parameter attributes for this Function.
+  /// getAttributes - Return the parameter attributes for this Function.
   ///
-  const PAListPtr &getParamAttrs() const { return ParamAttrs; }
+  const AttrListPtr &getAttributes() const { return AttributeList; }
 
-  /// setParamAttrs - Set the parameter attributes for this Function.
+  /// setAttributes - Set the parameter attributes for this Function.
   ///
-  void setParamAttrs(const PAListPtr &attrs) { ParamAttrs = attrs; }
+  void setAttributes(const AttrListPtr &attrs) { AttributeList = attrs; }
 
 
   /// hasNote - Return true if this function has given note.
@@ -159,7 +159,7 @@
   ///
   void setNotes(const Attributes N) { 
     // Notes are stored at ~0 index in parameter attribute list
-    addParamAttr(~0, N);
+    addAttribute(~0, N);
   }
 
   /// hasGC/getGC/setGC/clearGC - The name of the garbage collection algorithm
@@ -171,60 +171,60 @@
 
   /// @brief Determine whether the function has the given attribute.
   bool paramHasAttr(unsigned i, Attributes attr) const {
-    return ParamAttrs.paramHasAttr(i, attr);
+    return AttributeList.paramHasAttr(i, attr);
   }
 
-  /// addParamAttr - adds the attribute to the list of attributes.
-  void addParamAttr(unsigned i, Attributes attr);
+  /// addAttribute - adds the attribute to the list of attributes.
+  void addAttribute(unsigned i, Attributes attr);
   
-  /// removeParamAttr - removes the attribute from the list of attributes.
-  void removeParamAttr(unsigned i, Attributes attr);
+  /// removeAttribute - removes the attribute from the list of attributes.
+  void removeAttribute(unsigned i, Attributes attr);
 
   /// @brief Extract the alignment for a call or parameter (0=unknown).
   unsigned getParamAlignment(unsigned i) const {
-    return ParamAttrs.getParamAlignment(i);
+    return AttributeList.getParamAlignment(i);
   }
 
   /// @brief Determine if the function does not access memory.
   bool doesNotAccessMemory() const {
-    return paramHasAttr(0, ParamAttr::ReadNone);
+    return paramHasAttr(0, Attribute::ReadNone);
   }
   void setDoesNotAccessMemory(bool DoesNotAccessMemory = true) {
-    if (DoesNotAccessMemory) addParamAttr(0, ParamAttr::ReadNone);
-    else removeParamAttr(0, ParamAttr::ReadNone);
+    if (DoesNotAccessMemory) addAttribute(0, Attribute::ReadNone);
+    else removeAttribute(0, Attribute::ReadNone);
   }
 
   /// @brief Determine if the function does not access or only reads memory.
   bool onlyReadsMemory() const {
-    return doesNotAccessMemory() || paramHasAttr(0, ParamAttr::ReadOnly);
+    return doesNotAccessMemory() || paramHasAttr(0, Attribute::ReadOnly);
   }
   void setOnlyReadsMemory(bool OnlyReadsMemory = true) {
-    if (OnlyReadsMemory) addParamAttr(0, ParamAttr::ReadOnly);
-    else removeParamAttr(0, ParamAttr::ReadOnly | ParamAttr::ReadNone);
+    if (OnlyReadsMemory) addAttribute(0, Attribute::ReadOnly);
+    else removeAttribute(0, Attribute::ReadOnly | Attribute::ReadNone);
   }
 
   /// @brief Determine if the function cannot return.
   bool doesNotReturn() const {
-    return paramHasAttr(0, ParamAttr::NoReturn);
+    return paramHasAttr(0, Attribute::NoReturn);
   }
   void setDoesNotReturn(bool DoesNotReturn = true) {
-    if (DoesNotReturn) addParamAttr(0, ParamAttr::NoReturn);
-    else removeParamAttr(0, ParamAttr::NoReturn);
+    if (DoesNotReturn) addAttribute(0, Attribute::NoReturn);
+    else removeAttribute(0, Attribute::NoReturn);
   }
 
   /// @brief Determine if the function cannot unwind.
   bool doesNotThrow() const {
-    return paramHasAttr(0, ParamAttr::NoUnwind);
+    return paramHasAttr(0, Attribute::NoUnwind);
   }
   void setDoesNotThrow(bool DoesNotThrow = true) {
-    if (DoesNotThrow) addParamAttr(0, ParamAttr::NoUnwind);
-    else removeParamAttr(0, ParamAttr::NoUnwind);
+    if (DoesNotThrow) addAttribute(0, Attribute::NoUnwind);
+    else removeAttribute(0, Attribute::NoUnwind);
   }
 
   /// @brief Determine if the function returns a structure through first 
   /// pointer argument.
   bool hasStructRetAttr() const {
-    return paramHasAttr(1, ParamAttr::StructRet);
+    return paramHasAttr(1, Attribute::StructRet);
   }
 
   /// copyAttributesFrom - copy all additional attributes (those not needed to

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

==============================================================================
--- llvm/trunk/include/llvm/Instructions.h (original)
+++ llvm/trunk/include/llvm/Instructions.h Thu Sep 25 16:00:45 2008
@@ -973,7 +973,7 @@
 ///
 
 class CallInst : public Instruction {
-  PAListPtr ParamAttrs; ///< parameter attributes for call
+  AttrListPtr AttributeList; ///< 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);
@@ -1073,73 +1073,73 @@
     SubclassData = (SubclassData & 1) | (CC << 1);
   }
 
-  /// getParamAttrs - Return the parameter attributes for this call.
+  /// getAttributes - Return the parameter attributes for this call.
   ///
-  const PAListPtr &getParamAttrs() const { return ParamAttrs; }
+  const AttrListPtr &getAttributes() const { return AttributeList; }
 
-  /// setParamAttrs - Sets the parameter attributes for this call.
-  void setParamAttrs(const PAListPtr &Attrs) { ParamAttrs = Attrs; }
+  /// setAttributes - Sets the parameter attributes for this call.
+  void setAttributes(const AttrListPtr &Attrs) { AttributeList = Attrs; }
   
-  /// addParamAttr - adds the attribute to the list of attributes.
-  void addParamAttr(unsigned i, Attributes attr);
+  /// addAttribute - adds the attribute to the list of attributes.
+  void addAttribute(unsigned i, Attributes attr);
 
-  /// removeParamAttr - removes the attribute from the list of attributes.
-  void removeParamAttr(unsigned i, Attributes attr);
+  /// removeAttribute - removes the attribute from the list of attributes.
+  void removeAttribute(unsigned i, Attributes attr);
 
   /// @brief Determine whether the call or the callee has the given attribute.
   bool paramHasAttr(unsigned i, unsigned attr) const;
 
   /// @brief Extract the alignment for a call or parameter (0=unknown).
   unsigned getParamAlignment(unsigned i) const {
-    return ParamAttrs.getParamAlignment(i);
+    return AttributeList.getParamAlignment(i);
   }
 
   /// @brief Determine if the call does not access memory.
   bool doesNotAccessMemory() const {
-    return paramHasAttr(0, ParamAttr::ReadNone);
+    return paramHasAttr(0, Attribute::ReadNone);
   }
   void setDoesNotAccessMemory(bool NotAccessMemory = true) {
-    if (NotAccessMemory) addParamAttr(0, ParamAttr::ReadNone);
-    else removeParamAttr(0, ParamAttr::ReadNone);
+    if (NotAccessMemory) addAttribute(0, Attribute::ReadNone);
+    else removeAttribute(0, Attribute::ReadNone);
   }
 
   /// @brief Determine if the call does not access or only reads memory.
   bool onlyReadsMemory() const {
-    return doesNotAccessMemory() || paramHasAttr(0, ParamAttr::ReadOnly);
+    return doesNotAccessMemory() || paramHasAttr(0, Attribute::ReadOnly);
   }
   void setOnlyReadsMemory(bool OnlyReadsMemory = true) {
-    if (OnlyReadsMemory) addParamAttr(0, ParamAttr::ReadOnly);
-    else removeParamAttr(0, ParamAttr::ReadOnly | ParamAttr::ReadNone);
+    if (OnlyReadsMemory) addAttribute(0, Attribute::ReadOnly);
+    else removeAttribute(0, Attribute::ReadOnly | Attribute::ReadNone);
   }
 
   /// @brief Determine if the call cannot return.
   bool doesNotReturn() const {
-    return paramHasAttr(0, ParamAttr::NoReturn);
+    return paramHasAttr(0, Attribute::NoReturn);
   }
   void setDoesNotReturn(bool DoesNotReturn = true) {
-    if (DoesNotReturn) addParamAttr(0, ParamAttr::NoReturn);
-    else removeParamAttr(0, ParamAttr::NoReturn);
+    if (DoesNotReturn) addAttribute(0, Attribute::NoReturn);
+    else removeAttribute(0, Attribute::NoReturn);
   }
 
   /// @brief Determine if the call cannot unwind.
   bool doesNotThrow() const {
-    return paramHasAttr(0, ParamAttr::NoUnwind);
+    return paramHasAttr(0, Attribute::NoUnwind);
   }
   void setDoesNotThrow(bool DoesNotThrow = true) {
-    if (DoesNotThrow) addParamAttr(0, ParamAttr::NoUnwind);
-    else removeParamAttr(0, ParamAttr::NoUnwind);
+    if (DoesNotThrow) addAttribute(0, Attribute::NoUnwind);
+    else removeAttribute(0, Attribute::NoUnwind);
   }
 
   /// @brief Determine if the call returns a structure through first 
   /// pointer argument.
   bool hasStructRetAttr() const {
     // Be friendly and also check the callee.
-    return paramHasAttr(1, ParamAttr::StructRet);
+    return paramHasAttr(1, Attribute::StructRet);
   }
 
   /// @brief Determine if any call argument is an aggregate passed by value.
   bool hasByValArgument() const {
-    return ParamAttrs.hasAttrSomewhere(ParamAttr::ByVal);
+    return AttributeList.hasAttrSomewhere(Attribute::ByVal);
   }
 
   /// getCalledFunction - Return the function being called by this instruction
@@ -2353,7 +2353,7 @@
 /// calling convention of the call.
 ///
 class InvokeInst : public TerminatorInst {
-  PAListPtr ParamAttrs;
+  AttrListPtr AttributeList;
   InvokeInst(const InvokeInst &BI);
   void init(Value *Fn, BasicBlock *IfNormal, BasicBlock *IfException,
             Value* const *Args, unsigned NumArgs);
@@ -2431,69 +2431,69 @@
     SubclassData = CC;
   }
 
-  /// getParamAttrs - Return the parameter attributes for this invoke.
+  /// getAttributes - Return the parameter attributes for this invoke.
   ///
-  const PAListPtr &getParamAttrs() const { return ParamAttrs; }
+  const AttrListPtr &getAttributes() const { return AttributeList; }
 
-  /// setParamAttrs - Set the parameter attributes for this invoke.
+  /// setAttributes - Set the parameter attributes for this invoke.
   ///
-  void setParamAttrs(const PAListPtr &Attrs) { ParamAttrs = Attrs; }
+  void setAttributes(const AttrListPtr &Attrs) { AttributeList = Attrs; }
 
   /// @brief Determine whether the call or the callee has the given attribute.
   bool paramHasAttr(unsigned i, Attributes attr) const;
   
-  /// addParamAttr - adds the attribute to the list of attributes.
-  void addParamAttr(unsigned i, Attributes attr);
+  /// addAttribute - adds the attribute to the list of attributes.
+  void addAttribute(unsigned i, Attributes attr);
 
-  /// removeParamAttr - removes the attribute from the list of attributes.
-  void removeParamAttr(unsigned i, Attributes attr);
+  /// removeAttribute - removes the attribute from the list of attributes.
+  void removeAttribute(unsigned i, Attributes attr);
 
   /// @brief Extract the alignment for a call or parameter (0=unknown).
   unsigned getParamAlignment(unsigned i) const {
-    return ParamAttrs.getParamAlignment(i);
+    return AttributeList.getParamAlignment(i);
   }
 
   /// @brief Determine if the call does not access memory.
   bool doesNotAccessMemory() const {
-    return paramHasAttr(0, ParamAttr::ReadNone);
+    return paramHasAttr(0, Attribute::ReadNone);
   }
   void setDoesNotAccessMemory(bool NotAccessMemory = true) {
-    if (NotAccessMemory) addParamAttr(0, ParamAttr::ReadNone);
-    else removeParamAttr(0, ParamAttr::ReadNone);
+    if (NotAccessMemory) addAttribute(0, Attribute::ReadNone);
+    else removeAttribute(0, Attribute::ReadNone);
   }
 
   /// @brief Determine if the call does not access or only reads memory.
   bool onlyReadsMemory() const {
-    return doesNotAccessMemory() || paramHasAttr(0, ParamAttr::ReadOnly);
+    return doesNotAccessMemory() || paramHasAttr(0, Attribute::ReadOnly);
   }
   void setOnlyReadsMemory(bool OnlyReadsMemory = true) {
-    if (OnlyReadsMemory) addParamAttr(0, ParamAttr::ReadOnly);
-    else removeParamAttr(0, ParamAttr::ReadOnly | ParamAttr::ReadNone);
+    if (OnlyReadsMemory) addAttribute(0, Attribute::ReadOnly);
+    else removeAttribute(0, Attribute::ReadOnly | Attribute::ReadNone);
   }
 
   /// @brief Determine if the call cannot return.
   bool doesNotReturn() const {
-    return paramHasAttr(0, ParamAttr::NoReturn);
+    return paramHasAttr(0, Attribute::NoReturn);
   }
   void setDoesNotReturn(bool DoesNotReturn = true) {
-    if (DoesNotReturn) addParamAttr(0, ParamAttr::NoReturn);
-    else removeParamAttr(0, ParamAttr::NoReturn);
+    if (DoesNotReturn) addAttribute(0, Attribute::NoReturn);
+    else removeAttribute(0, Attribute::NoReturn);
   }
 
   /// @brief Determine if the call cannot unwind.
   bool doesNotThrow() const {
-    return paramHasAttr(0, ParamAttr::NoUnwind);
+    return paramHasAttr(0, Attribute::NoUnwind);
   }
   void setDoesNotThrow(bool DoesNotThrow = true) {
-    if (DoesNotThrow) addParamAttr(0, ParamAttr::NoUnwind);
-    else removeParamAttr(0, ParamAttr::NoUnwind);
+    if (DoesNotThrow) addAttribute(0, Attribute::NoUnwind);
+    else removeAttribute(0, Attribute::NoUnwind);
   }
 
   /// @brief Determine if the call returns a structure through first 
   /// pointer argument.
   bool hasStructRetAttr() const {
     // Be friendly and also check the callee.
-    return paramHasAttr(1, ParamAttr::StructRet);
+    return paramHasAttr(1, Attribute::StructRet);
   }
 
   /// getCalledFunction - Return the function called, or null if this is an

Modified: llvm/trunk/include/llvm/Intrinsics.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Intrinsics.h?rev=56622&r1=56621&r2=56622&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Intrinsics.h (original)
+++ llvm/trunk/include/llvm/Intrinsics.h Thu Sep 25 16:00:45 2008
@@ -24,7 +24,7 @@
 class FunctionType;
 class Function;
 class Module;
-class PAListPtr;
+class AttrListPtr;
 
 /// Intrinsic Namespace - This namespace contains an enum with a value for
 /// every intrinsic/builtin function known by LLVM.  These enum values are
@@ -49,9 +49,9 @@
   ///
   const FunctionType *getType(ID id, const Type **Tys = 0, unsigned numTys = 0);
 
-  /// Intrinsic::getParamAttrs(ID) - Return the attributes for an intrinsic.
+  /// Intrinsic::getAttributes(ID) - Return the attributes for an intrinsic.
   ///
-  PAListPtr getParamAttrs(ID id);
+  AttrListPtr getAttributes(ID id);
 
   /// Intrinsic::getDeclaration(M, ID) - Create or insert an LLVM Function
   /// declaration for an intrinsic, and return it.

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

==============================================================================
--- llvm/trunk/include/llvm/Support/CallSite.h (original)
+++ llvm/trunk/include/llvm/Support/CallSite.h Thu Sep 25 16:00:45 2008
@@ -62,10 +62,10 @@
   unsigned getCallingConv() const;
   void setCallingConv(unsigned CC);
 
-  /// getParamAttrs/setParamAttrs - get or set the parameter attributes of
+  /// getAttributes/setAttributes - get or set the parameter attributes of
   /// the call.
-  const PAListPtr &getParamAttrs() const;
-  void setParamAttrs(const PAListPtr &PAL);
+  const AttrListPtr &getAttributes() const;
+  void setAttributes(const AttrListPtr &PAL);
 
   /// paramHasAttr - whether the call or the callee has the given attribute.
   bool paramHasAttr(uint16_t i, Attributes attr) const;

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

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs Thu Sep 25 16:00:45 2008
@@ -400,7 +400,7 @@
 
 
 /* Copy the first part of user declarations.  */
-#line 14 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 14 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
 
 #include "ParserInternals.h"
 #include "llvm/CallingConv.h"
@@ -1377,7 +1377,7 @@
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 970 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 970 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
@@ -1405,7 +1405,7 @@
 
   llvm::GlobalValue::LinkageTypes         Linkage;
   llvm::GlobalValue::VisibilityTypes      Visibility;
-  llvm::Attributes                  ParamAttrs;
+  llvm::Attributes                  Attributes;
   llvm::APInt                       *APIntVal;
   int64_t                           SInt64Val;
   uint64_t                          UInt64Val;
@@ -1961,8 +1961,8 @@
   "OptLocalName", "OptAddrSpace", "OptLocalAssign", "LocalNumber",
   "GlobalName", "OptGlobalAssign", "GlobalAssign", "GVInternalLinkage",
   "GVExternalLinkage", "GVVisibilityStyle", "FunctionDeclareLinkage",
-  "FunctionDefineLinkage", "AliasLinkage", "OptCallingConv", "ParamAttr",
-  "OptParamAttrs", "FuncAttr", "OptFuncAttrs", "FuncNoteList", "FuncNote",
+  "FunctionDefineLinkage", "AliasLinkage", "OptCallingConv", "Attribute",
+  "OptAttributes", "FuncAttr", "OptFuncAttrs", "FuncNoteList", "FuncNote",
   "OptFuncNotes", "OptGC", "OptAlign", "OptCAlign", "SectionString",
   "OptSection", "GlobalVarAttributes", "GlobalVarAttribute", "PrimType",
   "Types", "ArgType", "ResultTypes", "ArgTypeList", "ArgTypeListI",
@@ -3657,152 +3657,152 @@
   switch (yyn)
     {
         case 29:
-#line 1147 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1147 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_EQ; ;}
     break;
 
   case 30:
-#line 1147 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1147 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_NE; ;}
     break;
 
   case 31:
-#line 1148 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1148 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SLT; ;}
     break;
 
   case 32:
-#line 1148 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1148 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SGT; ;}
     break;
 
   case 33:
-#line 1149 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1149 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SLE; ;}
     break;
 
   case 34:
-#line 1149 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1149 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SGE; ;}
     break;
 
   case 35:
-#line 1150 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1150 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_ULT; ;}
     break;
 
   case 36:
-#line 1150 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1150 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_UGT; ;}
     break;
 
   case 37:
-#line 1151 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1151 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_ULE; ;}
     break;
 
   case 38:
-#line 1151 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1151 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_UGE; ;}
     break;
 
   case 39:
-#line 1155 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1155 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OEQ; ;}
     break;
 
   case 40:
-#line 1155 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1155 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ONE; ;}
     break;
 
   case 41:
-#line 1156 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1156 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OLT; ;}
     break;
 
   case 42:
-#line 1156 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1156 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OGT; ;}
     break;
 
   case 43:
-#line 1157 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1157 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OLE; ;}
     break;
 
   case 44:
-#line 1157 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1157 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OGE; ;}
     break;
 
   case 45:
-#line 1158 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1158 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ORD; ;}
     break;
 
   case 46:
-#line 1158 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1158 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UNO; ;}
     break;
 
   case 47:
-#line 1159 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1159 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UEQ; ;}
     break;
 
   case 48:
-#line 1159 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1159 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UNE; ;}
     break;
 
   case 49:
-#line 1160 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1160 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ULT; ;}
     break;
 
   case 50:
-#line 1160 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1160 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UGT; ;}
     break;
 
   case 51:
-#line 1161 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1161 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ULE; ;}
     break;
 
   case 52:
-#line 1161 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1161 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UGE; ;}
     break;
 
   case 53:
-#line 1162 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1162 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_TRUE; ;}
     break;
 
   case 54:
-#line 1163 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1163 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_FALSE; ;}
     break;
 
   case 65:
-#line 1172 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1172 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 66:
-#line 1174 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1174 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal)=(yyvsp[(3) - (4)].UInt64Val); ;}
     break;
 
   case 67:
-#line 1175 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1175 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal)=0; ;}
     break;
 
   case 68:
-#line 1179 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1179 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal);
     CHECK_FOR_ERROR
@@ -3810,7 +3810,7 @@
     break;
 
   case 69:
-#line 1183 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1183 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
@@ -3818,7 +3818,7 @@
     break;
 
   case 70:
-#line 1188 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1188 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[(1) - (2)].UIntVal);
   CHECK_FOR_ERROR
@@ -3826,7 +3826,7 @@
     break;
 
   case 74:
-#line 1197 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1197 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
@@ -3834,7 +3834,7 @@
     break;
 
   case 75:
-#line 1202 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1202 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal);
     CHECK_FOR_ERROR
@@ -3842,162 +3842,162 @@
     break;
 
   case 76:
-#line 1208 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1208 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 77:
-#line 1209 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1209 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 78:
-#line 1210 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1210 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 79:
-#line 1211 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1211 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
     break;
 
   case 80:
-#line 1212 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1212 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 81:
-#line 1213 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1213 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::CommonLinkage; ;}
     break;
 
   case 82:
-#line 1217 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1217 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 83:
-#line 1218 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1218 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 84:
-#line 1219 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1219 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 85:
-#line 1223 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1223 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::DefaultVisibility;   ;}
     break;
 
   case 86:
-#line 1224 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1224 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::DefaultVisibility;   ;}
     break;
 
   case 87:
-#line 1225 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1225 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::HiddenVisibility;    ;}
     break;
 
   case 88:
-#line 1226 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1226 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::ProtectedVisibility; ;}
     break;
 
   case 89:
-#line 1230 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1230 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 90:
-#line 1231 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1231 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 91:
-#line 1232 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1232 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 92:
-#line 1236 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1236 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 93:
-#line 1237 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1237 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 94:
-#line 1238 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1238 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 95:
-#line 1239 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1239 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 96:
-#line 1240 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1240 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 97:
-#line 1244 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1244 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 98:
-#line 1245 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1245 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 99:
-#line 1246 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1246 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 100:
-#line 1249 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1249 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 101:
-#line 1250 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1250 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 102:
-#line 1251 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1251 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Fast; ;}
     break;
 
   case 103:
-#line 1252 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1252 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Cold; ;}
     break;
 
   case 104:
-#line 1253 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1253 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_StdCall; ;}
     break;
 
   case 105:
-#line 1254 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1254 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_FastCall; ;}
     break;
 
   case 106:
-#line 1255 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1255 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_SSECall; ;}
     break;
 
   case 107:
-#line 1256 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1256 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                    if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val))
                      GEN_ERROR("Calling conv too large");
@@ -4007,181 +4007,181 @@
     break;
 
   case 108:
-#line 1263 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::ZExt;      ;}
+#line 1263 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::ZExt;      ;}
     break;
 
   case 109:
-#line 1264 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::ZExt;      ;}
+#line 1264 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::ZExt;      ;}
     break;
 
   case 110:
-#line 1265 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::SExt;      ;}
+#line 1265 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::SExt;      ;}
     break;
 
   case 111:
-#line 1266 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::SExt;      ;}
+#line 1266 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::SExt;      ;}
     break;
 
   case 112:
-#line 1267 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::InReg;     ;}
+#line 1267 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::InReg;     ;}
     break;
 
   case 113:
-#line 1268 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::StructRet; ;}
+#line 1268 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::StructRet; ;}
     break;
 
   case 114:
-#line 1269 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::NoAlias;   ;}
+#line 1269 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::NoAlias;   ;}
     break;
 
   case 115:
-#line 1270 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::ByVal;     ;}
+#line 1270 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::ByVal;     ;}
     break;
 
   case 116:
-#line 1271 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::Nest;      ;}
+#line 1271 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::Nest;      ;}
     break;
 
   case 117:
-#line 1272 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) =
-                          ParamAttr::constructAlignmentFromInt((yyvsp[(2) - (2)].UInt64Val));    ;}
+#line 1272 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) =
+                          Attribute::constructAlignmentFromInt((yyvsp[(2) - (2)].UInt64Val));    ;}
     break;
 
   case 118:
-#line 1276 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::None; ;}
+#line 1276 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::None; ;}
     break;
 
   case 119:
-#line 1277 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1277 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-                (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs);
+                (yyval.Attributes) = (yyvsp[(1) - (2)].Attributes) | (yyvsp[(2) - (2)].Attributes);
               ;}
     break;
 
   case 120:
-#line 1282 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::NoReturn; ;}
+#line 1282 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::NoReturn; ;}
     break;
 
   case 121:
-#line 1283 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::NoUnwind; ;}
+#line 1283 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::NoUnwind; ;}
     break;
 
   case 122:
-#line 1284 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::InReg;     ;}
+#line 1284 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::InReg;     ;}
     break;
 
   case 123:
-#line 1285 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::ZExt;     ;}
+#line 1285 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::ZExt;     ;}
     break;
 
   case 124:
-#line 1286 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::SExt;     ;}
+#line 1286 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::SExt;     ;}
     break;
 
   case 125:
-#line 1287 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::ReadNone; ;}
+#line 1287 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::ReadNone; ;}
     break;
 
   case 126:
-#line 1288 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::ReadOnly; ;}
+#line 1288 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::ReadOnly; ;}
     break;
 
   case 127:
-#line 1291 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::None; ;}
+#line 1291 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::None; ;}
     break;
 
   case 128:
-#line 1292 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1292 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-                (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs);
+                (yyval.Attributes) = (yyvsp[(1) - (2)].Attributes) | (yyvsp[(2) - (2)].Attributes);
               ;}
     break;
 
   case 129:
-#line 1297 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = (yyvsp[(1) - (1)].ParamAttrs); ;}
+#line 1297 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = (yyvsp[(1) - (1)].Attributes); ;}
     break;
 
   case 130:
-#line 1298 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1298 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-                unsigned tmp = (yyvsp[(1) - (3)].ParamAttrs) | (yyvsp[(3) - (3)].ParamAttrs);
-                if ((yyvsp[(3) - (3)].ParamAttrs) == FnAttr::NoInline
-                    && ((yyvsp[(1) - (3)].ParamAttrs) & FnAttr::AlwaysInline))
+                unsigned tmp = (yyvsp[(1) - (3)].Attributes) | (yyvsp[(3) - (3)].Attributes);
+                if ((yyvsp[(3) - (3)].Attributes) == Attribute::NoInline
+                    && ((yyvsp[(1) - (3)].Attributes) & Attribute::AlwaysInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
-                    if ((yyvsp[(3) - (3)].ParamAttrs) == FnAttr::AlwaysInline
-                        && ((yyvsp[(1) - (3)].ParamAttrs) & FnAttr::NoInline))
+                    if ((yyvsp[(3) - (3)].Attributes) == Attribute::AlwaysInline
+                        && ((yyvsp[(1) - (3)].Attributes) & Attribute::NoInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
-                (yyval.ParamAttrs) = tmp;
+                (yyval.Attributes) = tmp;
                 CHECK_FOR_ERROR
               ;}
     break;
 
   case 131:
-#line 1311 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = FnAttr::NoInline; ;}
+#line 1311 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::NoInline; ;}
     break;
 
   case 132:
-#line 1312 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = FnAttr::AlwaysInline; ;}
+#line 1312 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::AlwaysInline; ;}
     break;
 
   case 133:
-#line 1313 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = FnAttr::OptimizeForSize; ;}
+#line 1313 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::OptimizeForSize; ;}
     break;
 
   case 134:
-#line 1316 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = FnAttr::None; ;}
+#line 1316 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::None; ;}
     break;
 
   case 135:
-#line 1317 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1317 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-                (yyval.ParamAttrs) =  (yyvsp[(3) - (4)].ParamAttrs);
+                (yyval.Attributes) =  (yyvsp[(3) - (4)].Attributes);
               ;}
     break;
 
   case 136:
-#line 1322 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1322 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 137:
-#line 1323 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1323 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.StrVal) = (yyvsp[(2) - (2)].StrVal);
               ;}
     break;
 
   case 138:
-#line 1330 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1330 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
   case 139:
-#line 1331 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1331 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[(2) - (2)].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -4191,12 +4191,12 @@
     break;
 
   case 140:
-#line 1337 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1337 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
   case 141:
-#line 1338 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1338 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[(3) - (3)].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -4206,7 +4206,7 @@
     break;
 
   case 142:
-#line 1347 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1347 "/Volumes/Nanpura/mainline/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] == '\\')
@@ -4217,27 +4217,27 @@
     break;
 
   case 143:
-#line 1355 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1355 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 144:
-#line 1356 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1356 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = (yyvsp[(1) - (1)].StrVal); ;}
     break;
 
   case 145:
-#line 1361 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1361 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
   case 146:
-#line 1362 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1362 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
   case 147:
-#line 1363 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1363 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV->setSection(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -4246,7 +4246,7 @@
     break;
 
   case 148:
-#line 1368 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1368 "/Volumes/Nanpura/mainline/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");
@@ -4256,7 +4256,7 @@
     break;
 
   case 156:
-#line 1384 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1384 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
@@ -4264,7 +4264,7 @@
     break;
 
   case 157:
-#line 1388 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1388 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder((yyvsp[(1) - (1)].PrimType));
     CHECK_FOR_ERROR
@@ -4272,7 +4272,7 @@
     break;
 
   case 158:
-#line 1392 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1392 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {                             // Pointer type?
     if (*(yyvsp[(1) - (3)].TypeVal) == Type::LabelTy)
       GEN_ERROR("Cannot form a pointer to a basic block");
@@ -4283,7 +4283,7 @@
     break;
 
   case 159:
-#line 1399 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1399 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {            // Named types are also simple types...
     const Type* tmp = getTypeVal((yyvsp[(1) - (1)].ValIDVal));
     CHECK_FOR_ERROR
@@ -4292,7 +4292,7 @@
     break;
 
   case 160:
-#line 1404 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1404 "/Volumes/Nanpura/mainline/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
@@ -4304,7 +4304,7 @@
     break;
 
   case 161:
-#line 1412 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1412 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
@@ -4337,7 +4337,7 @@
     break;
 
   case 162:
-#line 1441 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1441 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
@@ -4365,7 +4365,7 @@
     break;
 
   case 163:
-#line 1466 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1466 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {          // Sized array type?
     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(ArrayType::get(*(yyvsp[(4) - (5)].TypeVal), (yyvsp[(2) - (5)].UInt64Val))));
     delete (yyvsp[(4) - (5)].TypeVal);
@@ -4374,7 +4374,7 @@
     break;
 
   case 164:
-#line 1471 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1471 "/Volumes/Nanpura/mainline/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))
@@ -4388,7 +4388,7 @@
     break;
 
   case 165:
-#line 1481 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1481 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {                        // Structure type?
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[(2) - (3)].TypeList)->begin(),
@@ -4402,7 +4402,7 @@
     break;
 
   case 166:
-#line 1491 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1491 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {                                  // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>()));
     CHECK_FOR_ERROR
@@ -4410,7 +4410,7 @@
     break;
 
   case 167:
-#line 1495 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1495 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[(3) - (5)].TypeList)->begin(),
@@ -4424,7 +4424,7 @@
     break;
 
   case 168:
-#line 1505 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1505 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {                         // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>(), true));
     CHECK_FOR_ERROR
@@ -4432,17 +4432,17 @@
     break;
 
   case 169:
-#line 1512 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1512 "/Volumes/Nanpura/mainline/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 = ParamAttr::None;
+    (yyval.TypeWithAttrs).Attrs = Attribute::None;
   ;}
     break;
 
   case 170:
-#line 1521 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1521 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (1)].TypeVal))->getDescription());
@@ -4453,14 +4453,14 @@
     break;
 
   case 171:
-#line 1528 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1528 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(Type::VoidTy);
   ;}
     break;
 
   case 172:
-#line 1533 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1533 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     (yyval.TypeWithAttrsList)->push_back((yyvsp[(1) - (1)].TypeWithAttrs));
@@ -4469,7 +4469,7 @@
     break;
 
   case 173:
-#line 1538 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1538 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList))->push_back((yyvsp[(3) - (3)].TypeWithAttrs));
     CHECK_FOR_ERROR
@@ -4477,10 +4477,10 @@
     break;
 
   case 175:
-#line 1546 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1546 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList);
-    TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
+    TypeWithAttrs TWA; TWA.Attrs = Attribute::None;
     TWA.Ty = new PATypeHolder(Type::VoidTy);
     (yyval.TypeWithAttrsList)->push_back(TWA);
     CHECK_FOR_ERROR
@@ -4488,10 +4488,10 @@
     break;
 
   case 176:
-#line 1553 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1553 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList;
-    TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
+    TypeWithAttrs TWA; TWA.Attrs = Attribute::None;
     TWA.Ty = new PATypeHolder(Type::VoidTy);
     (yyval.TypeWithAttrsList)->push_back(TWA);
     CHECK_FOR_ERROR
@@ -4499,7 +4499,7 @@
     break;
 
   case 177:
-#line 1560 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1560 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     CHECK_FOR_ERROR
@@ -4507,7 +4507,7 @@
     break;
 
   case 178:
-#line 1568 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1568 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeList) = new std::list<PATypeHolder>();
     (yyval.TypeList)->push_back(*(yyvsp[(1) - (1)].TypeVal));
@@ -4517,7 +4517,7 @@
     break;
 
   case 179:
-#line 1574 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1574 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeList)=(yyvsp[(1) - (3)].TypeList))->push_back(*(yyvsp[(3) - (3)].TypeVal));
     delete (yyvsp[(3) - (3)].TypeVal);
@@ -4526,7 +4526,7 @@
     break;
 
   case 180:
-#line 1586 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1586 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
@@ -4558,7 +4558,7 @@
     break;
 
   case 181:
-#line 1614 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1614 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -4578,7 +4578,7 @@
     break;
 
   case 182:
-#line 1630 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1630 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -4609,7 +4609,7 @@
     break;
 
   case 183:
-#line 1657 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1657 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
@@ -4641,7 +4641,7 @@
     break;
 
   case 184:
-#line 1685 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1685 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (4)].TypeVal)->get());
     if (STy == 0)
@@ -4671,7 +4671,7 @@
     break;
 
   case 185:
-#line 1711 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1711 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -4695,7 +4695,7 @@
     break;
 
   case 186:
-#line 1731 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1731 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (6)].TypeVal)->get());
     if (STy == 0)
@@ -4725,7 +4725,7 @@
     break;
 
   case 187:
-#line 1757 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1757 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (5)].TypeVal))->getDescription());
@@ -4749,7 +4749,7 @@
     break;
 
   case 188:
-#line 1777 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1777 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4765,7 +4765,7 @@
     break;
 
   case 189:
-#line 1789 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1789 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4776,7 +4776,7 @@
     break;
 
   case 190:
-#line 1796 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1796 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4846,7 +4846,7 @@
     break;
 
   case 191:
-#line 1862 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1862 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4860,7 +4860,7 @@
     break;
 
   case 192:
-#line 1872 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1872 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4874,7 +4874,7 @@
     break;
 
   case 193:
-#line 1882 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1882 "/Volumes/Nanpura/mainline/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");
@@ -4884,7 +4884,7 @@
     break;
 
   case 194:
-#line 1888 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1888 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     uint32_t BitWidth = cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth();
     if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > BitWidth) {
@@ -4898,7 +4898,7 @@
     break;
 
   case 195:
-#line 1898 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1898 "/Volumes/Nanpura/mainline/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");
@@ -4908,7 +4908,7 @@
     break;
 
   case 196:
-#line 1904 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1904 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     uint32_t BitWidth = cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth();
     if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > BitWidth) {
@@ -4922,7 +4922,7 @@
     break;
 
   case 197:
-#line 1914 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1914 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {                      // Boolean constants
     if (cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth() != 1)
       GEN_ERROR("Constant true must have type i1");
@@ -4932,7 +4932,7 @@
     break;
 
   case 198:
-#line 1920 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1920 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {                     // Boolean constants
     if (cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth() != 1)
       GEN_ERROR("Constant false must have type i1");
@@ -4942,7 +4942,7 @@
     break;
 
   case 199:
-#line 1926 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1926 "/Volumes/Nanpura/mainline/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");
@@ -4957,7 +4957,7 @@
     break;
 
   case 200:
-#line 1939 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1939 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (6)].TypeVal))->getDescription());
@@ -4973,7 +4973,7 @@
     break;
 
   case 201:
-#line 1951 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1951 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[(3) - (5)].ConstVal)->getType()))
       GEN_ERROR("GetElementPtr requires a pointer operand");
@@ -4998,7 +4998,7 @@
     break;
 
   case 202:
-#line 1972 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1972 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (8)].ConstVal)->getType() != Type::Int1Ty)
       GEN_ERROR("Select condition must be of boolean type");
@@ -5010,7 +5010,7 @@
     break;
 
   case 203:
-#line 1980 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1980 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType())
       GEN_ERROR("Binary operator types must match");
@@ -5020,7 +5020,7 @@
     break;
 
   case 204:
-#line 1986 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1986 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType())
       GEN_ERROR("Logical operator types must match");
@@ -5035,7 +5035,7 @@
     break;
 
   case 205:
-#line 1997 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1997 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("icmp operand types must match");
@@ -5044,7 +5044,7 @@
     break;
 
   case 206:
-#line 2002 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2002 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("fcmp operand types must match");
@@ -5053,7 +5053,7 @@
     break;
 
   case 207:
-#line 2007 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2007 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("vicmp operand types must match");
@@ -5062,7 +5062,7 @@
     break;
 
   case 208:
-#line 2012 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2012 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("vfcmp operand types must match");
@@ -5071,7 +5071,7 @@
     break;
 
   case 209:
-#line 2017 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2017 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -5081,7 +5081,7 @@
     break;
 
   case 210:
-#line 2023 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2023 "/Volumes/Nanpura/mainline/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");
@@ -5091,7 +5091,7 @@
     break;
 
   case 211:
-#line 2029 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2029 "/Volumes/Nanpura/mainline/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");
@@ -5101,7 +5101,7 @@
     break;
 
   case 212:
-#line 2035 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2035 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<StructType>((yyvsp[(3) - (5)].ConstVal)->getType()) && !isa<ArrayType>((yyvsp[(3) - (5)].ConstVal)->getType()))
       GEN_ERROR("ExtractValue requires an aggregate operand");
@@ -5113,7 +5113,7 @@
     break;
 
   case 213:
-#line 2043 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2043 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<StructType>((yyvsp[(3) - (7)].ConstVal)->getType()) && !isa<ArrayType>((yyvsp[(3) - (7)].ConstVal)->getType()))
       GEN_ERROR("InsertValue requires an aggregate operand");
@@ -5125,7 +5125,7 @@
     break;
 
   case 214:
-#line 2054 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2054 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ConstVector) = (yyvsp[(1) - (3)].ConstVector))->push_back((yyvsp[(3) - (3)].ConstVal));
     CHECK_FOR_ERROR
@@ -5133,7 +5133,7 @@
     break;
 
   case 215:
-#line 2058 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2058 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstVector) = new std::vector<Constant*>();
     (yyval.ConstVector)->push_back((yyvsp[(1) - (1)].ConstVal));
@@ -5142,27 +5142,27 @@
     break;
 
   case 216:
-#line 2066 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2066 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
   case 217:
-#line 2066 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2066 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
   case 218:
-#line 2069 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2069 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
   case 219:
-#line 2069 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2069 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
   case 220:
-#line 2072 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2072 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const Type* VTy = (yyvsp[(1) - (2)].TypeVal)->get();
     Value *V = getVal(VTy, (yyvsp[(2) - (2)].ValIDVal));
@@ -5178,7 +5178,7 @@
     break;
 
   case 221:
-#line 2084 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2084 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     Constant *Val = (yyvsp[(3) - (6)].ConstVal);
     const Type *DestTy = (yyvsp[(5) - (6)].TypeVal)->get();
@@ -5194,7 +5194,7 @@
     break;
 
   case 222:
-#line 2105 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2105 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -5203,7 +5203,7 @@
     break;
 
   case 223:
-#line 2110 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2110 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -5212,12 +5212,12 @@
     break;
 
   case 226:
-#line 2123 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2123 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = false; ;}
     break;
 
   case 227:
-#line 2123 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2123 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
@@ -5225,26 +5225,26 @@
     break;
 
   case 228:
-#line 2127 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2127 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = true; ;}
     break;
 
   case 229:
-#line 2127 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2127 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 230:
-#line 2130 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2130 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 231:
-#line 2133 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2133 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (3)].TypeVal))->getDescription());
@@ -5272,7 +5272,7 @@
     break;
 
   case 232:
-#line 2157 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2157 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ResolveTypeTo((yyvsp[(1) - (3)].StrVal), (yyvsp[(3) - (3)].PrimType));
 
@@ -5287,7 +5287,7 @@
     break;
 
   case 233:
-#line 2169 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2169 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     /* "Externally Visible" Linkage */
     if ((yyvsp[(5) - (6)].ConstVal) == 0)
@@ -5299,14 +5299,14 @@
     break;
 
   case 234:
-#line 2176 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2176 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
   case 235:
-#line 2180 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2180 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(6) - (7)].ConstVal) == 0)
       GEN_ERROR("Global value initializer is not a constant");
@@ -5316,14 +5316,14 @@
     break;
 
   case 236:
-#line 2185 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2185 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
   case 237:
-#line 2189 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2189 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(6) - (7)].TypeVal))->getDescription());
@@ -5334,7 +5334,7 @@
     break;
 
   case 238:
-#line 2195 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2195 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
@@ -5342,7 +5342,7 @@
     break;
 
   case 239:
-#line 2199 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2199 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     std::string Name;
     if ((yyvsp[(1) - (5)].StrVal)) {
@@ -5386,21 +5386,21 @@
     break;
 
   case 240:
-#line 2239 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2239 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 241:
-#line 2242 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2242 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 242:
-#line 2248 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2248 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
   if (AsmSoFar.empty())
@@ -5413,7 +5413,7 @@
     break;
 
   case 243:
-#line 2258 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2258 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setTargetTriple(*(yyvsp[(3) - (3)].StrVal));
     delete (yyvsp[(3) - (3)].StrVal);
@@ -5421,7 +5421,7 @@
     break;
 
   case 244:
-#line 2262 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2262 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setDataLayout(*(yyvsp[(3) - (3)].StrVal));
     delete (yyvsp[(3) - (3)].StrVal);
@@ -5429,7 +5429,7 @@
     break;
 
   case 246:
-#line 2269 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2269 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary(*(yyvsp[(3) - (3)].StrVal));
           delete (yyvsp[(3) - (3)].StrVal);
@@ -5438,7 +5438,7 @@
     break;
 
   case 247:
-#line 2274 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2274 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary(*(yyvsp[(1) - (1)].StrVal));
           delete (yyvsp[(1) - (1)].StrVal);
@@ -5447,20 +5447,20 @@
     break;
 
   case 248:
-#line 2279 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2279 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
           CHECK_FOR_ERROR
         ;}
     break;
 
   case 249:
-#line 2288 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2288 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
     if (!(*(yyvsp[(3) - (5)].TypeVal))->isFirstClassType())
       GEN_ERROR("Argument types must be first-class");
-    ArgListEntry E; E.Attrs = (yyvsp[(4) - (5)].ParamAttrs); E.Ty = (yyvsp[(3) - (5)].TypeVal); E.Name = (yyvsp[(5) - (5)].StrVal);
+    ArgListEntry E; E.Attrs = (yyvsp[(4) - (5)].Attributes); E.Ty = (yyvsp[(3) - (5)].TypeVal); E.Name = (yyvsp[(5) - (5)].StrVal);
     (yyval.ArgList) = (yyvsp[(1) - (5)].ArgList);
     (yyvsp[(1) - (5)].ArgList)->push_back(E);
     CHECK_FOR_ERROR
@@ -5468,13 +5468,13 @@
     break;
 
   case 250:
-#line 2298 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2298 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
     if (!(*(yyvsp[(1) - (3)].TypeVal))->isFirstClassType())
       GEN_ERROR("Argument types must be first-class");
-    ArgListEntry E; E.Attrs = (yyvsp[(2) - (3)].ParamAttrs); E.Ty = (yyvsp[(1) - (3)].TypeVal); E.Name = (yyvsp[(3) - (3)].StrVal);
+    ArgListEntry E; E.Attrs = (yyvsp[(2) - (3)].Attributes); E.Ty = (yyvsp[(1) - (3)].TypeVal); E.Name = (yyvsp[(3) - (3)].StrVal);
     (yyval.ArgList) = new ArgListType;
     (yyval.ArgList)->push_back(E);
     CHECK_FOR_ERROR
@@ -5482,7 +5482,7 @@
     break;
 
   case 251:
-#line 2309 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2309 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[(1) - (1)].ArgList);
     CHECK_FOR_ERROR
@@ -5490,33 +5490,33 @@
     break;
 
   case 252:
-#line 2313 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2313 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[(1) - (3)].ArgList);
     struct ArgListEntry E;
     E.Ty = new PATypeHolder(Type::VoidTy);
     E.Name = 0;
-    E.Attrs = ParamAttr::None;
+    E.Attrs = Attribute::None;
     (yyval.ArgList)->push_back(E);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 253:
-#line 2322 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2322 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = new ArgListType;
     struct ArgListEntry E;
     E.Ty = new PATypeHolder(Type::VoidTy);
     E.Name = 0;
-    E.Attrs = ParamAttr::None;
+    E.Attrs = Attribute::None;
     (yyval.ArgList)->push_back(E);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 254:
-#line 2331 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2331 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = 0;
     CHECK_FOR_ERROR
@@ -5524,7 +5524,7 @@
     break;
 
   case 255:
-#line 2337 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2337 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   std::string FunctionName(*(yyvsp[(3) - (11)].StrVal));
   delete (yyvsp[(3) - (11)].StrVal);  // Free strdup'd memory!
@@ -5538,9 +5538,9 @@
     GEN_ERROR("Invalid result type for LLVM function");
 
   std::vector<const Type*> ParamTypeList;
-  SmallVector<FnAttributeWithIndex, 8> Attrs;
-  if ((yyvsp[(7) - (11)].ParamAttrs) != ParamAttr::None)
-    Attrs.push_back(FnAttributeWithIndex::get(0, (yyvsp[(7) - (11)].ParamAttrs)));
+  SmallVector<AttributeWithIndex, 8> Attrs;
+  if ((yyvsp[(7) - (11)].Attributes) != Attribute::None)
+    Attrs.push_back(AttributeWithIndex::get(0, (yyvsp[(7) - (11)].Attributes)));
   if ((yyvsp[(5) - (11)].ArgList)) {   // If there are arguments...
     unsigned index = 1;
     for (ArgListType::iterator I = (yyvsp[(5) - (11)].ArgList)->begin(); I != (yyvsp[(5) - (11)].ArgList)->end(); ++I, ++index) {
@@ -5548,17 +5548,17 @@
       if (!CurFun.isDeclare && CurModule.TypeIsUnresolved(I->Ty))
         GEN_ERROR("Reference to abstract argument: " + Ty->getDescription());
       ParamTypeList.push_back(Ty);
-      if (Ty != Type::VoidTy && I->Attrs != ParamAttr::None)
-        Attrs.push_back(FnAttributeWithIndex::get(index, I->Attrs));
+      if (Ty != Type::VoidTy && I->Attrs != Attribute::None)
+        Attrs.push_back(AttributeWithIndex::get(index, I->Attrs));
     }
   }
 
   bool isVarArg = ParamTypeList.size() && ParamTypeList.back() == Type::VoidTy;
   if (isVarArg) ParamTypeList.pop_back();
 
-  PAListPtr PAL;
+  AttrListPtr PAL;
   if (!Attrs.empty())
-    PAL = PAListPtr::get(Attrs.begin(), Attrs.end());
+    PAL = AttrListPtr::get(Attrs.begin(), Attrs.end());
 
   FunctionType *FT = FunctionType::get(*(yyvsp[(2) - (11)].TypeVal), ParamTypeList, isVarArg);
   const PointerType *PFT = PointerType::getUnqual(FT);
@@ -5577,7 +5577,7 @@
     // Move the function to the end of the list, from whereever it was
     // previously inserted.
     Fn = cast<Function>(FWRef);
-    assert(Fn->getParamAttrs().isEmpty() &&
+    assert(Fn->getAttributes().isEmpty() &&
            "Forward reference has parameter attributes!");
     CurModule.CurrentModule->getFunctionList().remove(Fn);
     CurModule.CurrentModule->getFunctionList().push_back(Fn);
@@ -5587,7 +5587,7 @@
       // 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) {
+    } else if (Fn->getAttributes() != PAL) {
       // The existing function doesn't have the same parameter attributes.
       // This is an overload error.
       GEN_ERROR("Overload of function '" + FunctionName + "' not permitted.");
@@ -5617,7 +5617,7 @@
     Fn->setVisibility(CurFun.Visibility);
   }
   Fn->setCallingConv((yyvsp[(1) - (11)].UIntVal));
-  Fn->setParamAttrs(PAL);
+  Fn->setAttributes(PAL);
   Fn->setAlignment((yyvsp[(9) - (11)].UIntVal));
   if ((yyvsp[(8) - (11)].StrVal)) {
     Fn->setSection(*(yyvsp[(8) - (11)].StrVal));
@@ -5627,8 +5627,8 @@
     Fn->setGC((yyvsp[(10) - (11)].StrVal)->c_str());
     delete (yyvsp[(10) - (11)].StrVal);
   }
-  if ((yyvsp[(11) - (11)].ParamAttrs)) {
-    Fn->setNotes((yyvsp[(11) - (11)].ParamAttrs));
+  if ((yyvsp[(11) - (11)].Attributes)) {
+    Fn->setNotes((yyvsp[(11) - (11)].Attributes));
   }
 
   // Add all of the arguments we parsed to the function...
@@ -5658,7 +5658,7 @@
     break;
 
   case 258:
-#line 2470 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2470 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = CurFun.CurrentFunction;
 
@@ -5670,7 +5670,7 @@
     break;
 
   case 261:
-#line 2481 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2481 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
   CHECK_FOR_ERROR
@@ -5678,7 +5678,7 @@
     break;
 
   case 262:
-#line 2486 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2486 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.CurrentFunction->setLinkage((yyvsp[(1) - (3)].Linkage));
     CurFun.CurrentFunction->setVisibility((yyvsp[(2) - (3)].Visibility));
@@ -5689,7 +5689,7 @@
     break;
 
   case 263:
-#line 2498 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2498 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -5697,7 +5697,7 @@
     break;
 
   case 264:
-#line 2502 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2502 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -5705,7 +5705,7 @@
     break;
 
   case 265:
-#line 2507 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2507 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {    // A reference to a direct constant
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].SInt64Val));
     CHECK_FOR_ERROR
@@ -5713,7 +5713,7 @@
     break;
 
   case 266:
-#line 2511 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2511 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].UInt64Val));
     CHECK_FOR_ERROR
@@ -5721,7 +5721,7 @@
     break;
 
   case 267:
-#line 2515 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2515 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     (yyval.ValIDVal) = ValID::create(*(yyvsp[(1) - (1)].APIntVal), true);
     delete (yyvsp[(1) - (1)].APIntVal);
@@ -5730,7 +5730,7 @@
     break;
 
   case 268:
-#line 2520 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2520 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     (yyval.ValIDVal) = ValID::create(*(yyvsp[(1) - (1)].APIntVal), false);
     delete (yyvsp[(1) - (1)].APIntVal);
@@ -5739,7 +5739,7 @@
     break;
 
   case 269:
-#line 2525 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2525 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {                     // Perhaps it's an FP constant?
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].FPVal));
     CHECK_FOR_ERROR
@@ -5747,7 +5747,7 @@
     break;
 
   case 270:
-#line 2529 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2529 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getTrue());
     CHECK_FOR_ERROR
@@ -5755,7 +5755,7 @@
     break;
 
   case 271:
-#line 2533 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2533 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getFalse());
     CHECK_FOR_ERROR
@@ -5763,7 +5763,7 @@
     break;
 
   case 272:
-#line 2537 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2537 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createNull();
     CHECK_FOR_ERROR
@@ -5771,7 +5771,7 @@
     break;
 
   case 273:
-#line 2541 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2541 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createUndef();
     CHECK_FOR_ERROR
@@ -5779,7 +5779,7 @@
     break;
 
   case 274:
-#line 2545 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2545 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {     // A vector zero constant.
     (yyval.ValIDVal) = ValID::createZeroInit();
     CHECK_FOR_ERROR
@@ -5787,7 +5787,7 @@
     break;
 
   case 275:
-#line 2549 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2549 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized packed vector
     const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0]->getType();
     unsigned NumElements = (yyvsp[(2) - (3)].ConstVector)->size();
@@ -5813,7 +5813,7 @@
     break;
 
   case 276:
-#line 2571 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2571 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0]->getType();
     uint64_t NumElements = (yyvsp[(2) - (3)].ConstVector)->size();
@@ -5839,7 +5839,7 @@
     break;
 
   case 277:
-#line 2593 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2593 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Use undef instead of an array because it's inconvenient to determine
     // the element type at this point, there being no elements to examine.
@@ -5849,7 +5849,7 @@
     break;
 
   case 278:
-#line 2599 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2599 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     uint64_t NumElements = (yyvsp[(2) - (2)].StrVal)->length();
     const Type *ETy = Type::Int8Ty;
@@ -5866,7 +5866,7 @@
     break;
 
   case 279:
-#line 2612 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2612 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements((yyvsp[(2) - (3)].ConstVector)->size());
     for (unsigned i = 0, e = (yyvsp[(2) - (3)].ConstVector)->size(); i != e; ++i)
@@ -5882,7 +5882,7 @@
     break;
 
   case 280:
-#line 2624 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2624 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = StructType::get(std::vector<const Type*>());
     (yyval.ValIDVal) = ValID::create(ConstantStruct::get(STy, std::vector<Constant*>()));
@@ -5891,7 +5891,7 @@
     break;
 
   case 281:
-#line 2629 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2629 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements((yyvsp[(3) - (5)].ConstVector)->size());
     for (unsigned i = 0, e = (yyvsp[(3) - (5)].ConstVector)->size(); i != e; ++i)
@@ -5907,7 +5907,7 @@
     break;
 
   case 282:
-#line 2641 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2641 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = StructType::get(std::vector<const Type*>(),
                                             /*isPacked=*/true);
@@ -5917,7 +5917,7 @@
     break;
 
   case 283:
-#line 2647 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2647 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].ConstVal));
     CHECK_FOR_ERROR
@@ -5925,7 +5925,7 @@
     break;
 
   case 284:
-#line 2651 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2651 "/Volumes/Nanpura/mainline/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);
@@ -5935,7 +5935,7 @@
     break;
 
   case 285:
-#line 2661 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2661 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {  // Is it an integer reference...?
     (yyval.ValIDVal) = ValID::createLocalID((yyvsp[(1) - (1)].UIntVal));
     CHECK_FOR_ERROR
@@ -5943,7 +5943,7 @@
     break;
 
   case 286:
-#line 2665 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2665 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createGlobalID((yyvsp[(1) - (1)].UIntVal));
     CHECK_FOR_ERROR
@@ -5951,7 +5951,7 @@
     break;
 
   case 287:
-#line 2669 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2669 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -5960,7 +5960,7 @@
     break;
 
   case 288:
-#line 2674 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2674 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createGlobalName(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -5969,7 +5969,7 @@
     break;
 
   case 291:
-#line 2687 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2687 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -5980,7 +5980,7 @@
     break;
 
   case 292:
-#line 2696 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2696 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = new std::vector<Value *>();
     (yyval.ValueList)->push_back((yyvsp[(1) - (1)].ValueVal));
@@ -5989,7 +5989,7 @@
     break;
 
   case 293:
-#line 2701 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2701 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ValueList)=(yyvsp[(1) - (3)].ValueList))->push_back((yyvsp[(3) - (3)].ValueVal));
     CHECK_FOR_ERROR
@@ -5997,7 +5997,7 @@
     break;
 
   case 294:
-#line 2706 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2706 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
     CHECK_FOR_ERROR
@@ -6005,7 +6005,7 @@
     break;
 
   case 295:
-#line 2710 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2710 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Do not allow functions with 0 basic blocks
     (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
     CHECK_FOR_ERROR
@@ -6013,7 +6013,7 @@
     break;
 
   case 296:
-#line 2719 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2719 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     setValueName((yyvsp[(3) - (3)].TermInstVal), (yyvsp[(2) - (3)].StrVal));
     CHECK_FOR_ERROR
@@ -6025,7 +6025,7 @@
     break;
 
   case 297:
-#line 2728 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2728 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   CHECK_FOR_ERROR
   int ValNum = InsertValue((yyvsp[(3) - (3)].TermInstVal));
@@ -6040,7 +6040,7 @@
     break;
 
   case 298:
-#line 2741 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2741 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (CastInst *CI1 = dyn_cast<CastInst>((yyvsp[(2) - (2)].InstVal)))
       if (CastInst *CI2 = dyn_cast<CastInst>(CI1->getOperand(0)))
@@ -6053,7 +6053,7 @@
     break;
 
   case 299:
-#line 2750 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2750 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {          // Empty space between instruction lists
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
     CHECK_FOR_ERROR
@@ -6061,7 +6061,7 @@
     break;
 
   case 300:
-#line 2754 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2754 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {             // Labelled (named) basic block
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal)));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -6071,7 +6071,7 @@
     break;
 
   case 301:
-#line 2762 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2762 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Return with a result...
     ValueList &VL = *(yyvsp[(2) - (2)].ValueList);
     assert(!VL.empty() && "Invalid ret operands!");
@@ -6095,7 +6095,7 @@
     break;
 
   case 302:
-#line 2782 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2782 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {                                    // Return with no result...
     (yyval.TermInstVal) = ReturnInst::Create();
     CHECK_FOR_ERROR
@@ -6103,7 +6103,7 @@
     break;
 
   case 303:
-#line 2786 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2786 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {                           // Unconditional Branch...
     BasicBlock* tmpBB = getBBVal((yyvsp[(3) - (3)].ValIDVal));
     CHECK_FOR_ERROR
@@ -6112,7 +6112,7 @@
     break;
 
   case 304:
-#line 2791 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2791 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (cast<IntegerType>((yyvsp[(2) - (9)].PrimType))->getBitWidth() != 1)
       GEN_ERROR("Branch condition must have type i1");
@@ -6127,7 +6127,7 @@
     break;
 
   case 305:
-#line 2802 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2802 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[(2) - (9)].PrimType), (yyvsp[(3) - (9)].ValIDVal));
     CHECK_FOR_ERROR
@@ -6150,7 +6150,7 @@
     break;
 
   case 306:
-#line 2821 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2821 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[(2) - (8)].PrimType), (yyvsp[(3) - (8)].ValIDVal));
     CHECK_FOR_ERROR
@@ -6163,7 +6163,7 @@
     break;
 
   case 307:
-#line 2831 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2831 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -6197,9 +6197,9 @@
     BasicBlock *Except = getBBVal((yyvsp[(14) - (14)].ValIDVal));
     CHECK_FOR_ERROR
 
-    SmallVector<FnAttributeWithIndex, 8> Attrs;
-    if ((yyvsp[(8) - (14)].ParamAttrs) != ParamAttr::None)
-      Attrs.push_back(FnAttributeWithIndex::get(0, (yyvsp[(8) - (14)].ParamAttrs)));
+    SmallVector<AttributeWithIndex, 8> Attrs;
+    if ((yyvsp[(8) - (14)].Attributes) != Attribute::None)
+      Attrs.push_back(AttributeWithIndex::get(0, (yyvsp[(8) - (14)].Attributes)));
 
     // Check the arguments
     ValueList Args;
@@ -6221,30 +6221,30 @@
           GEN_ERROR("Parameter " + ArgI->Val->getName()+ " is not of type '" +
                          (*I)->getDescription() + "'");
         Args.push_back(ArgI->Val);
-        if (ArgI->Attrs != ParamAttr::None)
-          Attrs.push_back(FnAttributeWithIndex::get(index, ArgI->Attrs));
+        if (ArgI->Attrs != Attribute::None)
+          Attrs.push_back(AttributeWithIndex::get(index, ArgI->Attrs));
       }
 
       if (Ty->isVarArg()) {
         if (I == E)
           for (; ArgI != ArgE; ++ArgI, ++index) {
             Args.push_back(ArgI->Val); // push the remaining varargs
-            if (ArgI->Attrs != ParamAttr::None)
-              Attrs.push_back(FnAttributeWithIndex::get(index, ArgI->Attrs));
+            if (ArgI->Attrs != Attribute::None)
+              Attrs.push_back(AttributeWithIndex::get(index, ArgI->Attrs));
           }
       } else if (I != E || ArgI != ArgE)
         GEN_ERROR("Invalid number of parameters detected");
     }
 
-    PAListPtr PAL;
+    AttrListPtr PAL;
     if (!Attrs.empty())
-      PAL = PAListPtr::get(Attrs.begin(), Attrs.end());
+      PAL = AttrListPtr::get(Attrs.begin(), Attrs.end());
 
     // Create the InvokeInst
     InvokeInst *II = InvokeInst::Create(V, Normal, Except,
                                         Args.begin(), Args.end());
     II->setCallingConv((yyvsp[(2) - (14)].UIntVal));
-    II->setParamAttrs(PAL);
+    II->setAttributes(PAL);
     (yyval.TermInstVal) = II;
     delete (yyvsp[(6) - (14)].ParamList);
     CHECK_FOR_ERROR
@@ -6252,7 +6252,7 @@
     break;
 
   case 308:
-#line 2916 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2916 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnwindInst();
     CHECK_FOR_ERROR
@@ -6260,7 +6260,7 @@
     break;
 
   case 309:
-#line 2920 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2920 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnreachableInst();
     CHECK_FOR_ERROR
@@ -6268,7 +6268,7 @@
     break;
 
   case 310:
-#line 2927 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2927 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = (yyvsp[(1) - (6)].JumpTable);
     Constant *V = cast<Constant>(getExistingVal((yyvsp[(2) - (6)].PrimType), (yyvsp[(3) - (6)].ValIDVal)));
@@ -6283,7 +6283,7 @@
     break;
 
   case 311:
-#line 2938 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2938 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
     Constant *V = cast<Constant>(getExistingVal((yyvsp[(1) - (5)].PrimType), (yyvsp[(2) - (5)].ValIDVal)));
@@ -6299,7 +6299,7 @@
     break;
 
   case 312:
-#line 2951 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2951 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Is this definition named?? if so, assign the name...
     setValueName((yyvsp[(2) - (2)].InstVal), (yyvsp[(1) - (2)].StrVal));
@@ -6311,7 +6311,7 @@
     break;
 
   case 313:
-#line 2960 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2960 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
     int ValNum = InsertValue((yyvsp[(2) - (2)].InstVal));
@@ -6326,7 +6326,7 @@
     break;
 
   case 314:
-#line 2973 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2973 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {    // Used for PHI nodes
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (6)].TypeVal))->getDescription());
@@ -6341,7 +6341,7 @@
     break;
 
   case 315:
-#line 2984 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2984 "/Volumes/Nanpura/mainline/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));
@@ -6353,14 +6353,14 @@
     break;
 
   case 316:
-#line 2994 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2994 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-    // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
+    // FIXME: Remove trailing OptAttributes in LLVM 3.0, it was a mistake in 2.0
     if (!UpRefs.empty())
       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[(2) - (4)].ParamAttrs) | (yyvsp[(4) - (4)].ParamAttrs); E.Val = getVal((yyvsp[(1) - (4)].TypeVal)->get(), (yyvsp[(3) - (4)].ValIDVal));
+    ParamListEntry E; E.Attrs = (yyvsp[(2) - (4)].Attributes) | (yyvsp[(4) - (4)].Attributes); E.Val = getVal((yyvsp[(1) - (4)].TypeVal)->get(), (yyvsp[(3) - (4)].ValIDVal));
     (yyval.ParamList)->push_back(E);
     delete (yyvsp[(1) - (4)].TypeVal);
     CHECK_FOR_ERROR
@@ -6368,25 +6368,25 @@
     break;
 
   case 317:
-#line 3005 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3005 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-    // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
+    // FIXME: Remove trailing OptAttributes 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[(2) - (4)].ParamAttrs) | (yyvsp[(4) - (4)].ParamAttrs); E.Val = getBBVal((yyvsp[(3) - (4)].ValIDVal));
+    ParamListEntry E; E.Attrs = (yyvsp[(2) - (4)].Attributes) | (yyvsp[(4) - (4)].Attributes); E.Val = getBBVal((yyvsp[(3) - (4)].ValIDVal));
     (yyval.ParamList)->push_back(E);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 318:
-#line 3013 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3013 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-    // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
+    // FIXME: Remove trailing OptAttributes in LLVM 3.0, it was a mistake in 2.0
     if (!UpRefs.empty())
       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));
+    ParamListEntry E; E.Attrs = (yyvsp[(4) - (6)].Attributes) | (yyvsp[(6) - (6)].Attributes); E.Val = getVal((yyvsp[(3) - (6)].TypeVal)->get(), (yyvsp[(5) - (6)].ValIDVal));
     (yyval.ParamList)->push_back(E);
     delete (yyvsp[(3) - (6)].TypeVal);
     CHECK_FOR_ERROR
@@ -6394,28 +6394,28 @@
     break;
 
   case 319:
-#line 3023 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3023 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-    // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
+    // FIXME: Remove trailing OptAttributes 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));
+    ParamListEntry E; E.Attrs = (yyvsp[(4) - (6)].Attributes) | (yyvsp[(6) - (6)].Attributes); E.Val = getBBVal((yyvsp[(5) - (6)].ValIDVal));
     (yyval.ParamList)->push_back(E);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 320:
-#line 3030 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3030 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamList) = new ParamList(); ;}
     break;
 
   case 321:
-#line 3033 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3033 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueList) = new std::vector<Value*>(); ;}
     break;
 
   case 322:
-#line 3034 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3034 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = (yyvsp[(1) - (3)].ValueList);
     (yyval.ValueList)->push_back((yyvsp[(3) - (3)].ValueVal));
@@ -6424,7 +6424,7 @@
     break;
 
   case 323:
-#line 3042 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3042 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstantList) = new std::vector<unsigned>();
     if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val))
@@ -6434,7 +6434,7 @@
     break;
 
   case 324:
-#line 3048 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3048 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstantList) = (yyvsp[(1) - (3)].ConstantList);
     if ((unsigned)(yyvsp[(3) - (3)].UInt64Val) != (yyvsp[(3) - (3)].UInt64Val))
@@ -6445,7 +6445,7 @@
     break;
 
   case 325:
-#line 3057 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3057 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -6453,7 +6453,7 @@
     break;
 
   case 326:
-#line 3061 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3061 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -6461,7 +6461,7 @@
     break;
 
   case 327:
-#line 3066 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3066 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
@@ -6481,7 +6481,7 @@
     break;
 
   case 328:
-#line 3082 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3082 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
@@ -6502,7 +6502,7 @@
     break;
 
   case 329:
-#line 3099 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3099 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6518,7 +6518,7 @@
     break;
 
   case 330:
-#line 3111 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3111 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6534,7 +6534,7 @@
     break;
 
   case 331:
-#line 3123 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3123 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6552,7 +6552,7 @@
     break;
 
   case 332:
-#line 3137 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3137 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6570,7 +6570,7 @@
     break;
 
   case 333:
-#line 3151 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3151 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription());
@@ -6586,7 +6586,7 @@
     break;
 
   case 334:
-#line 3163 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3163 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (isa<VectorType>((yyvsp[(2) - (6)].ValueVal)->getType())) {
       // vector select
@@ -6611,7 +6611,7 @@
     break;
 
   case 335:
-#line 3184 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3184 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription());
@@ -6622,7 +6622,7 @@
     break;
 
   case 336:
-#line 3191 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3191 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[(2) - (4)].ValueVal), (yyvsp[(4) - (4)].ValueVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -6632,7 +6632,7 @@
     break;
 
   case 337:
-#line 3197 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3197 "/Volumes/Nanpura/mainline/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");
@@ -6642,7 +6642,7 @@
     break;
 
   case 338:
-#line 3203 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3203 "/Volumes/Nanpura/mainline/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");
@@ -6652,7 +6652,7 @@
     break;
 
   case 339:
-#line 3209 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3209 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const Type *Ty = (yyvsp[(2) - (2)].PHIList)->front().first->getType();
     if (!Ty->isFirstClassType())
@@ -6671,7 +6671,7 @@
     break;
 
   case 340:
-#line 3225 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3225 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -6708,10 +6708,10 @@
                   theF->getName() + "'");
     }
 
-    // Set up the ParamAttrs for the function
-    SmallVector<FnAttributeWithIndex, 8> Attrs;
-    if ((yyvsp[(8) - (8)].ParamAttrs) != ParamAttr::None)
-      Attrs.push_back(FnAttributeWithIndex::get(0, (yyvsp[(8) - (8)].ParamAttrs)));
+    // Set up the Attributes for the function
+    SmallVector<AttributeWithIndex, 8> Attrs;
+    if ((yyvsp[(8) - (8)].Attributes) != Attribute::None)
+      Attrs.push_back(AttributeWithIndex::get(0, (yyvsp[(8) - (8)].Attributes)));
     // Check the arguments
     ValueList Args;
     if ((yyvsp[(6) - (8)].ParamList)->empty()) {                                   // Has no arguments?
@@ -6732,30 +6732,30 @@
           GEN_ERROR("Parameter " + ArgI->Val->getName()+ " is not of type '" +
                          (*I)->getDescription() + "'");
         Args.push_back(ArgI->Val);
-        if (ArgI->Attrs != ParamAttr::None)
-          Attrs.push_back(FnAttributeWithIndex::get(index, ArgI->Attrs));
+        if (ArgI->Attrs != Attribute::None)
+          Attrs.push_back(AttributeWithIndex::get(index, ArgI->Attrs));
       }
       if (Ty->isVarArg()) {
         if (I == E)
           for (; ArgI != ArgE; ++ArgI, ++index) {
             Args.push_back(ArgI->Val); // push the remaining varargs
-            if (ArgI->Attrs != ParamAttr::None)
-              Attrs.push_back(FnAttributeWithIndex::get(index, ArgI->Attrs));
+            if (ArgI->Attrs != Attribute::None)
+              Attrs.push_back(AttributeWithIndex::get(index, ArgI->Attrs));
           }
       } else if (I != E || ArgI != ArgE)
         GEN_ERROR("Invalid number of parameters detected");
     }
 
-    // Finish off the ParamAttrs and check them
-    PAListPtr PAL;
+    // Finish off the Attributes and check them
+    AttrListPtr PAL;
     if (!Attrs.empty())
-      PAL = PAListPtr::get(Attrs.begin(), Attrs.end());
+      PAL = AttrListPtr::get(Attrs.begin(), Attrs.end());
 
     // Create the call node
     CallInst *CI = CallInst::Create(V, Args.begin(), Args.end());
     CI->setTailCall((yyvsp[(1) - (8)].BoolVal));
     CI->setCallingConv((yyvsp[(2) - (8)].UIntVal));
-    CI->setParamAttrs(PAL);
+    CI->setAttributes(PAL);
     (yyval.InstVal) = CI;
     delete (yyvsp[(6) - (8)].ParamList);
     delete (yyvsp[(3) - (8)].TypeVal);
@@ -6764,7 +6764,7 @@
     break;
 
   case 341:
-#line 3314 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3314 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = (yyvsp[(1) - (1)].InstVal);
     CHECK_FOR_ERROR
@@ -6772,7 +6772,7 @@
     break;
 
   case 342:
-#line 3319 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3319 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -6780,7 +6780,7 @@
     break;
 
   case 343:
-#line 3323 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3323 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -6788,7 +6788,7 @@
     break;
 
   case 344:
-#line 3330 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3330 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription());
@@ -6799,7 +6799,7 @@
     break;
 
   case 345:
-#line 3337 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3337 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription());
@@ -6813,7 +6813,7 @@
     break;
 
   case 346:
-#line 3347 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3347 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription());
@@ -6824,7 +6824,7 @@
     break;
 
   case 347:
-#line 3354 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3354 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription());
@@ -6838,7 +6838,7 @@
     break;
 
   case 348:
-#line 3364 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3364 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[(2) - (2)].ValueVal)->getType()))
       GEN_ERROR("Trying to free nonpointer type " +
@@ -6849,7 +6849,7 @@
     break;
 
   case 349:
-#line 3372 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3372 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
@@ -6867,7 +6867,7 @@
     break;
 
   case 350:
-#line 3386 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3386 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (7)].TypeVal))->getDescription());
@@ -6888,7 +6888,7 @@
     break;
 
   case 351:
-#line 3403 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3403 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
@@ -6906,7 +6906,7 @@
     break;
 
   case 352:
-#line 3417 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3417 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription());
@@ -6925,7 +6925,7 @@
     break;
 
   case 353:
-#line 3432 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3432 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription());
@@ -6944,7 +6944,7 @@
     break;
 
   case 354:
-#line 3447 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3447 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (7)].TypeVal))->getDescription());
@@ -7180,7 +7180,7 @@
 }
 
 
-#line 3466 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3466 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
 
 
 // common code from the two 'RunVMAsmParser' functions

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

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs Thu Sep 25 16:00:45 2008
@@ -366,7 +366,7 @@
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 970 "/Users/echristo/sources/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 970 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
@@ -394,7 +394,7 @@
 
   llvm::GlobalValue::LinkageTypes         Linkage;
   llvm::GlobalValue::VisibilityTypes      Visibility;
-  llvm::Attributes                  ParamAttrs;
+  llvm::Attributes                  Attributes;
   llvm::APInt                       *APIntVal;
   int64_t                           SInt64Val;
   uint64_t                          UInt64Val;

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

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.y (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.y Thu Sep 25 16:00:45 2008
@@ -994,7 +994,7 @@
 
   llvm::GlobalValue::LinkageTypes         Linkage;
   llvm::GlobalValue::VisibilityTypes      Visibility;
-  llvm::Attributes                  ParamAttrs;
+  llvm::Attributes                  Attributes;
   llvm::APInt                       *APIntVal;
   int64_t                           SInt64Val;
   uint64_t                          UInt64Val;
@@ -1088,10 +1088,10 @@
 %token X86_SSECALLCC_TOK
 %token DATALAYOUT
 %type <UIntVal> OptCallingConv LocalNumber
-%type <ParamAttrs> OptParamAttrs ParamAttr
-%type <ParamAttrs> OptFuncAttrs  FuncAttr
-%type <ParamAttrs> OptFuncNotes FuncNote
-%type <ParamAttrs> FuncNoteList
+%type <Attributes> OptAttributes Attribute
+%type <Attributes> OptFuncAttrs  FuncAttr
+%type <Attributes> OptFuncNotes FuncNote
+%type <Attributes> FuncNoteList
 
 // Basic Block Terminating Operators
 %token <TermOpVal> RET BR SWITCH INVOKE UNWIND UNREACHABLE
@@ -1260,35 +1260,35 @@
                   CHECK_FOR_ERROR
                  };
 
-ParamAttr     : ZEROEXT { $$ = ParamAttr::ZExt;      }
-              | ZEXT    { $$ = ParamAttr::ZExt;      }
-              | SIGNEXT { $$ = ParamAttr::SExt;      }
-              | SEXT    { $$ = ParamAttr::SExt;      }
-              | INREG   { $$ = ParamAttr::InReg;     }
-              | SRET    { $$ = ParamAttr::StructRet; }
-              | NOALIAS { $$ = ParamAttr::NoAlias;   }
-              | BYVAL   { $$ = ParamAttr::ByVal;     }
-              | NEST    { $$ = ParamAttr::Nest;      }
+Attribute     : ZEROEXT { $$ = Attribute::ZExt;      }
+              | ZEXT    { $$ = Attribute::ZExt;      }
+              | SIGNEXT { $$ = Attribute::SExt;      }
+              | SEXT    { $$ = Attribute::SExt;      }
+              | INREG   { $$ = Attribute::InReg;     }
+              | SRET    { $$ = Attribute::StructRet; }
+              | NOALIAS { $$ = Attribute::NoAlias;   }
+              | BYVAL   { $$ = Attribute::ByVal;     }
+              | NEST    { $$ = Attribute::Nest;      }
               | ALIGN EUINT64VAL { $$ =
-                          ParamAttr::constructAlignmentFromInt($2);    }
+                          Attribute::constructAlignmentFromInt($2);    }
               ;
 
-OptParamAttrs : /* empty */  { $$ = ParamAttr::None; }
-              | OptParamAttrs ParamAttr {
+OptAttributes : /* empty */  { $$ = Attribute::None; }
+              | OptAttributes Attribute {
                 $$ = $1 | $2;
               }
               ;
 
-FuncAttr      : NORETURN { $$ = ParamAttr::NoReturn; }
-              | NOUNWIND { $$ = ParamAttr::NoUnwind; }
-              | INREG    { $$ = ParamAttr::InReg;     }
-              | ZEROEXT  { $$ = ParamAttr::ZExt;     }
-              | SIGNEXT  { $$ = ParamAttr::SExt;     }
-              | READNONE { $$ = ParamAttr::ReadNone; }
-              | READONLY { $$ = ParamAttr::ReadOnly; }
+FuncAttr      : NORETURN { $$ = Attribute::NoReturn; }
+              | NOUNWIND { $$ = Attribute::NoUnwind; }
+              | INREG    { $$ = Attribute::InReg;     }
+              | ZEROEXT  { $$ = Attribute::ZExt;     }
+              | SIGNEXT  { $$ = Attribute::SExt;     }
+              | READNONE { $$ = Attribute::ReadNone; }
+              | READONLY { $$ = Attribute::ReadOnly; }
               ;
 
-OptFuncAttrs  : /* empty */ { $$ = ParamAttr::None; }
+OptFuncAttrs  : /* empty */ { $$ = Attribute::None; }
               | OptFuncAttrs FuncAttr {
                 $$ = $1 | $2;
               }
@@ -1297,23 +1297,23 @@
 FuncNoteList  : FuncNote { $$ = $1; }
               | FuncNoteList ',' FuncNote {
                 unsigned tmp = $1 | $3;
-                if ($3 == FnAttr::NoInline
-                    && ($1 & FnAttr::AlwaysInline))
+                if ($3 == Attribute::NoInline
+                    && ($1 & Attribute::AlwaysInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
-                    if ($3 == FnAttr::AlwaysInline
-                        && ($1 & FnAttr::NoInline))
+                    if ($3 == Attribute::AlwaysInline
+                        && ($1 & Attribute::NoInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
                 $$ = tmp;
                 CHECK_FOR_ERROR
               }
               ;
 
-FuncNote      : INLINE '=' NEVER { $$ = FnAttr::NoInline; }
-              | INLINE '=' ALWAYS { $$ = FnAttr::AlwaysInline; }
-              | OPTIMIZEFORSIZE { $$ = FnAttr::OptimizeForSize; }
+FuncNote      : INLINE '=' NEVER { $$ = Attribute::NoInline; }
+              | INLINE '=' ALWAYS { $$ = Attribute::AlwaysInline; }
+              | OPTIMIZEFORSIZE { $$ = Attribute::OptimizeForSize; }
               ;
 
-OptFuncNotes  : /* empty */ { $$ = FnAttr::None; }
+OptFuncNotes  : /* empty */ { $$ = Attribute::None; }
               | FNNOTE '(' FuncNoteList  ')' {
                 $$ =  $3;
               }
@@ -1509,11 +1509,11 @@
   ;
 
 ArgType
-  : Types OptParamAttrs {
+  : Types OptAttributes {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
     $$.Ty = $1;
-    $$.Attrs = ParamAttr::None;
+    $$.Attrs = Attribute::None;
   }
   ;
 
@@ -1545,14 +1545,14 @@
   : ArgTypeList
   | ArgTypeList ',' DOTDOTDOT {
     $$=$1;
-    TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
+    TypeWithAttrs TWA; TWA.Attrs = Attribute::None;
     TWA.Ty = new PATypeHolder(Type::VoidTy);
     $$->push_back(TWA);
     CHECK_FOR_ERROR
   }
   | DOTDOTDOT {
     $$ = new TypeWithAttrsList;
-    TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
+    TypeWithAttrs TWA; TWA.Attrs = Attribute::None;
     TWA.Ty = new PATypeHolder(Type::VoidTy);
     $$->push_back(TWA);
     CHECK_FOR_ERROR
@@ -2285,7 +2285,7 @@
 //                       Rules to match Function Headers
 //===----------------------------------------------------------------------===//
 
-ArgListH : ArgListH ',' Types OptParamAttrs OptLocalName {
+ArgListH : ArgListH ',' Types OptAttributes OptLocalName {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*$3)->getDescription());
     if (!(*$3)->isFirstClassType())
@@ -2295,7 +2295,7 @@
     $1->push_back(E);
     CHECK_FOR_ERROR
   }
-  | Types OptParamAttrs OptLocalName {
+  | Types OptAttributes OptLocalName {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
     if (!(*$1)->isFirstClassType())
@@ -2315,7 +2315,7 @@
     struct ArgListEntry E;
     E.Ty = new PATypeHolder(Type::VoidTy);
     E.Name = 0;
-    E.Attrs = ParamAttr::None;
+    E.Attrs = Attribute::None;
     $$->push_back(E);
     CHECK_FOR_ERROR
   }
@@ -2324,7 +2324,7 @@
     struct ArgListEntry E;
     E.Ty = new PATypeHolder(Type::VoidTy);
     E.Name = 0;
-    E.Attrs = ParamAttr::None;
+    E.Attrs = Attribute::None;
     $$->push_back(E);
     CHECK_FOR_ERROR
   }
@@ -2347,9 +2347,9 @@
     GEN_ERROR("Invalid result type for LLVM function");
 
   std::vector<const Type*> ParamTypeList;
-  SmallVector<FnAttributeWithIndex, 8> Attrs;
-  if ($7 != ParamAttr::None)
-    Attrs.push_back(FnAttributeWithIndex::get(0, $7));
+  SmallVector<AttributeWithIndex, 8> Attrs;
+  if ($7 != Attribute::None)
+    Attrs.push_back(AttributeWithIndex::get(0, $7));
   if ($5) {   // If there are arguments...
     unsigned index = 1;
     for (ArgListType::iterator I = $5->begin(); I != $5->end(); ++I, ++index) {
@@ -2357,17 +2357,17 @@
       if (!CurFun.isDeclare && CurModule.TypeIsUnresolved(I->Ty))
         GEN_ERROR("Reference to abstract argument: " + Ty->getDescription());
       ParamTypeList.push_back(Ty);
-      if (Ty != Type::VoidTy && I->Attrs != ParamAttr::None)
-        Attrs.push_back(FnAttributeWithIndex::get(index, I->Attrs));
+      if (Ty != Type::VoidTy && I->Attrs != Attribute::None)
+        Attrs.push_back(AttributeWithIndex::get(index, I->Attrs));
     }
   }
 
   bool isVarArg = ParamTypeList.size() && ParamTypeList.back() == Type::VoidTy;
   if (isVarArg) ParamTypeList.pop_back();
 
-  PAListPtr PAL;
+  AttrListPtr PAL;
   if (!Attrs.empty())
-    PAL = PAListPtr::get(Attrs.begin(), Attrs.end());
+    PAL = AttrListPtr::get(Attrs.begin(), Attrs.end());
 
   FunctionType *FT = FunctionType::get(*$2, ParamTypeList, isVarArg);
   const PointerType *PFT = PointerType::getUnqual(FT);
@@ -2386,7 +2386,7 @@
     // Move the function to the end of the list, from whereever it was
     // previously inserted.
     Fn = cast<Function>(FWRef);
-    assert(Fn->getParamAttrs().isEmpty() &&
+    assert(Fn->getAttributes().isEmpty() &&
            "Forward reference has parameter attributes!");
     CurModule.CurrentModule->getFunctionList().remove(Fn);
     CurModule.CurrentModule->getFunctionList().push_back(Fn);
@@ -2396,7 +2396,7 @@
       // 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) {
+    } else if (Fn->getAttributes() != PAL) {
       // The existing function doesn't have the same parameter attributes.
       // This is an overload error.
       GEN_ERROR("Overload of function '" + FunctionName + "' not permitted.");
@@ -2426,7 +2426,7 @@
     Fn->setVisibility(CurFun.Visibility);
   }
   Fn->setCallingConv($1);
-  Fn->setParamAttrs(PAL);
+  Fn->setAttributes(PAL);
   Fn->setAlignment($9);
   if ($8) {
     Fn->setSection(*$8);
@@ -2861,9 +2861,9 @@
     BasicBlock *Except = getBBVal($14);
     CHECK_FOR_ERROR
 
-    SmallVector<FnAttributeWithIndex, 8> Attrs;
-    if ($8 != ParamAttr::None)
-      Attrs.push_back(FnAttributeWithIndex::get(0, $8));
+    SmallVector<AttributeWithIndex, 8> Attrs;
+    if ($8 != Attribute::None)
+      Attrs.push_back(AttributeWithIndex::get(0, $8));
 
     // Check the arguments
     ValueList Args;
@@ -2885,30 +2885,30 @@
           GEN_ERROR("Parameter " + ArgI->Val->getName()+ " is not of type '" +
                          (*I)->getDescription() + "'");
         Args.push_back(ArgI->Val);
-        if (ArgI->Attrs != ParamAttr::None)
-          Attrs.push_back(FnAttributeWithIndex::get(index, ArgI->Attrs));
+        if (ArgI->Attrs != Attribute::None)
+          Attrs.push_back(AttributeWithIndex::get(index, ArgI->Attrs));
       }
 
       if (Ty->isVarArg()) {
         if (I == E)
           for (; ArgI != ArgE; ++ArgI, ++index) {
             Args.push_back(ArgI->Val); // push the remaining varargs
-            if (ArgI->Attrs != ParamAttr::None)
-              Attrs.push_back(FnAttributeWithIndex::get(index, ArgI->Attrs));
+            if (ArgI->Attrs != Attribute::None)
+              Attrs.push_back(AttributeWithIndex::get(index, ArgI->Attrs));
           }
       } else if (I != E || ArgI != ArgE)
         GEN_ERROR("Invalid number of parameters detected");
     }
 
-    PAListPtr PAL;
+    AttrListPtr PAL;
     if (!Attrs.empty())
-      PAL = PAListPtr::get(Attrs.begin(), Attrs.end());
+      PAL = AttrListPtr::get(Attrs.begin(), Attrs.end());
 
     // Create the InvokeInst
     InvokeInst *II = InvokeInst::Create(V, Normal, Except,
                                         Args.begin(), Args.end());
     II->setCallingConv($2);
-    II->setParamAttrs(PAL);
+    II->setAttributes(PAL);
     $$ = II;
     delete $6;
     CHECK_FOR_ERROR
@@ -2991,8 +2991,8 @@
   };
 
 
-ParamList : Types OptParamAttrs ValueRef OptParamAttrs {
-    // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
+ParamList : Types OptAttributes ValueRef OptAttributes {
+    // FIXME: Remove trailing OptAttributes 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
@@ -3002,16 +3002,16 @@
     delete $1;
     CHECK_FOR_ERROR
   }
-  | LABEL OptParamAttrs ValueRef OptParamAttrs {
-    // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
+  | LABEL OptAttributes ValueRef OptAttributes {
+    // FIXME: Remove trailing OptAttributes in LLVM 3.0, it was a mistake in 2.0
     // Labels are only valid in ASMs
     $$ = new ParamList();
     ParamListEntry E; E.Attrs = $2 | $4; E.Val = getBBVal($3);
     $$->push_back(E);
     CHECK_FOR_ERROR
   }
-  | ParamList ',' Types OptParamAttrs ValueRef OptParamAttrs {
-    // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
+  | ParamList ',' Types OptAttributes ValueRef OptAttributes {
+    // FIXME: Remove trailing OptAttributes in LLVM 3.0, it was a mistake in 2.0
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*$3)->getDescription());
     $$ = $1;
@@ -3020,8 +3020,8 @@
     delete $3;
     CHECK_FOR_ERROR
   }
-  | ParamList ',' LABEL OptParamAttrs ValueRef OptParamAttrs {
-    // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
+  | ParamList ',' LABEL OptAttributes ValueRef OptAttributes {
+    // FIXME: Remove trailing OptAttributes in LLVM 3.0, it was a mistake in 2.0
     $$ = $1;
     ParamListEntry E; E.Attrs = $4 | $6; E.Val = getBBVal($5);
     $$->push_back(E);
@@ -3258,10 +3258,10 @@
                   theF->getName() + "'");
     }
 
-    // Set up the ParamAttrs for the function
-    SmallVector<FnAttributeWithIndex, 8> Attrs;
-    if ($8 != ParamAttr::None)
-      Attrs.push_back(FnAttributeWithIndex::get(0, $8));
+    // Set up the Attributes for the function
+    SmallVector<AttributeWithIndex, 8> Attrs;
+    if ($8 != Attribute::None)
+      Attrs.push_back(AttributeWithIndex::get(0, $8));
     // Check the arguments
     ValueList Args;
     if ($6->empty()) {                                   // Has no arguments?
@@ -3282,30 +3282,30 @@
           GEN_ERROR("Parameter " + ArgI->Val->getName()+ " is not of type '" +
                          (*I)->getDescription() + "'");
         Args.push_back(ArgI->Val);
-        if (ArgI->Attrs != ParamAttr::None)
-          Attrs.push_back(FnAttributeWithIndex::get(index, ArgI->Attrs));
+        if (ArgI->Attrs != Attribute::None)
+          Attrs.push_back(AttributeWithIndex::get(index, ArgI->Attrs));
       }
       if (Ty->isVarArg()) {
         if (I == E)
           for (; ArgI != ArgE; ++ArgI, ++index) {
             Args.push_back(ArgI->Val); // push the remaining varargs
-            if (ArgI->Attrs != ParamAttr::None)
-              Attrs.push_back(FnAttributeWithIndex::get(index, ArgI->Attrs));
+            if (ArgI->Attrs != Attribute::None)
+              Attrs.push_back(AttributeWithIndex::get(index, ArgI->Attrs));
           }
       } else if (I != E || ArgI != ArgE)
         GEN_ERROR("Invalid number of parameters detected");
     }
 
-    // Finish off the ParamAttrs and check them
-    PAListPtr PAL;
+    // Finish off the Attributes and check them
+    AttrListPtr PAL;
     if (!Attrs.empty())
-      PAL = PAListPtr::get(Attrs.begin(), Attrs.end());
+      PAL = AttrListPtr::get(Attrs.begin(), Attrs.end());
 
     // Create the call node
     CallInst *CI = CallInst::Create(V, Args.begin(), Args.end());
     CI->setTailCall($1);
     CI->setCallingConv($2);
-    CI->setParamAttrs(PAL);
+    CI->setAttributes(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=56622&r1=56621&r2=56622&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs Thu Sep 25 16:00:45 2008
@@ -994,7 +994,7 @@
 
   llvm::GlobalValue::LinkageTypes         Linkage;
   llvm::GlobalValue::VisibilityTypes      Visibility;
-  llvm::Attributes                  ParamAttrs;
+  llvm::Attributes                  Attributes;
   llvm::APInt                       *APIntVal;
   int64_t                           SInt64Val;
   uint64_t                          UInt64Val;
@@ -1088,10 +1088,10 @@
 %token X86_SSECALLCC_TOK
 %token DATALAYOUT
 %type <UIntVal> OptCallingConv LocalNumber
-%type <ParamAttrs> OptParamAttrs ParamAttr
-%type <ParamAttrs> OptFuncAttrs  FuncAttr
-%type <ParamAttrs> OptFuncNotes FuncNote
-%type <ParamAttrs> FuncNoteList
+%type <Attributes> OptAttributes Attribute
+%type <Attributes> OptFuncAttrs  FuncAttr
+%type <Attributes> OptFuncNotes FuncNote
+%type <Attributes> FuncNoteList
 
 // Basic Block Terminating Operators
 %token <TermOpVal> RET BR SWITCH INVOKE UNWIND UNREACHABLE
@@ -1260,35 +1260,35 @@
                   CHECK_FOR_ERROR
                  };
 
-ParamAttr     : ZEROEXT { $$ = ParamAttr::ZExt;      }
-              | ZEXT    { $$ = ParamAttr::ZExt;      }
-              | SIGNEXT { $$ = ParamAttr::SExt;      }
-              | SEXT    { $$ = ParamAttr::SExt;      }
-              | INREG   { $$ = ParamAttr::InReg;     }
-              | SRET    { $$ = ParamAttr::StructRet; }
-              | NOALIAS { $$ = ParamAttr::NoAlias;   }
-              | BYVAL   { $$ = ParamAttr::ByVal;     }
-              | NEST    { $$ = ParamAttr::Nest;      }
+Attribute     : ZEROEXT { $$ = Attribute::ZExt;      }
+              | ZEXT    { $$ = Attribute::ZExt;      }
+              | SIGNEXT { $$ = Attribute::SExt;      }
+              | SEXT    { $$ = Attribute::SExt;      }
+              | INREG   { $$ = Attribute::InReg;     }
+              | SRET    { $$ = Attribute::StructRet; }
+              | NOALIAS { $$ = Attribute::NoAlias;   }
+              | BYVAL   { $$ = Attribute::ByVal;     }
+              | NEST    { $$ = Attribute::Nest;      }
               | ALIGN EUINT64VAL { $$ =
-                          ParamAttr::constructAlignmentFromInt($2);    }
+                          Attribute::constructAlignmentFromInt($2);    }
               ;
 
-OptParamAttrs : /* empty */  { $$ = ParamAttr::None; }
-              | OptParamAttrs ParamAttr {
+OptAttributes : /* empty */  { $$ = Attribute::None; }
+              | OptAttributes Attribute {
                 $$ = $1 | $2;
               }
               ;
 
-FuncAttr      : NORETURN { $$ = ParamAttr::NoReturn; }
-              | NOUNWIND { $$ = ParamAttr::NoUnwind; }
-              | INREG    { $$ = ParamAttr::InReg;     }
-              | ZEROEXT  { $$ = ParamAttr::ZExt;     }
-              | SIGNEXT  { $$ = ParamAttr::SExt;     }
-              | READNONE { $$ = ParamAttr::ReadNone; }
-              | READONLY { $$ = ParamAttr::ReadOnly; }
+FuncAttr      : NORETURN { $$ = Attribute::NoReturn; }
+              | NOUNWIND { $$ = Attribute::NoUnwind; }
+              | INREG    { $$ = Attribute::InReg;     }
+              | ZEROEXT  { $$ = Attribute::ZExt;     }
+              | SIGNEXT  { $$ = Attribute::SExt;     }
+              | READNONE { $$ = Attribute::ReadNone; }
+              | READONLY { $$ = Attribute::ReadOnly; }
               ;
 
-OptFuncAttrs  : /* empty */ { $$ = ParamAttr::None; }
+OptFuncAttrs  : /* empty */ { $$ = Attribute::None; }
               | OptFuncAttrs FuncAttr {
                 $$ = $1 | $2;
               }
@@ -1297,23 +1297,23 @@
 FuncNoteList  : FuncNote { $$ = $1; }
               | FuncNoteList ',' FuncNote {
                 unsigned tmp = $1 | $3;
-                if ($3 == FnAttr::NoInline
-                    && ($1 & FnAttr::AlwaysInline))
+                if ($3 == Attribute::NoInline
+                    && ($1 & Attribute::AlwaysInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
-                    if ($3 == FnAttr::AlwaysInline
-                        && ($1 & FnAttr::NoInline))
+                    if ($3 == Attribute::AlwaysInline
+                        && ($1 & Attribute::NoInline))
                   GEN_ERROR("Function Notes may include only one inline notes!")
                 $$ = tmp;
                 CHECK_FOR_ERROR
               }
               ;
 
-FuncNote      : INLINE '=' NEVER { $$ = FnAttr::NoInline; }
-              | INLINE '=' ALWAYS { $$ = FnAttr::AlwaysInline; }
-              | OPTIMIZEFORSIZE { $$ = FnAttr::OptimizeForSize; }
+FuncNote      : INLINE '=' NEVER { $$ = Attribute::NoInline; }
+              | INLINE '=' ALWAYS { $$ = Attribute::AlwaysInline; }
+              | OPTIMIZEFORSIZE { $$ = Attribute::OptimizeForSize; }
               ;
 
-OptFuncNotes  : /* empty */ { $$ = FnAttr::None; }
+OptFuncNotes  : /* empty */ { $$ = Attribute::None; }
               | FNNOTE '(' FuncNoteList  ')' {
                 $$ =  $3;
               }
@@ -1509,11 +1509,11 @@
   ;
 
 ArgType
-  : Types OptParamAttrs {
+  : Types OptAttributes {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
     $$.Ty = $1;
-    $$.Attrs = ParamAttr::None;
+    $$.Attrs = Attribute::None;
   }
   ;
 
@@ -1545,14 +1545,14 @@
   : ArgTypeList
   | ArgTypeList ',' DOTDOTDOT {
     $$=$1;
-    TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
+    TypeWithAttrs TWA; TWA.Attrs = Attribute::None;
     TWA.Ty = new PATypeHolder(Type::VoidTy);
     $$->push_back(TWA);
     CHECK_FOR_ERROR
   }
   | DOTDOTDOT {
     $$ = new TypeWithAttrsList;
-    TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
+    TypeWithAttrs TWA; TWA.Attrs = Attribute::None;
     TWA.Ty = new PATypeHolder(Type::VoidTy);
     $$->push_back(TWA);
     CHECK_FOR_ERROR
@@ -2285,7 +2285,7 @@
 //                       Rules to match Function Headers
 //===----------------------------------------------------------------------===//
 
-ArgListH : ArgListH ',' Types OptParamAttrs OptLocalName {
+ArgListH : ArgListH ',' Types OptAttributes OptLocalName {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*$3)->getDescription());
     if (!(*$3)->isFirstClassType())
@@ -2295,7 +2295,7 @@
     $1->push_back(E);
     CHECK_FOR_ERROR
   }
-  | Types OptParamAttrs OptLocalName {
+  | Types OptAttributes OptLocalName {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
     if (!(*$1)->isFirstClassType())
@@ -2315,7 +2315,7 @@
     struct ArgListEntry E;
     E.Ty = new PATypeHolder(Type::VoidTy);
     E.Name = 0;
-    E.Attrs = ParamAttr::None;
+    E.Attrs = Attribute::None;
     $$->push_back(E);
     CHECK_FOR_ERROR
   }
@@ -2324,7 +2324,7 @@
     struct ArgListEntry E;
     E.Ty = new PATypeHolder(Type::VoidTy);
     E.Name = 0;
-    E.Attrs = ParamAttr::None;
+    E.Attrs = Attribute::None;
     $$->push_back(E);
     CHECK_FOR_ERROR
   }
@@ -2347,9 +2347,9 @@
     GEN_ERROR("Invalid result type for LLVM function");
 
   std::vector<const Type*> ParamTypeList;
-  SmallVector<FnAttributeWithIndex, 8> Attrs;
-  if ($7 != ParamAttr::None)
-    Attrs.push_back(FnAttributeWithIndex::get(0, $7));
+  SmallVector<AttributeWithIndex, 8> Attrs;
+  if ($7 != Attribute::None)
+    Attrs.push_back(AttributeWithIndex::get(0, $7));
   if ($5) {   // If there are arguments...
     unsigned index = 1;
     for (ArgListType::iterator I = $5->begin(); I != $5->end(); ++I, ++index) {
@@ -2357,17 +2357,17 @@
       if (!CurFun.isDeclare && CurModule.TypeIsUnresolved(I->Ty))
         GEN_ERROR("Reference to abstract argument: " + Ty->getDescription());
       ParamTypeList.push_back(Ty);
-      if (Ty != Type::VoidTy && I->Attrs != ParamAttr::None)
-        Attrs.push_back(FnAttributeWithIndex::get(index, I->Attrs));
+      if (Ty != Type::VoidTy && I->Attrs != Attribute::None)
+        Attrs.push_back(AttributeWithIndex::get(index, I->Attrs));
     }
   }
 
   bool isVarArg = ParamTypeList.size() && ParamTypeList.back() == Type::VoidTy;
   if (isVarArg) ParamTypeList.pop_back();
 
-  PAListPtr PAL;
+  AttrListPtr PAL;
   if (!Attrs.empty())
-    PAL = PAListPtr::get(Attrs.begin(), Attrs.end());
+    PAL = AttrListPtr::get(Attrs.begin(), Attrs.end());
 
   FunctionType *FT = FunctionType::get(*$2, ParamTypeList, isVarArg);
   const PointerType *PFT = PointerType::getUnqual(FT);
@@ -2386,7 +2386,7 @@
     // Move the function to the end of the list, from whereever it was
     // previously inserted.
     Fn = cast<Function>(FWRef);
-    assert(Fn->getParamAttrs().isEmpty() &&
+    assert(Fn->getAttributes().isEmpty() &&
            "Forward reference has parameter attributes!");
     CurModule.CurrentModule->getFunctionList().remove(Fn);
     CurModule.CurrentModule->getFunctionList().push_back(Fn);
@@ -2396,7 +2396,7 @@
       // 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) {
+    } else if (Fn->getAttributes() != PAL) {
       // The existing function doesn't have the same parameter attributes.
       // This is an overload error.
       GEN_ERROR("Overload of function '" + FunctionName + "' not permitted.");
@@ -2426,7 +2426,7 @@
     Fn->setVisibility(CurFun.Visibility);
   }
   Fn->setCallingConv($1);
-  Fn->setParamAttrs(PAL);
+  Fn->setAttributes(PAL);
   Fn->setAlignment($9);
   if ($8) {
     Fn->setSection(*$8);
@@ -2861,9 +2861,9 @@
     BasicBlock *Except = getBBVal($14);
     CHECK_FOR_ERROR
 
-    SmallVector<FnAttributeWithIndex, 8> Attrs;
-    if ($8 != ParamAttr::None)
-      Attrs.push_back(FnAttributeWithIndex::get(0, $8));
+    SmallVector<AttributeWithIndex, 8> Attrs;
+    if ($8 != Attribute::None)
+      Attrs.push_back(AttributeWithIndex::get(0, $8));
 
     // Check the arguments
     ValueList Args;
@@ -2885,30 +2885,30 @@
           GEN_ERROR("Parameter " + ArgI->Val->getName()+ " is not of type '" +
                          (*I)->getDescription() + "'");
         Args.push_back(ArgI->Val);
-        if (ArgI->Attrs != ParamAttr::None)
-          Attrs.push_back(FnAttributeWithIndex::get(index, ArgI->Attrs));
+        if (ArgI->Attrs != Attribute::None)
+          Attrs.push_back(AttributeWithIndex::get(index, ArgI->Attrs));
       }
 
       if (Ty->isVarArg()) {
         if (I == E)
           for (; ArgI != ArgE; ++ArgI, ++index) {
             Args.push_back(ArgI->Val); // push the remaining varargs
-            if (ArgI->Attrs != ParamAttr::None)
-              Attrs.push_back(FnAttributeWithIndex::get(index, ArgI->Attrs));
+            if (ArgI->Attrs != Attribute::None)
+              Attrs.push_back(AttributeWithIndex::get(index, ArgI->Attrs));
           }
       } else if (I != E || ArgI != ArgE)
         GEN_ERROR("Invalid number of parameters detected");
     }
 
-    PAListPtr PAL;
+    AttrListPtr PAL;
     if (!Attrs.empty())
-      PAL = PAListPtr::get(Attrs.begin(), Attrs.end());
+      PAL = AttrListPtr::get(Attrs.begin(), Attrs.end());
 
     // Create the InvokeInst
     InvokeInst *II = InvokeInst::Create(V, Normal, Except,
                                         Args.begin(), Args.end());
     II->setCallingConv($2);
-    II->setParamAttrs(PAL);
+    II->setAttributes(PAL);
     $$ = II;
     delete $6;
     CHECK_FOR_ERROR
@@ -2991,8 +2991,8 @@
   };
 
 
-ParamList : Types OptParamAttrs ValueRef OptParamAttrs {
-    // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
+ParamList : Types OptAttributes ValueRef OptAttributes {
+    // FIXME: Remove trailing OptAttributes 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
@@ -3002,16 +3002,16 @@
     delete $1;
     CHECK_FOR_ERROR
   }
-  | LABEL OptParamAttrs ValueRef OptParamAttrs {
-    // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
+  | LABEL OptAttributes ValueRef OptAttributes {
+    // FIXME: Remove trailing OptAttributes in LLVM 3.0, it was a mistake in 2.0
     // Labels are only valid in ASMs
     $$ = new ParamList();
     ParamListEntry E; E.Attrs = $2 | $4; E.Val = getBBVal($3);
     $$->push_back(E);
     CHECK_FOR_ERROR
   }
-  | ParamList ',' Types OptParamAttrs ValueRef OptParamAttrs {
-    // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
+  | ParamList ',' Types OptAttributes ValueRef OptAttributes {
+    // FIXME: Remove trailing OptAttributes in LLVM 3.0, it was a mistake in 2.0
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*$3)->getDescription());
     $$ = $1;
@@ -3020,8 +3020,8 @@
     delete $3;
     CHECK_FOR_ERROR
   }
-  | ParamList ',' LABEL OptParamAttrs ValueRef OptParamAttrs {
-    // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
+  | ParamList ',' LABEL OptAttributes ValueRef OptAttributes {
+    // FIXME: Remove trailing OptAttributes in LLVM 3.0, it was a mistake in 2.0
     $$ = $1;
     ParamListEntry E; E.Attrs = $4 | $6; E.Val = getBBVal($5);
     $$->push_back(E);
@@ -3258,10 +3258,10 @@
                   theF->getName() + "'");
     }
 
-    // Set up the ParamAttrs for the function
-    SmallVector<FnAttributeWithIndex, 8> Attrs;
-    if ($8 != ParamAttr::None)
-      Attrs.push_back(FnAttributeWithIndex::get(0, $8));
+    // Set up the Attributes for the function
+    SmallVector<AttributeWithIndex, 8> Attrs;
+    if ($8 != Attribute::None)
+      Attrs.push_back(AttributeWithIndex::get(0, $8));
     // Check the arguments
     ValueList Args;
     if ($6->empty()) {                                   // Has no arguments?
@@ -3282,30 +3282,30 @@
           GEN_ERROR("Parameter " + ArgI->Val->getName()+ " is not of type '" +
                          (*I)->getDescription() + "'");
         Args.push_back(ArgI->Val);
-        if (ArgI->Attrs != ParamAttr::None)
-          Attrs.push_back(FnAttributeWithIndex::get(index, ArgI->Attrs));
+        if (ArgI->Attrs != Attribute::None)
+          Attrs.push_back(AttributeWithIndex::get(index, ArgI->Attrs));
       }
       if (Ty->isVarArg()) {
         if (I == E)
           for (; ArgI != ArgE; ++ArgI, ++index) {
             Args.push_back(ArgI->Val); // push the remaining varargs
-            if (ArgI->Attrs != ParamAttr::None)
-              Attrs.push_back(FnAttributeWithIndex::get(index, ArgI->Attrs));
+            if (ArgI->Attrs != Attribute::None)
+              Attrs.push_back(AttributeWithIndex::get(index, ArgI->Attrs));
           }
       } else if (I != E || ArgI != ArgE)
         GEN_ERROR("Invalid number of parameters detected");
     }
 
-    // Finish off the ParamAttrs and check them
-    PAListPtr PAL;
+    // Finish off the Attributes and check them
+    AttrListPtr PAL;
     if (!Attrs.empty())
-      PAL = PAListPtr::get(Attrs.begin(), Attrs.end());
+      PAL = AttrListPtr::get(Attrs.begin(), Attrs.end());
 
     // Create the call node
     CallInst *CI = CallInst::Create(V, Args.begin(), Args.end());
     CI->setTailCall($1);
     CI->setCallingConv($2);
-    CI->setParamAttrs(PAL);
+    CI->setAttributes(PAL);
     $$ = CI;
     delete $6;
     delete $3;

Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp?rev=56622&r1=56621&r2=56622&view=diff

==============================================================================
--- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp (original)
+++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp Thu Sep 25 16:00:45 2008
@@ -32,7 +32,7 @@
   std::vector<PATypeHolder>().swap(TypeList);
   ValueList.clear();
   
-  std::vector<PAListPtr>().swap(ParamAttrs);
+  std::vector<AttrListPtr>().swap(Attributes);
   std::vector<BasicBlock*>().swap(FunctionBBs);
   std::vector<Function*>().swap(FunctionsWithBodies);
   DeferredFunctionInfo.clear();
@@ -313,16 +313,16 @@
 //  Functions for parsing blocks from the bitcode file
 //===----------------------------------------------------------------------===//
 
-bool BitcodeReader::ParseParamAttrBlock() {
+bool BitcodeReader::ParseAttributeBlock() {
   if (Stream.EnterSubBlock(bitc::PARAMATTR_BLOCK_ID))
     return Error("Malformed block record");
   
-  if (!ParamAttrs.empty())
+  if (!Attributes.empty())
     return Error("Multiple PARAMATTR blocks found!");
   
   SmallVector<uint64_t, 64> Record;
   
-  SmallVector<FnAttributeWithIndex, 8> Attrs;
+  SmallVector<AttributeWithIndex, 8> Attrs;
   
   // Read all the records.
   while (1) {
@@ -356,11 +356,11 @@
         return Error("Invalid ENTRY record");
 
       for (unsigned i = 0, e = Record.size(); i != e; i += 2) {
-        if (Record[i+1] != ParamAttr::None)
-          Attrs.push_back(FnAttributeWithIndex::get(Record[i], Record[i+1]));
+        if (Record[i+1] != Attribute::None)
+          Attrs.push_back(AttributeWithIndex::get(Record[i], Record[i+1]));
       }
 
-      ParamAttrs.push_back(PAListPtr::get(Attrs.begin(), Attrs.end()));
+      Attributes.push_back(AttrListPtr::get(Attrs.begin(), Attrs.end()));
       Attrs.clear();
       break;
     }
@@ -1030,7 +1030,7 @@
           return Error("Malformed BlockInfoBlock");
         break;
       case bitc::PARAMATTR_BLOCK_ID:
-        if (ParseParamAttrBlock())
+        if (ParseAttributeBlock())
           return true;
         break;
       case bitc::TYPE_BLOCK_ID:
@@ -1183,7 +1183,7 @@
       Func->setCallingConv(Record[1]);
       bool isProto = Record[2];
       Func->setLinkage(GetDecodedLinkage(Record[3]));
-      Func->setParamAttrs(getParamAttrs(Record[4]));
+      Func->setAttributes(getAttributes(Record[4]));
       
       Func->setAlignment((1 << Record[5]) >> 1);
       if (Record[6]) {
@@ -1695,7 +1695,7 @@
     case bitc::FUNC_CODE_INST_INVOKE: {
       // INVOKE: [attrs, cc, normBB, unwindBB, fnty, op0,op1,op2, ...]
       if (Record.size() < 4) return Error("Invalid INVOKE record");
-      PAListPtr PAL = getParamAttrs(Record[0]);
+      AttrListPtr PAL = getAttributes(Record[0]);
       unsigned CCInfo = Record[1];
       BasicBlock *NormalBB = getBasicBlock(Record[2]);
       BasicBlock *UnwindBB = getBasicBlock(Record[3]);
@@ -1736,7 +1736,7 @@
       I = InvokeInst::Create(Callee, NormalBB, UnwindBB,
                              Ops.begin(), Ops.end());
       cast<InvokeInst>(I)->setCallingConv(CCInfo);
-      cast<InvokeInst>(I)->setParamAttrs(PAL);
+      cast<InvokeInst>(I)->setAttributes(PAL);
       break;
     }
     case bitc::FUNC_CODE_INST_UNWIND: // UNWIND
@@ -1834,7 +1834,7 @@
       if (Record.size() < 3)
         return Error("Invalid CALL record");
       
-      PAListPtr PAL = getParamAttrs(Record[0]);
+      AttrListPtr PAL = getAttributes(Record[0]);
       unsigned CCInfo = Record[1];
       
       unsigned OpNum = 2;
@@ -1874,7 +1874,7 @@
       I = CallInst::Create(Callee, Args.begin(), Args.end());
       cast<CallInst>(I)->setCallingConv(CCInfo>>1);
       cast<CallInst>(I)->setTailCall(CCInfo & 1);
-      cast<CallInst>(I)->setParamAttrs(PAL);
+      cast<CallInst>(I)->setAttributes(PAL);
       break;
     }
     case bitc::FUNC_CODE_INST_VAARG: { // VAARG: [valistty, valist, instty]

Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.h?rev=56622&r1=56621&r2=56622&view=diff

==============================================================================
--- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.h (original)
+++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.h Thu Sep 25 16:00:45 2008
@@ -136,10 +136,10 @@
   std::vector<std::pair<GlobalVariable*, unsigned> > GlobalInits;
   std::vector<std::pair<GlobalAlias*, unsigned> > AliasInits;
   
-  /// ParamAttrs - The set of parameter attributes by index.  Index zero in the
+  /// Attributes - The set of parameter attributes by index.  Index zero in the
   /// file is for null, and is thus not represented here.  As such all indices
   /// are off by one.
-  std::vector<PAListPtr> ParamAttrs;
+  std::vector<AttrListPtr> Attributes;
   
   /// FunctionBBs - While parsing a function body, this is a list of the basic
   /// blocks for the function.
@@ -203,10 +203,10 @@
     if (ID >= FunctionBBs.size()) return 0; // Invalid ID
     return FunctionBBs[ID];
   }
-  PAListPtr getParamAttrs(unsigned i) const {
-    if (i-1 < ParamAttrs.size())
-      return ParamAttrs[i-1];
-    return PAListPtr();
+  AttrListPtr getAttributes(unsigned i) const {
+    if (i-1 < Attributes.size())
+      return Attributes[i-1];
+    return AttrListPtr();
   }
   
   /// getValueTypePair - Read a value/type pair out of the specified record from
@@ -239,7 +239,7 @@
 
   
   bool ParseModule(const std::string &ModuleID);
-  bool ParseParamAttrBlock();
+  bool ParseAttributeBlock();
   bool ParseTypeTable();
   bool ParseTypeSymbolTable();
   bool ParseValueSymbolTable();

Modified: llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=56622&r1=56621&r2=56622&view=diff

==============================================================================
--- llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp (original)
+++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Thu Sep 25 16:00:45 2008
@@ -108,18 +108,18 @@
 }
 
 // Emit information about parameter attributes.
-static void WriteParamAttrTable(const ValueEnumerator &VE, 
+static void WriteAttributeTable(const ValueEnumerator &VE, 
                                 BitstreamWriter &Stream) {
-  const std::vector<PAListPtr> &Attrs = VE.getParamAttrs();
+  const std::vector<AttrListPtr> &Attrs = VE.getAttributes();
   if (Attrs.empty()) return;
   
   Stream.EnterSubblock(bitc::PARAMATTR_BLOCK_ID, 3);
 
   SmallVector<uint64_t, 64> Record;
   for (unsigned i = 0, e = Attrs.size(); i != e; ++i) {
-    const PAListPtr &A = Attrs[i];
+    const AttrListPtr &A = Attrs[i];
     for (unsigned i = 0, e = A.getNumSlots(); i != e; ++i) {
-      const FnAttributeWithIndex &PAWI = A.getSlot(i);
+      const AttributeWithIndex &PAWI = A.getSlot(i);
       Record.push_back(PAWI.Index);
       Record.push_back(PAWI.Attrs);
     }
@@ -407,7 +407,7 @@
     Vals.push_back(F->getCallingConv());
     Vals.push_back(F->isDeclaration());
     Vals.push_back(getEncodedLinkage(F));
-    Vals.push_back(VE.getParamAttrID(F->getParamAttrs()));
+    Vals.push_back(VE.getAttributeID(F->getAttributes()));
     Vals.push_back(Log2_32(F->getAlignment())+1);
     Vals.push_back(F->hasSection() ? SectionMap[F->getSection()] : 0);
     Vals.push_back(getEncodedVisibility(F));
@@ -818,7 +818,7 @@
     Code = bitc::FUNC_CODE_INST_INVOKE;
     
     const InvokeInst *II = cast<InvokeInst>(&I);
-    Vals.push_back(VE.getParamAttrID(II->getParamAttrs()));
+    Vals.push_back(VE.getAttributeID(II->getAttributes()));
     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
@@ -892,7 +892,7 @@
     Code = bitc::FUNC_CODE_INST_CALL;
     
     const CallInst *CI = cast<CallInst>(&I);
-    Vals.push_back(VE.getParamAttrID(CI->getParamAttrs()));
+    Vals.push_back(VE.getAttributeID(CI->getAttributes()));
     Vals.push_back((CI->getCallingConv() << 1) | unsigned(CI->isTailCall()));
     PushValueAndType(CI->getOperand(0), InstID, Vals, VE);  // Callee
     
@@ -1226,7 +1226,7 @@
   WriteBlockInfo(VE, Stream);
   
   // Emit information about parameter attributes.
-  WriteParamAttrTable(VE, Stream);
+  WriteAttributeTable(VE, Stream);
   
   // Emit information describing all of the types in the module.
   WriteTypeTable(VE, Stream);

Modified: llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.cpp?rev=56622&r1=56621&r2=56622&view=diff

==============================================================================
--- llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.cpp (original)
+++ llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.cpp Thu Sep 25 16:00:45 2008
@@ -47,7 +47,7 @@
   // Enumerate the functions.
   for (Module::const_iterator I = M->begin(), E = M->end(); I != E; ++I) {
     EnumerateValue(I);
-    EnumerateParamAttrs(cast<Function>(I)->getParamAttrs());
+    EnumerateAttributes(cast<Function>(I)->getAttributes());
   }
 
   // Enumerate the aliases.
@@ -90,9 +90,9 @@
           EnumerateOperandType(*OI);
         EnumerateType(I->getType());
         if (const CallInst *CI = dyn_cast<CallInst>(I))
-          EnumerateParamAttrs(CI->getParamAttrs());
+          EnumerateAttributes(CI->getAttributes());
         else if (const InvokeInst *II = dyn_cast<InvokeInst>(I))
-          EnumerateParamAttrs(II->getParamAttrs());
+          EnumerateAttributes(II->getAttributes());
       }
   }
   
@@ -247,14 +247,14 @@
   }
 }
 
-void ValueEnumerator::EnumerateParamAttrs(const PAListPtr &PAL) {
+void ValueEnumerator::EnumerateAttributes(const AttrListPtr &PAL) {
   if (PAL.isEmpty()) return;  // null is always 0.
   // Do a lookup.
-  unsigned &Entry = ParamAttrMap[PAL.getRawPointer()];
+  unsigned &Entry = AttributeMap[PAL.getRawPointer()];
   if (Entry == 0) {
     // Never saw this before, add it.
-    ParamAttrs.push_back(PAL);
-    Entry = ParamAttrs.size();
+    Attributes.push_back(PAL);
+    Entry = Attributes.size();
   }
 }
 
@@ -303,7 +303,7 @@
   
   // Add the function's parameter attributes so they are available for use in
   // the function's instruction.
-  EnumerateParamAttrs(F.getParamAttrs());
+  EnumerateAttributes(F.getAttributes());
 
   FirstInstID = Values.size();
   

Modified: llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.h?rev=56622&r1=56621&r2=56622&view=diff

==============================================================================
--- llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.h (original)
+++ llvm/trunk/lib/Bitcode/Writer/ValueEnumerator.h Thu Sep 25 16:00:45 2008
@@ -25,7 +25,7 @@
 class BasicBlock;
 class Function;
 class Module;
-class PAListPtr;
+class AttrListPtr;
 class TypeSymbolTable;
 class ValueSymbolTable;
 
@@ -45,9 +45,9 @@
   ValueMapType ValueMap;
   ValueList Values;
   
-  typedef DenseMap<void*, unsigned> ParamAttrMapType;
-  ParamAttrMapType ParamAttrMap;
-  std::vector<PAListPtr> ParamAttrs;
+  typedef DenseMap<void*, unsigned> AttributeMapType;
+  AttributeMapType AttributeMap;
+  std::vector<AttrListPtr> Attributes;
   
   /// BasicBlocks - This contains all the basic blocks for the currently
   /// incorporated function.  Their reverse mapping is stored in ValueMap.
@@ -76,10 +76,10 @@
     return I->second-1;
   }
   
-  unsigned getParamAttrID(const PAListPtr &PAL) const {
+  unsigned getAttributeID(const AttrListPtr &PAL) const {
     if (PAL.isEmpty()) return 0;  // Null maps to zero.
-    ParamAttrMapType::const_iterator I = ParamAttrMap.find(PAL.getRawPointer());
-    assert(I != ParamAttrMap.end() && "ParamAttr not in ValueEnumerator!");
+    AttributeMapType::const_iterator I = AttributeMap.find(PAL.getRawPointer());
+    assert(I != AttributeMap.end() && "Attribute not in ValueEnumerator!");
     return I->second;
   }
 
@@ -95,8 +95,8 @@
   const std::vector<const BasicBlock*> &getBasicBlocks() const {
     return BasicBlocks; 
   }
-  const std::vector<PAListPtr> &getParamAttrs() const {
-    return ParamAttrs;
+  const std::vector<AttrListPtr> &getAttributes() const {
+    return Attributes;
   }
 
   /// PurgeAggregateValues - If there are any aggregate values at the end of the
@@ -116,7 +116,7 @@
   void EnumerateValue(const Value *V);
   void EnumerateType(const Type *T);
   void EnumerateOperandType(const Value *V);
-  void EnumerateParamAttrs(const PAListPtr &PAL);
+  void EnumerateAttributes(const AttrListPtr &PAL);
   
   void EnumerateTypeSymbolTable(const TypeSymbolTable &ST);
   void EnumerateValueSymbolTable(const ValueSymbolTable &ST);

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Thu Sep 25 16:00:45 2008
@@ -927,9 +927,9 @@
       ISD::NodeType ExtendKind = ISD::ANY_EXTEND;
   
       const Function *F = I.getParent()->getParent();
-      if (F->paramHasAttr(0, ParamAttr::SExt))
+      if (F->paramHasAttr(0, Attribute::SExt))
         ExtendKind = ISD::SIGN_EXTEND;
-      else if (F->paramHasAttr(0, ParamAttr::ZExt))
+      else if (F->paramHasAttr(0, Attribute::ZExt))
         ExtendKind = ISD::ZERO_EXTEND;
 
       getCopyToParts(DAG, SDValue(RetOp.getNode(), RetOp.getResNo() + j),
@@ -937,7 +937,7 @@
 
       // 'inreg' on function refers to return value
       ISD::ArgFlagsTy Flags = ISD::ArgFlagsTy();
-      if (F->paramHasAttr(0, ParamAttr::InReg))
+      if (F->paramHasAttr(0, Attribute::InReg))
         Flags.setInReg();
       for (unsigned i = 0; i < NumParts; ++i) {
         NewValues.push_back(Parts[i]);
@@ -4100,12 +4100,12 @@
     Entry.Node = ArgNode; Entry.Ty = (*i)->getType();
 
     unsigned attrInd = i - CS.arg_begin() + 1;
-    Entry.isSExt  = CS.paramHasAttr(attrInd, ParamAttr::SExt);
-    Entry.isZExt  = CS.paramHasAttr(attrInd, ParamAttr::ZExt);
-    Entry.isInReg = CS.paramHasAttr(attrInd, ParamAttr::InReg);
-    Entry.isSRet  = CS.paramHasAttr(attrInd, ParamAttr::StructRet);
-    Entry.isNest  = CS.paramHasAttr(attrInd, ParamAttr::Nest);
-    Entry.isByVal = CS.paramHasAttr(attrInd, ParamAttr::ByVal);
+    Entry.isSExt  = CS.paramHasAttr(attrInd, Attribute::SExt);
+    Entry.isZExt  = CS.paramHasAttr(attrInd, Attribute::ZExt);
+    Entry.isInReg = CS.paramHasAttr(attrInd, Attribute::InReg);
+    Entry.isSRet  = CS.paramHasAttr(attrInd, Attribute::StructRet);
+    Entry.isNest  = CS.paramHasAttr(attrInd, Attribute::Nest);
+    Entry.isByVal = CS.paramHasAttr(attrInd, Attribute::ByVal);
     Entry.Alignment = CS.getParamAlignment(attrInd);
     Args.push_back(Entry);
   }
@@ -4122,8 +4122,8 @@
 
   std::pair<SDValue,SDValue> Result =
     TLI.LowerCallTo(getRoot(), CS.getType(),
-                    CS.paramHasAttr(0, ParamAttr::SExt),
-                    CS.paramHasAttr(0, ParamAttr::ZExt),
+                    CS.paramHasAttr(0, Attribute::SExt),
+                    CS.paramHasAttr(0, Attribute::ZExt),
                     FTy->isVarArg(), CS.getCallingConv(),
                     IsTailCall && PerformTailCallOpt,
                     Callee, Args, DAG);
@@ -5126,15 +5126,15 @@
       unsigned OriginalAlignment =
         getTargetData()->getABITypeAlignment(ArgTy);
 
-      if (F.paramHasAttr(j, ParamAttr::ZExt))
+      if (F.paramHasAttr(j, Attribute::ZExt))
         Flags.setZExt();
-      if (F.paramHasAttr(j, ParamAttr::SExt))
+      if (F.paramHasAttr(j, Attribute::SExt))
         Flags.setSExt();
-      if (F.paramHasAttr(j, ParamAttr::InReg))
+      if (F.paramHasAttr(j, Attribute::InReg))
         Flags.setInReg();
-      if (F.paramHasAttr(j, ParamAttr::StructRet))
+      if (F.paramHasAttr(j, Attribute::StructRet))
         Flags.setSRet();
-      if (F.paramHasAttr(j, ParamAttr::ByVal)) {
+      if (F.paramHasAttr(j, Attribute::ByVal)) {
         Flags.setByVal();
         const PointerType *Ty = cast<PointerType>(I->getType());
         const Type *ElementTy = Ty->getElementType();
@@ -5147,7 +5147,7 @@
         Flags.setByValAlign(FrameAlign);
         Flags.setByValSize(FrameSize);
       }
-      if (F.paramHasAttr(j, ParamAttr::Nest))
+      if (F.paramHasAttr(j, Attribute::Nest))
         Flags.setNest();
       Flags.setOrigAlign(OriginalAlignment);
 
@@ -5214,9 +5214,9 @@
         Parts[j] = SDValue(Result, i++);
 
       ISD::NodeType AssertOp = ISD::DELETED_NODE;
-      if (F.paramHasAttr(Idx, ParamAttr::SExt))
+      if (F.paramHasAttr(Idx, Attribute::SExt))
         AssertOp = ISD::AssertSext;
-      else if (F.paramHasAttr(Idx, ParamAttr::ZExt))
+      else if (F.paramHasAttr(Idx, Attribute::ZExt))
         AssertOp = ISD::AssertZext;
 
       ArgValues.push_back(getCopyFromParts(DAG, &Parts[0], NumParts, PartVT, VT,

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

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Thu Sep 25 16:00:45 2008
@@ -728,7 +728,7 @@
         unsigned j = 1;
         for (Function::arg_iterator I = Fn.arg_begin(), E = Fn.arg_end();
              I != E; ++I, ++j)
-          if (Fn.paramHasAttr(j, ParamAttr::ByVal)) {
+          if (Fn.paramHasAttr(j, Attribute::ByVal)) {
             if (EnableFastISelVerbose || EnableFastISelAbort)
               cerr << "FastISel skips entry block due to byval argument\n";
             SuppressFastISel = true;

Modified: llvm/trunk/lib/CodeGen/ShadowStackGC.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/ShadowStackGC.cpp?rev=56622&r1=56621&r2=56622&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/ShadowStackGC.cpp (original)
+++ llvm/trunk/lib/CodeGen/ShadowStackGC.cpp Thu Sep 25 16:00:45 2008
@@ -162,7 +162,7 @@
                                               Args.begin(), Args.end(),
                                               CI->getName(), CallBB);
           II->setCallingConv(CI->getCallingConv());
-          II->setParamAttrs(CI->getParamAttrs());
+          II->setAttributes(CI->getAttributes());
           CI->replaceAllUsesWith(II);
           delete CI;
         }

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

==============================================================================
--- llvm/trunk/lib/ExecutionEngine/Interpreter/Execution.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/Interpreter/Execution.cpp Thu Sep 25 16:00:45 2008
@@ -909,9 +909,9 @@
     // according to the parameter attributes
     const Type *Ty = V->getType();
     if (Ty->isInteger() && (ArgVals.back().IntVal.getBitWidth() < 32)) {
-      if (CS.paramHasAttr(pNum, ParamAttr::ZExt))
+      if (CS.paramHasAttr(pNum, Attribute::ZExt))
         ArgVals.back().IntVal = ArgVals.back().IntVal.zext(32);
-      else if (CS.paramHasAttr(pNum, ParamAttr::SExt))
+      else if (CS.paramHasAttr(pNum, Attribute::SExt))
         ArgVals.back().IntVal = ArgVals.back().IntVal.sext(32);
     }
   }

Modified: llvm/trunk/lib/Target/CBackend/CBackend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CBackend/CBackend.cpp?rev=56622&r1=56621&r2=56622&view=diff

==============================================================================
--- llvm/trunk/lib/Target/CBackend/CBackend.cpp (original)
+++ llvm/trunk/lib/Target/CBackend/CBackend.cpp Thu Sep 25 16:00:45 2008
@@ -131,12 +131,12 @@
                             bool isSigned = false,
                             const std::string &VariableName = "",
                             bool IgnoreName = false,
-                            const PAListPtr &PAL = PAListPtr());
+                            const AttrListPtr &PAL = AttrListPtr());
     std::ostream &printType(std::ostream &Out, const Type *Ty, 
                            bool isSigned = false,
                            const std::string &VariableName = "",
                            bool IgnoreName = false,
-                           const PAListPtr &PAL = PAListPtr());
+                           const AttrListPtr &PAL = AttrListPtr());
     raw_ostream &printSimpleType(raw_ostream &Out, const Type *Ty, 
                                   bool isSigned, 
                                   const std::string &NameSoFar = "");
@@ -145,7 +145,7 @@
                                  const std::string &NameSoFar = "");
 
     void printStructReturnPointerFunctionType(raw_ostream &Out,
-                                              const PAListPtr &PAL,
+                                              const AttrListPtr &PAL,
                                               const PointerType *Ty);
 
     /// writeOperandDeref - Print the result of dereferencing the specified
@@ -408,7 +408,7 @@
 /// return type, except, instead of printing the type as void (*)(Struct*, ...)
 /// print it as "Struct (*)(...)", for struct return functions.
 void CWriter::printStructReturnPointerFunctionType(raw_ostream &Out,
-                                                   const PAListPtr &PAL,
+                                                   const AttrListPtr &PAL,
                                                    const PointerType *TheTy) {
   const FunctionType *FTy = cast<FunctionType>(TheTy->getElementType());
   std::stringstream FunctionInnards;
@@ -422,12 +422,12 @@
     if (PrintedType)
       FunctionInnards << ", ";
     const Type *ArgTy = *I;
-    if (PAL.paramHasAttr(Idx, ParamAttr::ByVal)) {
+    if (PAL.paramHasAttr(Idx, Attribute::ByVal)) {
       assert(isa<PointerType>(ArgTy));
       ArgTy = cast<PointerType>(ArgTy)->getElementType();
     }
     printType(FunctionInnards, ArgTy,
-        /*isSigned=*/PAL.paramHasAttr(Idx, ParamAttr::SExt), "");
+        /*isSigned=*/PAL.paramHasAttr(Idx, Attribute::SExt), "");
     PrintedType = true;
   }
   if (FTy->isVarArg()) {
@@ -439,7 +439,7 @@
   FunctionInnards << ')';
   std::string tstr = FunctionInnards.str();
   printType(Out, RetTy, 
-      /*isSigned=*/PAL.paramHasAttr(0, ParamAttr::SExt), tstr);
+      /*isSigned=*/PAL.paramHasAttr(0, Attribute::SExt), tstr);
 }
 
 raw_ostream &
@@ -537,7 +537,7 @@
 //
 raw_ostream &CWriter::printType(raw_ostream &Out, const Type *Ty,
                                  bool isSigned, const std::string &NameSoFar,
-                                 bool IgnoreName, const PAListPtr &PAL) {
+                                 bool IgnoreName, const AttrListPtr &PAL) {
   if (Ty->isPrimitiveType() || Ty->isInteger() || isa<VectorType>(Ty)) {
     printSimpleType(Out, Ty, isSigned, NameSoFar);
     return Out;
@@ -558,14 +558,14 @@
     for (FunctionType::param_iterator I = FTy->param_begin(),
            E = FTy->param_end(); I != E; ++I) {
       const Type *ArgTy = *I;
-      if (PAL.paramHasAttr(Idx, ParamAttr::ByVal)) {
+      if (PAL.paramHasAttr(Idx, Attribute::ByVal)) {
         assert(isa<PointerType>(ArgTy));
         ArgTy = cast<PointerType>(ArgTy)->getElementType();
       }
       if (I != FTy->param_begin())
         FunctionInnards << ", ";
       printType(FunctionInnards, ArgTy,
-        /*isSigned=*/PAL.paramHasAttr(Idx, ParamAttr::SExt), "");
+        /*isSigned=*/PAL.paramHasAttr(Idx, Attribute::SExt), "");
       ++Idx;
     }
     if (FTy->isVarArg()) {
@@ -577,7 +577,7 @@
     FunctionInnards << ')';
     std::string tstr = FunctionInnards.str();
     printType(Out, FTy->getReturnType(), 
-      /*isSigned=*/PAL.paramHasAttr(0, ParamAttr::SExt), tstr);
+      /*isSigned=*/PAL.paramHasAttr(0, Attribute::SExt), tstr);
     return Out;
   }
   case Type::StructTyID: {
@@ -642,7 +642,7 @@
 //
 std::ostream &CWriter::printType(std::ostream &Out, const Type *Ty,
                                  bool isSigned, const std::string &NameSoFar,
-                                 bool IgnoreName, const PAListPtr &PAL) {
+                                 bool IgnoreName, const AttrListPtr &PAL) {
   if (Ty->isPrimitiveType() || Ty->isInteger() || isa<VectorType>(Ty)) {
     printSimpleType(Out, Ty, isSigned, NameSoFar);
     return Out;
@@ -663,14 +663,14 @@
     for (FunctionType::param_iterator I = FTy->param_begin(),
            E = FTy->param_end(); I != E; ++I) {
       const Type *ArgTy = *I;
-      if (PAL.paramHasAttr(Idx, ParamAttr::ByVal)) {
+      if (PAL.paramHasAttr(Idx, Attribute::ByVal)) {
         assert(isa<PointerType>(ArgTy));
         ArgTy = cast<PointerType>(ArgTy)->getElementType();
       }
       if (I != FTy->param_begin())
         FunctionInnards << ", ";
       printType(FunctionInnards, ArgTy,
-        /*isSigned=*/PAL.paramHasAttr(Idx, ParamAttr::SExt), "");
+        /*isSigned=*/PAL.paramHasAttr(Idx, Attribute::SExt), "");
       ++Idx;
     }
     if (FTy->isVarArg()) {
@@ -682,7 +682,7 @@
     FunctionInnards << ')';
     std::string tstr = FunctionInnards.str();
     printType(Out, FTy->getReturnType(), 
-      /*isSigned=*/PAL.paramHasAttr(0, ParamAttr::SExt), tstr);
+      /*isSigned=*/PAL.paramHasAttr(0, Attribute::SExt), tstr);
     return Out;
   }
   case Type::StructTyID: {
@@ -2162,7 +2162,7 @@
   
   // Loop over the arguments, printing them...
   const FunctionType *FT = cast<FunctionType>(F->getFunctionType());
-  const PAListPtr &PAL = F->getParamAttrs();
+  const AttrListPtr &PAL = F->getAttributes();
 
   std::stringstream FunctionInnards;
 
@@ -2191,12 +2191,12 @@
         else
           ArgName = "";
         const Type *ArgTy = I->getType();
-        if (PAL.paramHasAttr(Idx, ParamAttr::ByVal)) {
+        if (PAL.paramHasAttr(Idx, Attribute::ByVal)) {
           ArgTy = cast<PointerType>(ArgTy)->getElementType();
           ByValParams.insert(I);
         }
         printType(FunctionInnards, ArgTy,
-            /*isSigned=*/PAL.paramHasAttr(Idx, ParamAttr::SExt),
+            /*isSigned=*/PAL.paramHasAttr(Idx, Attribute::SExt),
             ArgName);
         PrintedArg = true;
         ++Idx;
@@ -2218,12 +2218,12 @@
     for (; I != E; ++I) {
       if (PrintedArg) FunctionInnards << ", ";
       const Type *ArgTy = *I;
-      if (PAL.paramHasAttr(Idx, ParamAttr::ByVal)) {
+      if (PAL.paramHasAttr(Idx, Attribute::ByVal)) {
         assert(isa<PointerType>(ArgTy));
         ArgTy = cast<PointerType>(ArgTy)->getElementType();
       }
       printType(FunctionInnards, ArgTy,
-             /*isSigned=*/PAL.paramHasAttr(Idx, ParamAttr::SExt));
+             /*isSigned=*/PAL.paramHasAttr(Idx, Attribute::SExt));
       PrintedArg = true;
       ++Idx;
     }
@@ -2251,7 +2251,7 @@
     
   // Print out the return type and the signature built above.
   printType(Out, RetTy, 
-            /*isSigned=*/PAL.paramHasAttr(0, ParamAttr::SExt),
+            /*isSigned=*/PAL.paramHasAttr(0, Attribute::SExt),
             FunctionInnards.str());
 }
 
@@ -2844,7 +2844,7 @@
 
   // If this is a call to a struct-return function, assign to the first
   // parameter instead of passing it to the call.
-  const PAListPtr &PAL = I.getParamAttrs();
+  const AttrListPtr &PAL = I.getAttributes();
   bool hasByVal = I.hasByValArgument();
   bool isStructRet = I.hasStructRetAttr();
   if (isStructRet) {
@@ -2912,11 +2912,11 @@
         (*AI)->getType() != FTy->getParamType(ArgNo)) {
       Out << '(';
       printType(Out, FTy->getParamType(ArgNo), 
-            /*isSigned=*/PAL.paramHasAttr(ArgNo+1, ParamAttr::SExt));
+            /*isSigned=*/PAL.paramHasAttr(ArgNo+1, Attribute::SExt));
       Out << ')';
     }
     // Check if the argument is expected to be passed by value.
-    if (I.paramHasAttr(ArgNo+1, ParamAttr::ByVal))
+    if (I.paramHasAttr(ArgNo+1, Attribute::ByVal))
       writeOperandDeref(*AI);
     else
       writeOperand(*AI);

Modified: llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp?rev=56622&r1=56621&r2=56622&view=diff

==============================================================================
--- llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp (original)
+++ llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp Thu Sep 25 16:00:45 2008
@@ -133,7 +133,7 @@
     std::string getCppName(const Value* val);
     inline void printCppName(const Value* val);
 
-    void printParamAttrs(const PAListPtr &PAL, const std::string &name);
+    void printAttributes(const AttrListPtr &PAL, const std::string &name);
     bool printTypeInternal(const Type* Ty);
     inline void printType(const Type* Ty);
     void printTypes(const Module* M);
@@ -428,46 +428,46 @@
     printEscapedString(getCppName(val));
   }
 
-  void CppWriter::printParamAttrs(const PAListPtr &PAL,
+  void CppWriter::printAttributes(const AttrListPtr &PAL,
                                   const std::string &name) {
-    Out << "PAListPtr " << name << "_PAL;";
+    Out << "AttrListPtr " << name << "_PAL;";
     nl(Out);
     if (!PAL.isEmpty()) {
       Out << '{'; in(); nl(Out);
-      Out << "SmallVector<FnAttributeWithIndex, 4> Attrs;"; nl(Out);
-      Out << "FnAttributeWithIndex PAWI;"; nl(Out);
+      Out << "SmallVector<AttributeWithIndex, 4> Attrs;"; nl(Out);
+      Out << "AttributeWithIndex PAWI;"; nl(Out);
       for (unsigned i = 0; i < PAL.getNumSlots(); ++i) {
         uint16_t index = PAL.getSlot(i).Index;
         Attributes attrs = PAL.getSlot(i).Attrs;
         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";
-        if (attrs & ParamAttr::ByVal)
-          Out << " | ParamAttr::ByVal";
-        if (attrs & ParamAttr::NoAlias)
-          Out << " | ParamAttr::NoAlias";
-        if (attrs & ParamAttr::Nest)
-          Out << " | ParamAttr::Nest";
-        if (attrs & ParamAttr::ReadNone)
-          Out << " | ParamAttr::ReadNone";
-        if (attrs & ParamAttr::ReadOnly)
-          Out << " | ParamAttr::ReadOnly";
+        if (attrs & Attribute::SExt)
+          Out << " | Attribute::SExt";
+        if (attrs & Attribute::ZExt)
+          Out << " | Attribute::ZExt";
+        if (attrs & Attribute::StructRet)
+          Out << " | Attribute::StructRet";
+        if (attrs & Attribute::InReg)
+          Out << " | Attribute::InReg";
+        if (attrs & Attribute::NoReturn)
+          Out << " | Attribute::NoReturn";
+        if (attrs & Attribute::NoUnwind)
+          Out << " | Attribute::NoUnwind";
+        if (attrs & Attribute::ByVal)
+          Out << " | Attribute::ByVal";
+        if (attrs & Attribute::NoAlias)
+          Out << " | Attribute::NoAlias";
+        if (attrs & Attribute::Nest)
+          Out << " | Attribute::Nest";
+        if (attrs & Attribute::ReadNone)
+          Out << " | Attribute::ReadNone";
+        if (attrs & Attribute::ReadOnly)
+          Out << " | Attribute::ReadOnly";
         Out << ";";
         nl(Out);
         Out << "Attrs.push_back(PAWI);";
         nl(Out);
       }
-      Out << name << "_PAL = PAListPtr::get(Attrs.begin(), Attrs.end());";
+      Out << name << "_PAL = AttrListPtr::get(Attrs.begin(), Attrs.end());";
       nl(Out);
       out(); nl(Out);
       Out << '}'; nl(Out);
@@ -1127,8 +1127,8 @@
       nl(Out) << iName << "->setCallingConv(";
       printCallingConv(inv->getCallingConv());
       Out << ");";
-      printParamAttrs(inv->getParamAttrs(), iName);
-      Out << iName << "->setParamAttrs(" << iName << "_PAL);";
+      printAttributes(inv->getAttributes(), iName);
+      Out << iName << "->setAttributes(" << iName << "_PAL);";
       nl(Out);
       break;
     }
@@ -1390,8 +1390,8 @@
       nl(Out) << iName << "->setTailCall("
           << (call->isTailCall() ? "true":"false");
       Out << ");";
-      printParamAttrs(call->getParamAttrs(), iName);
-      Out << iName << "->setParamAttrs(" << iName << "_PAL);";
+      printAttributes(call->getAttributes(), iName);
+      Out << iName << "->setAttributes(" << iName << "_PAL);";
       nl(Out);
       break;
     }
@@ -1614,9 +1614,9 @@
       Out << "}";
       nl(Out);
     }
-    printParamAttrs(F->getParamAttrs(), getCppName(F));
+    printAttributes(F->getAttributes(), getCppName(F));
     printCppName(F);
-    Out << "->setParamAttrs(" << getCppName(F) << "_PAL);";
+    Out << "->setAttributes(" << getCppName(F) << "_PAL);";
     nl(Out);
   }
 

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

==============================================================================
--- llvm/trunk/lib/Target/MSIL/MSILWriter.cpp (original)
+++ llvm/trunk/lib/Target/MSIL/MSILWriter.cpp Thu Sep 25 16:00:45 2008
@@ -1392,7 +1392,7 @@
 
 
 void MSILWriter::printFunction(const Function& F) {
-  bool isSigned = F.paramHasAttr(0, ParamAttr::SExt);
+  bool isSigned = F.paramHasAttr(0, Attribute::SExt);
   Out << "\n.method static ";
   Out << (F.hasInternalLinkage() ? "private " : "public ");
   if (F.isVarArg()) Out << "vararg ";
@@ -1403,7 +1403,7 @@
   unsigned ArgIdx = 1;
   for (Function::const_arg_iterator I = F.arg_begin(), E = F.arg_end(); I!=E;
        ++I, ++ArgIdx) {
-    isSigned = F.paramHasAttr(ArgIdx, ParamAttr::SExt);
+    isSigned = F.paramHasAttr(ArgIdx, Attribute::SExt);
     if (I!=F.arg_begin()) Out << ", ";
     Out << getTypeName(I->getType(),isSigned) << getValueName(I);
   }

Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp?rev=56622&r1=56621&r2=56622&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp Thu Sep 25 16:00:45 2008
@@ -71,7 +71,7 @@
     const Type* Ty = AI->getType();
 
     // 'Dereference' type in case of byval parameter attribute
-    if (F->paramHasAttr(argNum, ParamAttr::ByVal))
+    if (F->paramHasAttr(argNum, Attribute::ByVal))
       Ty = cast<PointerType>(Ty)->getElementType();
 
     // Size should be aligned to DWORD boundary
@@ -154,7 +154,7 @@
   SwitchToSection(TAI->SectionForGlobal(F));
 
   unsigned FnAlign = OptimizeForSize ? 1 : 4;
-  if (!F->isDeclaration() && F->hasNote(FnAttr::OptimizeForSize))
+  if (!F->isDeclaration() && F->hasNote(Attribute::OptimizeForSize))
     FnAlign = 1;
   switch (F->getLinkage()) {
   default: assert(0 && "Unknown linkage type!");

Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp?rev=56622&r1=56621&r2=56622&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp Thu Sep 25 16:00:45 2008
@@ -54,7 +54,7 @@
     const Type* Ty = AI->getType();
 
     // 'Dereference' type in case of byval parameter attribute
-    if (F->paramHasAttr(argNum, ParamAttr::ByVal))
+    if (F->paramHasAttr(argNum, Attribute::ByVal))
       Ty = cast<PointerType>(Ty)->getElementType();
 
     // Size should be aligned to DWORD boundary
@@ -141,7 +141,7 @@
   SwitchToTextSection("_text", F);
 
   unsigned FnAlign = OptimizeForSize ? 1 : 4;
-  if (!F->isDeclaration() && F->hasNote(FnAttr::OptimizeForSize))
+  if (!F->isDeclaration() && F->hasNote(Attribute::OptimizeForSize))
     FnAlign = 1;
   switch (F->getLinkage()) {
   default: assert(0 && "Unsupported linkage type!");

Modified: llvm/trunk/lib/Target/X86/X86FastISel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86FastISel.cpp?rev=56622&r1=56621&r2=56622&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86FastISel.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86FastISel.cpp Thu Sep 25 16:00:45 2008
@@ -898,16 +898,16 @@
       return false;
     ISD::ArgFlagsTy Flags;
     unsigned AttrInd = i - CS.arg_begin() + 1;
-    if (CS.paramHasAttr(AttrInd, ParamAttr::SExt))
+    if (CS.paramHasAttr(AttrInd, Attribute::SExt))
       Flags.setSExt();
-    if (CS.paramHasAttr(AttrInd, ParamAttr::ZExt))
+    if (CS.paramHasAttr(AttrInd, Attribute::ZExt))
       Flags.setZExt();
 
     // FIXME: Only handle *easy* calls for now.
-    if (CS.paramHasAttr(AttrInd, ParamAttr::InReg) ||
-        CS.paramHasAttr(AttrInd, ParamAttr::StructRet) ||
-        CS.paramHasAttr(AttrInd, ParamAttr::Nest) ||
-        CS.paramHasAttr(AttrInd, ParamAttr::ByVal))
+    if (CS.paramHasAttr(AttrInd, Attribute::InReg) ||
+        CS.paramHasAttr(AttrInd, Attribute::StructRet) ||
+        CS.paramHasAttr(AttrInd, Attribute::Nest) ||
+        CS.paramHasAttr(AttrInd, Attribute::ByVal))
       return false;
 
     const Type *ArgTy = (*i)->getType();

Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=56622&r1=56621&r2=56622&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Thu Sep 25 16:00:45 2008
@@ -5757,7 +5757,7 @@
 
       // Check that ECX wasn't needed by an 'inreg' parameter.
       const FunctionType *FTy = Func->getFunctionType();
-      const PAListPtr &Attrs = Func->getParamAttrs();
+      const AttrListPtr &Attrs = Func->getAttributes();
 
       if (!Attrs.isEmpty() && !Func->isVarArg()) {
         unsigned InRegCount = 0;
@@ -5765,7 +5765,7 @@
 
         for (FunctionType::param_iterator I = FTy->param_begin(),
              E = FTy->param_end(); I != E; ++I, ++Idx)
-          if (Attrs.paramHasAttr(Idx, ParamAttr::InReg))
+          if (Attrs.paramHasAttr(Idx, Attribute::InReg))
             // FIXME: should only count parameters that are lowered to integers.
             InRegCount += (TD->getTypeSizeInBits(*I) + 31) / 32;
 

Modified: llvm/trunk/lib/Transforms/IPO/AddReadAttrs.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/AddReadAttrs.cpp?rev=56622&r1=56621&r2=56622&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/AddReadAttrs.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/AddReadAttrs.cpp Thu Sep 25 16:00:45 2008
@@ -105,10 +105,10 @@
     MadeChange = true;
 
     // Clear out any existing attributes.
-    F->removeParamAttr(0, ParamAttr::ReadOnly | ParamAttr::ReadNone);
+    F->removeAttribute(0, Attribute::ReadOnly | Attribute::ReadNone);
 
     // Add in the new attribute.
-    F->addParamAttr(0, ReadsMemory ? ParamAttr::ReadOnly : ParamAttr::ReadNone);
+    F->addAttribute(0, ReadsMemory ? Attribute::ReadOnly : Attribute::ReadNone);
 
     if (ReadsMemory)
       NumReadOnly++;

Modified: llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp?rev=56622&r1=56621&r2=56622&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp Thu Sep 25 16:00:45 2008
@@ -144,7 +144,7 @@
   SmallPtrSet<Argument*, 8> ArgsToPromote;
   SmallPtrSet<Argument*, 8> ByValArgsToTransform;
   for (unsigned i = 0; i != PointerArgs.size(); ++i) {
-    bool isByVal = F->paramHasAttr(PointerArgs[i].second+1, ParamAttr::ByVal);
+    bool isByVal = F->paramHasAttr(PointerArgs[i].second+1, Attribute::ByVal);
 
     // If this is a byval argument, and if the aggregate type is small, just
     // pass the elements, which is always safe.
@@ -501,15 +501,15 @@
   // what the new GEP/Load instructions we are inserting look like.
   std::map<IndicesVector, LoadInst*> OriginalLoads;
 
-  // ParamAttrs - Keep track of the parameter attributes for the arguments
+  // Attributes - 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
-  SmallVector<FnAttributeWithIndex, 8> ParamAttrsVec;
-  const PAListPtr &PAL = F->getParamAttrs();
+  SmallVector<AttributeWithIndex, 8> AttributesVec;
+  const AttrListPtr &PAL = F->getAttributes();
 
   // Add any return attributes.
-  if (Attributes attrs = PAL.getParamAttrs(0))
-    ParamAttrsVec.push_back(FnAttributeWithIndex::get(0, attrs));
+  if (Attributes attrs = PAL.getAttributes(0))
+    AttributesVec.push_back(AttributeWithIndex::get(0, attrs));
 
   // First, determine the new argument list
   unsigned ArgIndex = 1;
@@ -525,8 +525,8 @@
     } else if (!ArgsToPromote.count(I)) {
       // Unchanged argument
       Params.push_back(I->getType());
-      if (Attributes attrs = PAL.getParamAttrs(ArgIndex))
-        ParamAttrsVec.push_back(FnAttributeWithIndex::get(Params.size(), attrs));
+      if (Attributes attrs = PAL.getAttributes(ArgIndex))
+        AttributesVec.push_back(AttributeWithIndex::get(Params.size(), attrs));
     } else if (I->use_empty()) {
       // Dead argument (which are always marked as promotable)
       ++NumArgumentsDead;
@@ -597,8 +597,8 @@
 
   // Recompute the parameter attributes list based on the new arguments for
   // the function.
-  NF->setParamAttrs(PAListPtr::get(ParamAttrsVec.begin(), ParamAttrsVec.end()));
-  ParamAttrsVec.clear();
+  NF->setAttributes(AttrListPtr::get(AttributesVec.begin(), AttributesVec.end()));
+  AttributesVec.clear();
 
   F->getParent()->getFunctionList().insert(F, NF);
   NF->takeName(F);
@@ -618,11 +618,11 @@
   while (!F->use_empty()) {
     CallSite CS = CallSite::get(F->use_back());
     Instruction *Call = CS.getInstruction();
-    const PAListPtr &CallPAL = CS.getParamAttrs();
+    const AttrListPtr &CallPAL = CS.getAttributes();
 
     // Add any return attributes.
-    if (Attributes attrs = CallPAL.getParamAttrs(0))
-      ParamAttrsVec.push_back(FnAttributeWithIndex::get(0, attrs));
+    if (Attributes attrs = CallPAL.getAttributes(0))
+      AttributesVec.push_back(AttributeWithIndex::get(0, attrs));
 
     // Loop over the operands, inserting GEP and loads in the caller as
     // appropriate.
@@ -633,8 +633,8 @@
       if (!ArgsToPromote.count(I) && !ByValArgsToTransform.count(I)) {
         Args.push_back(*AI);          // Unmodified argument
 
-        if (Attributes Attrs = CallPAL.getParamAttrs(ArgIndex))
-          ParamAttrsVec.push_back(FnAttributeWithIndex::get(Args.size(), Attrs));
+        if (Attributes Attrs = CallPAL.getAttributes(ArgIndex))
+          AttributesVec.push_back(AttributeWithIndex::get(Args.size(), Attrs));
 
       } else if (ByValArgsToTransform.count(I)) {
         // Emit a GEP and load for each element of the struct.
@@ -688,8 +688,8 @@
     // Push any varargs arguments on the list
     for (; AI != CS.arg_end(); ++AI, ++ArgIndex) {
       Args.push_back(*AI);
-      if (Attributes Attrs = CallPAL.getParamAttrs(ArgIndex))
-        ParamAttrsVec.push_back(FnAttributeWithIndex::get(Args.size(), Attrs));
+      if (Attributes Attrs = CallPAL.getAttributes(ArgIndex))
+        AttributesVec.push_back(AttributeWithIndex::get(Args.size(), Attrs));
     }
 
     Instruction *New;
@@ -697,18 +697,18 @@
       New = InvokeInst::Create(NF, II->getNormalDest(), II->getUnwindDest(),
                                Args.begin(), Args.end(), "", Call);
       cast<InvokeInst>(New)->setCallingConv(CS.getCallingConv());
-      cast<InvokeInst>(New)->setParamAttrs(PAListPtr::get(ParamAttrsVec.begin(),
-                                                          ParamAttrsVec.end()));
+      cast<InvokeInst>(New)->setAttributes(AttrListPtr::get(AttributesVec.begin(),
+                                                          AttributesVec.end()));
     } else {
       New = CallInst::Create(NF, Args.begin(), Args.end(), "", Call);
       cast<CallInst>(New)->setCallingConv(CS.getCallingConv());
-      cast<CallInst>(New)->setParamAttrs(PAListPtr::get(ParamAttrsVec.begin(),
-                                                        ParamAttrsVec.end()));
+      cast<CallInst>(New)->setAttributes(AttrListPtr::get(AttributesVec.begin(),
+                                                        AttributesVec.end()));
       if (cast<CallInst>(Call)->isTailCall())
         cast<CallInst>(New)->setTailCall();
     }
     Args.clear();
-    ParamAttrsVec.clear();
+    AttributesVec.clear();
 
     // Update the alias analysis implementation to know that we are replacing
     // the old call with a new one.

Modified: llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp?rev=56622&r1=56621&r2=56622&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp Thu Sep 25 16:00:45 2008
@@ -224,12 +224,12 @@
     Args.assign(CS.arg_begin(), CS.arg_begin()+NumArgs);
 
     // Drop any attributes that were on the vararg arguments.
-    PAListPtr PAL = CS.getParamAttrs();
+    AttrListPtr PAL = CS.getAttributes();
     if (!PAL.isEmpty() && PAL.getSlot(PAL.getNumSlots() - 1).Index > NumArgs) {
-      SmallVector<FnAttributeWithIndex, 8> ParamAttrsVec;
+      SmallVector<AttributeWithIndex, 8> AttributesVec;
       for (unsigned i = 0; PAL.getSlot(i).Index <= NumArgs; ++i)
-        ParamAttrsVec.push_back(PAL.getSlot(i));
-      PAL = PAListPtr::get(ParamAttrsVec.begin(), ParamAttrsVec.end());
+        AttributesVec.push_back(PAL.getSlot(i));
+      PAL = AttrListPtr::get(AttributesVec.begin(), AttributesVec.end());
     }
 
     Instruction *New;
@@ -237,11 +237,11 @@
       New = InvokeInst::Create(NF, II->getNormalDest(), II->getUnwindDest(),
                                Args.begin(), Args.end(), "", Call);
       cast<InvokeInst>(New)->setCallingConv(CS.getCallingConv());
-      cast<InvokeInst>(New)->setParamAttrs(PAL);
+      cast<InvokeInst>(New)->setAttributes(PAL);
     } else {
       New = CallInst::Create(NF, Args.begin(), Args.end(), "", Call);
       cast<CallInst>(New)->setCallingConv(CS.getCallingConv());
-      cast<CallInst>(New)->setParamAttrs(PAL);
+      cast<CallInst>(New)->setAttributes(PAL);
       if (cast<CallInst>(Call)->isTailCall())
         cast<CallInst>(New)->setTailCall();
     }
@@ -589,11 +589,11 @@
   std::vector<const Type*> Params;
 
   // Set up to build a new list of parameter attributes.
-  SmallVector<FnAttributeWithIndex, 8> ParamAttrsVec;
-  const PAListPtr &PAL = F->getParamAttrs();
+  SmallVector<AttributeWithIndex, 8> AttributesVec;
+  const AttrListPtr &PAL = F->getAttributes();
 
   // The existing function return attributes.
-  Attributes RAttrs = PAL.getParamAttrs(0);
+  Attributes RAttrs = PAL.getAttributes(0);
 
 
   // Find out the new return value.
@@ -655,13 +655,13 @@
   // here. Currently, this should not be possible, but special handling might be
   // required when new return value attributes are added.
   if (NRetTy == Type::VoidTy)
-    RAttrs &= ~ParamAttr::typeIncompatible(NRetTy);
+    RAttrs &= ~Attribute::typeIncompatible(NRetTy);
   else
-    assert((RAttrs & ParamAttr::typeIncompatible(NRetTy)) == 0 
+    assert((RAttrs & Attribute::typeIncompatible(NRetTy)) == 0 
            && "Return attributes no longer compatible?");
 
   if (RAttrs)
-    ParamAttrsVec.push_back(FnAttributeWithIndex::get(0, RAttrs));
+    AttributesVec.push_back(AttributeWithIndex::get(0, RAttrs));
 
   // Remember which arguments are still alive.
   SmallVector<bool, 10> ArgAlive(FTy->getNumParams(), false);
@@ -678,8 +678,8 @@
 
       // Get the original parameter attributes (skipping the first one, that is
       // for the return value.
-      if (Attributes Attrs = PAL.getParamAttrs(i + 1))
-        ParamAttrsVec.push_back(FnAttributeWithIndex::get(Params.size(), Attrs));
+      if (Attributes Attrs = PAL.getAttributes(i + 1))
+        AttributesVec.push_back(AttributeWithIndex::get(Params.size(), Attrs));
     } else {
       ++NumArgumentsEliminated;
       DOUT << "DAE - Removing argument " << i << " (" << I->getNameStart()
@@ -687,8 +687,8 @@
     }
   }
 
-  // Reconstruct the ParamAttrsList based on the vector we constructed.
-  PAListPtr NewPAL = PAListPtr::get(ParamAttrsVec.begin(), ParamAttrsVec.end());
+  // Reconstruct the AttributesList based on the vector we constructed.
+  AttrListPtr NewPAL = AttrListPtr::get(AttributesVec.begin(), AttributesVec.end());
 
   // Work around LLVM bug PR56: the CWriter cannot emit varargs functions which
   // have zero fixed arguments.
@@ -712,7 +712,7 @@
   // Create the new function body and insert it into the module...
   Function *NF = Function::Create(NFTy, F->getLinkage());
   NF->copyAttributesFrom(F);
-  NF->setParamAttrs(NewPAL);
+  NF->setAttributes(NewPAL);
   // Insert the new function before the old function, so we won't be processing
   // it again.
   F->getParent()->getFunctionList().insert(F, NF);
@@ -726,15 +726,15 @@
     CallSite CS = CallSite::get(F->use_back());
     Instruction *Call = CS.getInstruction();
 
-    ParamAttrsVec.clear();
-    const PAListPtr &CallPAL = CS.getParamAttrs();
+    AttributesVec.clear();
+    const AttrListPtr &CallPAL = CS.getAttributes();
 
     // The call return attributes.
-    Attributes RAttrs = CallPAL.getParamAttrs(0);
+    Attributes RAttrs = CallPAL.getAttributes(0);
     // Adjust in case the function was changed to return void.
-    RAttrs &= ~ParamAttr::typeIncompatible(NF->getReturnType());
+    RAttrs &= ~Attribute::typeIncompatible(NF->getReturnType());
     if (RAttrs)
-      ParamAttrsVec.push_back(FnAttributeWithIndex::get(0, RAttrs));
+      AttributesVec.push_back(AttributeWithIndex::get(0, RAttrs));
 
     // Declare these outside of the loops, so we can reuse them for the second
     // loop, which loops the varargs.
@@ -746,8 +746,8 @@
       if (ArgAlive[i]) {
         Args.push_back(*I);
         // Get original parameter attributes, but skip return attributes.
-        if (Attributes Attrs = CallPAL.getParamAttrs(i + 1))
-          ParamAttrsVec.push_back(FnAttributeWithIndex::get(Args.size(), Attrs));
+        if (Attributes Attrs = CallPAL.getAttributes(i + 1))
+          AttributesVec.push_back(AttributeWithIndex::get(Args.size(), Attrs));
       }
 
     if (ExtraArgHack)
@@ -756,24 +756,24 @@
     // Push any varargs arguments on the list. Don't forget their attributes.
     for (CallSite::arg_iterator E = CS.arg_end(); I != E; ++I, ++i) {
       Args.push_back(*I);
-      if (Attributes Attrs = CallPAL.getParamAttrs(i + 1))
-        ParamAttrsVec.push_back(FnAttributeWithIndex::get(Args.size(), Attrs));
+      if (Attributes Attrs = CallPAL.getAttributes(i + 1))
+        AttributesVec.push_back(AttributeWithIndex::get(Args.size(), Attrs));
     }
 
-    // Reconstruct the ParamAttrsList based on the vector we constructed.
-    PAListPtr NewCallPAL = PAListPtr::get(ParamAttrsVec.begin(),
-                                          ParamAttrsVec.end());
+    // Reconstruct the AttributesList based on the vector we constructed.
+    AttrListPtr NewCallPAL = AttrListPtr::get(AttributesVec.begin(),
+                                          AttributesVec.end());
 
     Instruction *New;
     if (InvokeInst *II = dyn_cast<InvokeInst>(Call)) {
       New = InvokeInst::Create(NF, II->getNormalDest(), II->getUnwindDest(),
                                Args.begin(), Args.end(), "", Call);
       cast<InvokeInst>(New)->setCallingConv(CS.getCallingConv());
-      cast<InvokeInst>(New)->setParamAttrs(NewCallPAL);
+      cast<InvokeInst>(New)->setAttributes(NewCallPAL);
     } else {
       New = CallInst::Create(NF, Args.begin(), Args.end(), "", Call);
       cast<CallInst>(New)->setCallingConv(CS.getCallingConv());
-      cast<CallInst>(New)->setParamAttrs(NewCallPAL);
+      cast<CallInst>(New)->setAttributes(NewCallPAL);
       if (cast<CallInst>(Call)->isTailCall())
         cast<CallInst>(New)->setTailCall();
     }

Modified: llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp?rev=56622&r1=56621&r2=56622&view=diff

======================================================================