Index:        0     |    1        2       3           4
@@ -954,7 +953,7 @@
 
   Chris Lattner

   The LLVM Compiler Infrastructure

-  Last modified: $Date: 2005/01/28 17:22:53 $
+  Last modified: $Date: 2005/02/17 22:22:24 $
 
 
 





From alkis at cs.uiuc.edu  Thu Feb 17 21:19:17 2005
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Thu, 17 Feb 2005 21:19:17 -0600
Subject: [llvm-commits] CVS: llvm-java/lib/Compiler/Compiler.cpp 
Message-ID: <200502180319.VAA29687@zion.cs.uiuc.edu>



Changes in directory llvm-java/lib/Compiler:

Compiler.cpp updated: 1.221 -> 1.222
---
Log message:

Mark static final fields with a static initializer as Constants.


---
Diffs of the changes:  (+14 -5)

 Compiler.cpp |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)


Index: llvm-java/lib/Compiler/Compiler.cpp
diff -u llvm-java/lib/Compiler/Compiler.cpp:1.221 llvm-java/lib/Compiler/Compiler.cpp:1.222

--- llvm-java/lib/Compiler/Compiler.cpp:1.221	Tue Feb 15 19:27:25 2005
+++ llvm-java/lib/Compiler/Compiler.cpp	Thu Feb 17 21:19:06 2005
@@ -1471,17 +1471,26 @@
           Field* field = fields[i];
           if (field->isStatic()) {
             Type* globalTy = getType(field->getDescriptor());
-            ConstantValueAttribute* cv = field->getConstantValueAttribute();
-            llvm::Constant* init = cv ?
-              ConstantExpr::getCast(getConstant(cv->getValue()), globalTy) :
-              llvm::Constant::getNullValue(globalTy);
+            // A java field can be final/constant even if it has a
+            // dynamic initializer. Because LLVM does not currently
+            // support these semantics, we consider constants only
+            // final fields with static initializers.
+            bool isConstant = field->isStatic();
+            llvm::Constant* init;
+            if (ConstantValueAttribute* cv = field->getConstantValueAttribute())
+              init =
+                ConstantExpr::getCast(getConstant(cv->getValue()), globalTy);
+            else {
+              init = llvm::Constant::getNullValue(globalTy);
+              isConstant = false;
+            }
 
             std::string globalName =
               classfile->getThisClass()->getName()->str() + '/' +
               field->getName()->str();
             DEBUG(std::cerr << "Adding global: " << globalName << '\n');
             new GlobalVariable(globalTy,
-                               false,
+                               isConstant,
                                GlobalVariable::ExternalLinkage,
                                init,
                                globalName,





From alkis at cs.uiuc.edu  Thu Feb 17 22:30:03 2005
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Thu, 17 Feb 2005 22:30:03 -0600
Subject: [llvm-commits] 
	CVS: llvm-java/test/Programs/SingleSource/UnitTests/FloatCompare.java
Message-ID: <200502180430.WAA30580@zion.cs.uiuc.edu>



Changes in directory llvm-java/test/Programs/SingleSource/UnitTests:

FloatCompare.java updated: 1.4 -> 1.5
---
Log message:

Improve test case.


---
Diffs of the changes:  (+28 -7)

 FloatCompare.java |   35 ++++++++++++++++++++++++++++-------
 1 files changed, 28 insertions(+), 7 deletions(-)


Index: llvm-java/test/Programs/SingleSource/UnitTests/FloatCompare.java
diff -u llvm-java/test/Programs/SingleSource/UnitTests/FloatCompare.java:1.4 llvm-java/test/Programs/SingleSource/UnitTests/FloatCompare.java:1.5
--- llvm-java/test/Programs/SingleSource/UnitTests/FloatCompare.java:1.4	Sat Dec 11 17:31:49 2004
+++ llvm-java/test/Programs/SingleSource/UnitTests/FloatCompare.java	Thu Feb 17 22:29:50 2005
@@ -1,14 +1,35 @@
 public class FloatCompare
 {
-    public static void main(String[] args) {
-        int count = 0;
+    private static float[] doubles =
+        new float[]{ -1.0f, 0.0f, -0.0f, 1.0f,
+                     Float.NaN,
+                     Float.NEGATIVE_INFINITY,
+                     Float.POSITIVE_INFINITY };
 
-        for (float f = 0.0F; f < 10F; f += 1.1F)
-            ++count;
+    public static void main(String[] args) {
+        int greater = 0;
+        int equal = 0;
+        int less = 0;
+        int unordered = 0;
 
-        for (double d = 100; d > 0; d -= 11)
-            ++count;
+        for (int i = 0; i < doubles.length; ++i) {
+            double a = doubles[i];
+            for (int j = 0; j < doubles.length; ++j) {
+                double b = doubles[j];
+                if (a > b)
+                    ++greater;
+                else if (a < b)
+                    ++less;
+                else if (a == b)
+                    ++equal;
+                else
+                    ++unordered;
+            }
+        }
 
-        Test.println(count);
+        Test.println(greater);
+        Test.println(equal);
+        Test.println(less);
+        Test.println(unordered);
     }
 }





From alkis at cs.uiuc.edu  Thu Feb 17 22:36:31 2005
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Thu, 17 Feb 2005 22:36:31 -0600
Subject: [llvm-commits] CVS: llvm-java/lib/Compiler/Compiler.cpp 
Message-ID: <200502180436.WAA30675@zion.cs.uiuc.edu>



Changes in directory llvm-java/lib/Compiler:

Compiler.cpp updated: 1.222 -> 1.223
---
Log message:

Make code for shifts adhere to the java vm specification (shift
amounts are ended with 0x1f for ints and 0x3f for longs).

Cleanup lcmp, fcmp and dcmp.


---
Diffs of the changes:  (+23 -19)

 Compiler.cpp |   42 +++++++++++++++++++++++-------------------
 1 files changed, 23 insertions(+), 19 deletions(-)


Index: llvm-java/lib/Compiler/Compiler.cpp
diff -u llvm-java/lib/Compiler/Compiler.cpp:1.222 llvm-java/lib/Compiler/Compiler.cpp:1.223
--- llvm-java/lib/Compiler/Compiler.cpp:1.222	Thu Feb 17 21:19:06 2005
+++ llvm-java/lib/Compiler/Compiler.cpp	Thu Feb 17 22:36:21 2005
@@ -52,6 +52,13 @@
 
   const std::string TMP("tmp");
 
+  llvm::Constant* ONE = ConstantSInt::get(Type::IntTy, 1);
+  llvm::Constant* ZERO = ConstantSInt::get(Type::IntTy, 0);
+  llvm::Constant* MINUS_ONE = ConstantSInt::get(Type::IntTy, -1);
+
+  llvm::Constant* INT_SHIFT_MASK = ConstantUInt::get(Type::UByteTy, 0x1f);
+  llvm::Constant* LONG_SHIFT_MASK = ConstantUInt::get(Type::UByteTy, 0x3f);
+
   inline bool isTwoSlotValue(const Value* v) {
     return isTwoSlotType(v->getType());
   }
@@ -1778,17 +1785,21 @@
     void do_lushr() { do_shift_unsigned_common(Type::LongTy); }
 
     void do_shift_unsigned_common(const Type* type) {
+      llvm::Constant* mask =
+        type == Type::IntTy ? INT_SHIFT_MASK : LONG_SHIFT_MASK;
       // Cast value to be shifted into its unsigned version.
       Value* a = pop(Type::UByteTy);
+      a = BinaryOperator::create(Instruction::And, a, mask, TMP, currentBB_);
       Value* v = pop(type->getUnsignedVersion());
       Value* r = new ShiftInst(Instruction::Shr, v, a, TMP, currentBB_);
-      // Cast shifted value back to its original signed version.
-      r = new CastInst(r, type->getSignedVersion(), TMP, currentBB_);
       push(r);
     }
 
     void do_shift_common(Instruction::OtherOps op, const Type* type) {
+      llvm::Constant* mask =
+        type == Type::IntTy ? INT_SHIFT_MASK : LONG_SHIFT_MASK;
       Value* a = pop(Type::UByteTy);
+      a = BinaryOperator::create(Instruction::And, a, mask, TMP, currentBB_);
       Value* v = pop(type);
       Value* r = new ShiftInst(op, v, a, TMP, currentBB_);
       push(r);
@@ -1840,36 +1851,29 @@
       Value* v2 = pop(Type::LongTy);
       Value* v1 = pop(Type::LongTy);
       Value* c = BinaryOperator::createSetGT(v1, v2, TMP, currentBB_);
-      Value* r = new SelectInst(c, ConstantSInt::get(Type::IntTy, 1),
-                                ConstantSInt::get(Type::IntTy, 0), TMP,
-                                currentBB_);
+      Value* r = new SelectInst(c, ONE, ZERO, TMP, currentBB_);
       c = BinaryOperator::createSetLT(v1, v2, TMP, currentBB_);
-      r = new SelectInst(c, ConstantSInt::get(Type::IntTy, -1), r, TMP,
-                         currentBB_);
+      r = new SelectInst(c, MINUS_ONE, r, TMP, currentBB_);
       push(r);
     }
 
-    void do_fcmpl() { do_cmp_common(Type::FloatTy, -1); }
-    void do_dcmpl() { do_cmp_common(Type::DoubleTy, -1); }
-    void do_fcmpg() { do_cmp_common(Type::FloatTy, 1); }
-    void do_dcmpg() { do_cmp_common(Type::DoubleTy, 1); }
+    void do_fcmpl() { do_cmp_common(Type::FloatTy, false); }
+    void do_dcmpl() { do_cmp_common(Type::DoubleTy, false); }
+    void do_fcmpg() { do_cmp_common(Type::FloatTy, true); }
+    void do_dcmpg() { do_cmp_common(Type::DoubleTy, true); }
 
-    void do_cmp_common(const Type* type, int valueIfUnordered) {
+    void do_cmp_common(const Type* type, bool pushOne) {
       Value* v2 = pop(type);
       Value* v1 = pop(type);
       Value* c = BinaryOperator::createSetGT(v1, v2, TMP, currentBB_);
-      Value* r = new SelectInst(c, ConstantSInt::get(Type::IntTy, 1),
-                                ConstantSInt::get(Type::IntTy, 0), TMP,
-                                currentBB_);
+      Value* r = new SelectInst(c, ONE, ZERO, TMP, currentBB_);
       c = BinaryOperator::createSetLT(v1, v2, TMP, currentBB_);
-      r = new SelectInst(c, ConstantSInt::get(Type::IntTy, -1), r, TMP,
-                         currentBB_);
+      r = new SelectInst(c, MINUS_ONE, r, TMP, currentBB_);
       c = new CallInst(module_.getOrInsertFunction
                        ("llvm.isunordered",
                         Type::BoolTy, v1->getType(), v2->getType(), 0),
                        v1, v2, TMP, currentBB_);
-      r = new SelectInst(c, ConstantSInt::get(Type::IntTy, valueIfUnordered),
-                         r, TMP, currentBB_);
+      r = new SelectInst(c, pushOne ? ONE : MINUS_ONE, r, TMP, currentBB_);
       push(r);
     }
 





From jeffc at jolt-lang.org  Fri Feb 18 01:05:28 2005
From: jeffc at jolt-lang.org (Jeff Cohen)
Date: Fri, 18 Feb 2005 01:05:28 -0600
Subject: [llvm-commits] CVS: llvm/lib/System/Win32/Process.inc 
Message-ID: <200502180705.BAA32666@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/Win32:

Process.inc updated: 1.8 -> 1.9
---
Log message:

Make PreventCoreFiles() do the right thing on Windows.

---
Diffs of the changes:  (+6 -3)

 Process.inc |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)


Index: llvm/lib/System/Win32/Process.inc
diff -u llvm/lib/System/Win32/Process.inc:1.8 llvm/lib/System/Win32/Process.inc:1.9
--- llvm/lib/System/Win32/Process.inc:1.8	Sat Jan  8 14:15:57 2005
+++ llvm/lib/System/Win32/Process.inc	Fri Feb 18 01:05:18 2005
@@ -95,9 +95,12 @@
 // their operation. To prevent the disk from filling up, this configuration item
 // does what's necessary to prevent their generation.
 void Process::PreventCoreFiles() {
-  // Windows doesn't do core files, so nothing to do.
-  // Although...  it might be nice to prevent the do-you-want-to-debug
-  // dialog box from coming up.  Or maybe not...
+  // Windows doesn't do core files, but it does do modal pop-up message
+  // boxes.  As this method is used by bugpoint, preventing these pop-ups
+  // is the moral equivalent of suppressing core files.
+  SetErrorMode(SEM_FAILCRITICALERRORS |
+               SEM_NOGPFAULTERRORBOX |
+               SEM_NOOPENFILEERRORBOX);
 }
 
 bool Process::StandardInIsUserInput() {





From lattner at cs.uiuc.edu  Fri Feb 18 09:54:48 2005
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri, 18 Feb 2005 09:54:48 -0600
Subject: [llvm-commits] CVS: llvm-www/header.incl 
Message-ID: <200502181554.j1IFsmP4017268@apoc.cs.uiuc.edu>



Changes in directory llvm-www:

header.incl updated: 1.34 -> 1.35
---
Log message:

Welcome to 2005!  Thanks to Valery Khamenya for pointing this out :)


---
Diffs of the changes:  (+1 -1)

 header.incl |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm-www/header.incl
diff -u llvm-www/header.incl:1.34 llvm-www/header.incl:1.35
--- llvm-www/header.incl:1.34	Mon Feb 14 13:00:15 2005
+++ llvm-www/header.incl	Fri Feb 18 09:54:32 2005
@@ -53,7 +53,7 @@
 Status Updates
 
   
-  February 14, 2004

+  February 14, 2005

   December 9, 2004

   October 11, 2004

   August 13, 2004






From brukman at cs.uiuc.edu  Fri Feb 18 12:01:04 2005
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Fri, 18 Feb 2005 12:01:04 -0600
Subject: [llvm-commits] CVS: llvm/docs/CommandGuide/llvmc.pod 
Message-ID: <200502181801.MAA02493@zion.cs.uiuc.edu>



Changes in directory llvm/docs/CommandGuide:

llvmc.pod updated: 1.6 -> 1.7
---
Log message:

* llvmc does not have a -V switch
* --config-file is really --config-dir, according to `llvmc --help'


---
Diffs of the changes:  (+3 -5)

 llvmc.pod |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)


Index: llvm/docs/CommandGuide/llvmc.pod
diff -u llvm/docs/CommandGuide/llvmc.pod:1.6 llvm/docs/CommandGuide/llvmc.pod:1.7
--- llvm/docs/CommandGuide/llvmc.pod:1.6	Mon Nov 15 14:25:08 2004
+++ llvm/docs/CommandGuide/llvmc.pod	Fri Feb 18 12:00:53 2005
@@ -311,10 +311,9 @@
 
 Print a summary of command line options.
 
-=item B<-V> or B<--version>
+=item B<--version>
 
-This option will cause B to print out its version number
-and terminate.
+This option will cause B to print out its version number and terminate.
 
 =back
 
@@ -345,7 +344,7 @@
 a configuration item on the command line without resorting to changing the
 configuration files. 
 
-=item B<--config-file> F
+=item B<--config-dir> F
 
 This option tells B to read configuration data from the I
 named F. Data from such directories will be read in the order
@@ -361,7 +360,6 @@
 B<--config-only-from> options may be given in which case the directories are
 read in the order given on the command line.
 
-
 =item B<--emit-raw-code>
 
 No optimization is done whatsoever. The compilers invoked by B with 





From reid at x10sys.com  Fri Feb 18 14:00:16 2005
From: reid at x10sys.com (Reid Spencer)
Date: Fri, 18 Feb 2005 14:00:16 -0600
Subject: [llvm-commits] CVS: llvm/tools/llvmc/llvmc.cpp 
Message-ID: <200502182000.OAA04122@zion.cs.uiuc.edu>



Changes in directory llvm/tools/llvmc:

llvmc.cpp updated: 1.22 -> 1.23
---
Log message:

Adjust the help output so that it will fit cleanly within 80 columns.


---
Diffs of the changes:  (+17 -17)

 llvmc.cpp |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)


Index: llvm/tools/llvmc/llvmc.cpp
diff -u llvm/tools/llvmc/llvmc.cpp:1.22 llvm/tools/llvmc/llvmc.cpp:1.23
--- llvm/tools/llvmc/llvmc.cpp:1.22	Wed Dec 29 23:36:08 2004
+++ llvm/tools/llvmc/llvmc.cpp	Fri Feb 18 14:00:05 2005
@@ -101,50 +101,50 @@
 
 cl::list fOpts("f", cl::ZeroOrMore, cl::Prefix,
   cl::desc("Pass through -f options to compiler tools"),
-  cl::value_desc("optimization option"));
+  cl::value_desc("option"));
 
 cl::list MOpts("M", cl::ZeroOrMore, cl::Prefix,
   cl::desc("Pass through -M options to compiler tools"),
-  cl::value_desc("dependency option"));
+  cl::value_desc("option"));
 
 cl::list WOpts("W", cl::ZeroOrMore, cl::Prefix,
   cl::desc("Pass through -W options to compiler tools"),
-  cl::value_desc("warnings category"));
+  cl::value_desc("option"));
 
 cl::list BOpt("B", cl::ZeroOrMore, cl::Prefix, 
-  cl::desc("Indicate where llvmc sub-tools are installed"),
-  cl::value_desc("directory path containing bin and lib directories"));
+  cl::desc("Specify path to find llvmc sub-tools"),
+  cl::value_desc("dir"));
 
 //===------------------------------------------------------------------------===
 //===          INPUT OPTIONS
 //===------------------------------------------------------------------------===
 
 cl::list LibPaths("L", cl::Prefix,
-  cl::desc("Specify a library search path"), cl::value_desc("directory"));
+  cl::desc("Specify a library search path"), cl::value_desc("dir"));
 
 cl::list Libraries("l", cl::Prefix,
-  cl::desc("Specify libraries to link to"), cl::value_desc("library prefix"));
+  cl::desc("Specify base name of libraries to link to"), cl::value_desc("lib"));
 
 cl::list Includes("I", cl::Prefix,
   cl::desc("Specify location to search for included source"), 
-  cl::value_desc("include directory"));
+  cl::value_desc("dir"));
 
 cl::list Defines("D", cl::Prefix,
-  cl::desc("Specify a symbol to define for source configuration"),
-  cl::value_desc("symbol definition"));
+  cl::desc("Specify a pre-processor symbol to define"),
+  cl::value_desc("symbol"));
 
 //===------------------------------------------------------------------------===
 //===          OUTPUT OPTIONS
 //===------------------------------------------------------------------------===
 
 cl::opt OutputFilename("o", 
-  cl::desc("Override output filename"), cl::value_desc("filename"));
+  cl::desc("Override output filename"), cl::value_desc("file"));
 
 cl::opt OutputMachine("m", cl::Prefix,
   cl::desc("Specify a target machine"), cl::value_desc("machine"));
 
 cl::opt Native("native", cl::init(false),
-  cl::desc("Generative native object and executables instead of bytecode"));
+  cl::desc("Generative native code instead of bytecode"));
 
 cl::opt DebugOutput("g", cl::init(false),
   cl::desc("Generate objects that include debug symbols"));
@@ -152,8 +152,8 @@
 cl::opt StripOutput("strip", cl::init(false),
   cl::desc("Strip all symbols from linked output file"));
 
-cl::opt PrintFileName("print-file-name", cl::Optional,
-  cl::value_desc("filename"),
+cl::opt PrintFileName("print-fname", cl::Optional,
+  cl::value_desc("file"),
   cl::desc("Print the full path for the option's value"));
 
 //===------------------------------------------------------------------------===
@@ -189,8 +189,8 @@
 //===------------------------------------------------------------------------===
 
 static cl::opt ConfigDir("config-dir", cl::Optional,
-  cl::desc("Specify a configuration directory to override defaults"),
-  cl::value_desc("directory"));
+  cl::desc("Specify configuration directory to override defaults"),
+  cl::value_desc("dir"));
 
 static cl::opt EmitRawCode("emit-raw-code", cl::Hidden, cl::Optional,
   cl::desc("Emit raw, unoptimized code"));
@@ -199,7 +199,7 @@
   cl::desc("Invoke sub-commands by linking input/output with pipes"));
 
 static cl::opt KeepTemps("keep-temps", cl::Optional,
-  cl::desc("Don't delete the temporary files created during compilation"));
+  cl::desc("Don't delete temporary files created by llvmc"));
 
 //===------------------------------------------------------------------------===
 //===          POSITIONAL OPTIONS





From lattner at cs.uiuc.edu  Fri Feb 18 14:17:55 2005
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri, 18 Feb 2005 14:17:55 -0600
Subject: [llvm-commits] CVS: llvm/test/Makefile 
Message-ID: <200502182017.OAA04334@zion.cs.uiuc.edu>



Changes in directory llvm/test:

Makefile updated: 1.80 -> 1.81
---
Log message:

Allow dejagnu tests to run on Windows/Cygwin. Quote the value of the PATH
variable so that spaces don't screw it up.


---
Diffs of the changes:  (+1 -1)

 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/test/Makefile
diff -u llvm/test/Makefile:1.80 llvm/test/Makefile:1.81
--- llvm/test/Makefile:1.80	Sun Jan  2 22:05:32 2005
+++ llvm/test/Makefile	Fri Feb 18 14:17:44 2005
@@ -28,7 +28,7 @@
 endif
 
 check-local:: site.exp
-	PATH=$(LLVMToolDir):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH) \
+	PATH="$(LLVMToolDir):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH)" \
 	$(RUNTEST) $(RUNTESTFLAGS)
 
 clean::





From reid at x10sys.com  Fri Feb 18 14:24:20 2005
From: reid at x10sys.com (Reid Spencer)
Date: Fri, 18 Feb 2005 14:24:20 -0600
Subject: [llvm-commits] CVS: llvm/test/Makefile.tests 
Message-ID: <200502182024.OAA04411@zion.cs.uiuc.edu>



Changes in directory llvm/test:

Makefile.tests updated: 1.91 -> 1.92
---
Log message:

Quote the value of the PATH variable so that Cygwin and Windows can have
spaces in path names and not confuse the shell.


---
Diffs of the changes:  (+1 -1)

 Makefile.tests |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/test/Makefile.tests
diff -u llvm/test/Makefile.tests:1.91 llvm/test/Makefile.tests:1.92
--- llvm/test/Makefile.tests:1.91	Thu Dec 23 21:44:24 2004
+++ llvm/test/Makefile.tests	Fri Feb 18 14:24:09 2005
@@ -39,7 +39,7 @@
 LLCFLAGS =
 FAILURE  = $(LLVM_SRC_ROOT)/test/Failure.sh
 TESTRUNR = @echo Running test: $<; \
-             PATH=$(LLVMTOOLCURRENT):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH) \
+             PATH="$(LLVMTOOLCURRENT):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH)" \
                   $(LLVM_SRC_ROOT)/test/TestRunner.sh
 
 LLCLIBS := $(LLCLIBS) -lm





From lattner at cs.uiuc.edu  Fri Feb 18 17:07:14 2005
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri, 18 Feb 2005 17:07:14 -0600
Subject: [llvm-commits] CVS: llvm-gcc/gcc/cp/search.c 
Message-ID: <200502182307.j1IN7Es6020340@apoc.cs.uiuc.edu>



Changes in directory llvm-gcc/gcc/cp:

search.c updated: 1.2 -> 1.3
---
Log message:

Patch to fix PR516: http://llvm.cs.uiuc.edu/PR516 , thanks to Adam Treat for figuring this one out!!



---
Diffs of the changes:  (+3 -2)

 search.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


Index: llvm-gcc/gcc/cp/search.c
diff -u llvm-gcc/gcc/cp/search.c:1.2 llvm-gcc/gcc/cp/search.c:1.3
--- llvm-gcc/gcc/cp/search.c:1.2	Fri Jan  9 10:54:32 2004
+++ llvm-gcc/gcc/cp/search.c	Fri Feb 18 17:06:58 2005
@@ -855,8 +855,9 @@
     return 0;
 
   for (t = befriending_classes; t; t = TREE_CHAIN (t))
-    if (protected_accessible_p (decl, TREE_VALUE (t), binfo))
-      return 1;
+    if ( TREE_CODE (t) != FUNCTION_DECL )
+      if (protected_accessible_p (decl, TREE_VALUE (t), binfo))
+        return 1;
 
   /* Nested classes are implicitly friends of their enclosing types, as
      per core issue 45 (this is a change from the standard).  */





From lattner at cs.uiuc.edu  Fri Feb 18 20:22:30 2005
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri, 18 Feb 2005 20:22:30 -0600
Subject: [llvm-commits] CVS: llvm/docs/LangRef.html 
Message-ID: <200502190222.j1J2MUuO020996@apoc.cs.uiuc.edu>



Changes in directory llvm/docs:

LangRef.html updated: 1.84 -> 1.85
---
Log message:

Fix a bug.


---
Diffs of the changes:  (+2 -2)

 LangRef.html |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm/docs/LangRef.html
diff -u llvm/docs/LangRef.html:1.84 llvm/docs/LangRef.html:1.85
--- llvm/docs/LangRef.html:1.84	Sat Feb 12 13:30:21 2005
+++ llvm/docs/LangRef.html	Fri Feb 18 20:22:14 2005
@@ -738,7 +738,7 @@
       A pointer to array of
       four int values

       A pointer to a function that takes an int, returning an
+      href="#t_function">function that takes an int*, returning an
       int.

     
   
@@ -2924,7 +2924,7 @@
 
   Chris Lattner

   The LLVM Compiler Infrastructure

-  Last modified: $Date: 2005/02/12 19:30:21 $
+  Last modified: $Date: 2005/02/19 02:22:14 $
 
 
 





From jeffc at jolt-lang.org  Fri Feb 18 21:01:25 2005
From: jeffc at jolt-lang.org (Jeff Cohen)
Date: Fri, 18 Feb 2005 21:01:25 -0600
Subject: [llvm-commits] CVS: llvm/lib/System/Win32/DynamicLibrary.inc
	Process.inc Signals.inc TimeValue.inc 
Message-ID: <200502190301.VAA13493@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/Win32:

DynamicLibrary.inc updated: 1.9 -> 1.10
Process.inc updated: 1.9 -> 1.10
Signals.inc updated: 1.12 -> 1.13
TimeValue.inc updated: 1.7 -> 1.8
---
Log message:

Change __MINGW to __MINGW32__.  Patch submitted by Henrik Bach.


---
Diffs of the changes:  (+4 -4)

 DynamicLibrary.inc |    2 +-
 Process.inc        |    2 +-
 Signals.inc        |    2 +-
 TimeValue.inc      |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm/lib/System/Win32/DynamicLibrary.inc
diff -u llvm/lib/System/Win32/DynamicLibrary.inc:1.9 llvm/lib/System/Win32/DynamicLibrary.inc:1.10
--- llvm/lib/System/Win32/DynamicLibrary.inc:1.9	Wed Dec 29 21:02:31 2004
+++ llvm/lib/System/Win32/DynamicLibrary.inc	Fri Feb 18 21:01:13 2005
@@ -13,7 +13,7 @@
 
 #include "Win32.h"
 
-#ifdef __MINGW
+#ifdef __MINGW32__
 #include 
 #else
 #include 


Index: llvm/lib/System/Win32/Process.inc
diff -u llvm/lib/System/Win32/Process.inc:1.9 llvm/lib/System/Win32/Process.inc:1.10
--- llvm/lib/System/Win32/Process.inc:1.9	Fri Feb 18 01:05:18 2005
+++ llvm/lib/System/Win32/Process.inc	Fri Feb 18 21:01:13 2005
@@ -23,7 +23,7 @@
 //===          and must not be UNIX code
 //===----------------------------------------------------------------------===//
 
-#ifdef __MINGW
+#ifdef __MINGW32__
 // This ban should be lifted when MinGW 1.0+ has defined this value.
 #  define _HEAPOK (-2)
 #endif


Index: llvm/lib/System/Win32/Signals.inc
diff -u llvm/lib/System/Win32/Signals.inc:1.12 llvm/lib/System/Win32/Signals.inc:1.13
--- llvm/lib/System/Win32/Signals.inc:1.12	Tue Nov 16 00:59:53 2004
+++ llvm/lib/System/Win32/Signals.inc	Fri Feb 18 21:01:13 2005
@@ -15,7 +15,7 @@
 #include 
 #include 
 
-#ifdef __MINGW
+#ifdef __MINGW32__
 #include 
 #else
 #include 


Index: llvm/lib/System/Win32/TimeValue.inc
diff -u llvm/lib/System/Win32/TimeValue.inc:1.7 llvm/lib/System/Win32/TimeValue.inc:1.8
--- llvm/lib/System/Win32/TimeValue.inc:1.7	Wed Dec 15 22:06:56 2004
+++ llvm/lib/System/Win32/TimeValue.inc	Fri Feb 18 21:01:13 2005
@@ -31,7 +31,7 @@
 }
 
 std::string TimeValue::toString() const {
-#ifdef __MINGW
+#ifdef __MINGW32__
   // This ban may be lifted by either:
   // (i) a future MinGW version other than 1.0 inherents the __time64_t type, or
   // (ii) configure tests for either the time_t or __time64_t type.





From jeffc at jolt-lang.org  Fri Feb 18 21:01:25 2005
From: jeffc at jolt-lang.org (Jeff Cohen)
Date: Fri, 18 Feb 2005 21:01:25 -0600
Subject: [llvm-commits] CVS: llvm/include/llvm/Config/alloca.h 
Message-ID: <200502190301.VAA13483@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Config:

alloca.h updated: 1.8 -> 1.9
---
Log message:

Change __MINGW to __MINGW32__.  Patch submitted by Henrik Bach.


---
Diffs of the changes:  (+1 -1)

 alloca.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/include/llvm/Config/alloca.h
diff -u llvm/include/llvm/Config/alloca.h:1.8 llvm/include/llvm/Config/alloca.h:1.9
--- llvm/include/llvm/Config/alloca.h:1.8	Tue Nov  2 11:31:02 2004
+++ llvm/include/llvm/Config/alloca.h	Fri Feb 18 21:01:13 2005
@@ -28,7 +28,7 @@
 #define alloca _alloca
 #elif defined(HAVE_ALLOCA_H)
 #include 
-#elif defined(__MINGW) && defined(HAVE_MALLOC_H)
+#elif defined(__MINGW32__) && defined(HAVE_MALLOC_H)
 #include 
 #elif !defined(__GNUC__)
 #	ifdef _AIX





From lattner at cs.uiuc.edu  Sat Feb 19 00:54:59 2005
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat, 19 Feb 2005 00:54:59 -0600
Subject: [llvm-commits] 
	CVS: llvm/test/Regression/C++Frontend/2005-02-19-BitfieldStructCrash.cpp
Message-ID: <200502190654.j1J6sx2F024386@apoc.cs.uiuc.edu>



Changes in directory llvm/test/Regression/C++Frontend:

2005-02-19-BitfieldStructCrash.cpp added (r1.1)
---
Log message:

new testcase.


---
Diffs of the changes:  (+11 -0)

 2005-02-19-BitfieldStructCrash.cpp |   11 +++++++++++
 1 files changed, 11 insertions(+)


Index: llvm/test/Regression/C++Frontend/2005-02-19-BitfieldStructCrash.cpp
diff -c /dev/null llvm/test/Regression/C++Frontend/2005-02-19-BitfieldStructCrash.cpp:1.1
*** /dev/null	Sat Feb 19 00:54:54 2005
--- llvm/test/Regression/C++Frontend/2005-02-19-BitfieldStructCrash.cpp	Sat Feb 19 00:54:44 2005
***************
*** 0 ****
--- 1,11 ----
+ // RUN: %llvmgxx -S %s -o -
+ 
+ struct QChar {unsigned short X; QChar(unsigned short); } ;
+ 
+ struct Command {
+         Command(QChar c) : c(c) {}
+         unsigned int type : 4;
+         QChar c;
+     };
+ 
+ Command X(QChar('c'));





From lattner at cs.uiuc.edu  Sat Feb 19 00:56:59 2005
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat, 19 Feb 2005 00:56:59 -0600
Subject: [llvm-commits] 
	CVS: llvm/test/Regression/C++Frontend/2005-02-19-BitfieldStructCrash.cpp
Message-ID: <200502190656.j1J6ux8E024431@apoc.cs.uiuc.edu>



Changes in directory llvm/test/Regression/C++Frontend:

2005-02-19-BitfieldStructCrash.cpp updated: 1.1 -> 1.2
---
Log message:

Make this testcase harder, to test the read case as well.


---
Diffs of the changes:  (+3 -0)

 2005-02-19-BitfieldStructCrash.cpp |    3 +++
 1 files changed, 3 insertions(+)


Index: llvm/test/Regression/C++Frontend/2005-02-19-BitfieldStructCrash.cpp
diff -u llvm/test/Regression/C++Frontend/2005-02-19-BitfieldStructCrash.cpp:1.1 llvm/test/Regression/C++Frontend/2005-02-19-BitfieldStructCrash.cpp:1.2
--- llvm/test/Regression/C++Frontend/2005-02-19-BitfieldStructCrash.cpp:1.1	Sat Feb 19 00:54:44 2005
+++ llvm/test/Regression/C++Frontend/2005-02-19-BitfieldStructCrash.cpp	Sat Feb 19 00:56:46 2005
@@ -9,3 +9,6 @@
     };
 
 Command X(QChar('c'));
+
+void Foo(QChar );
+void bar() { Foo(X.c); }





From lattner at cs.uiuc.edu  Sat Feb 19 01:27:00 2005
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat, 19 Feb 2005 01:27:00 -0600
Subject: [llvm-commits] CVS: llvm-gcc/gcc/llvm-expand.c 
Message-ID: <200502190727.j1J7R0lD025649@apoc.cs.uiuc.edu>



Changes in directory llvm-gcc/gcc:

llvm-expand.c updated: 1.82 -> 1.83
---
Log message:

Fix PR517: http://llvm.cs.uiuc.edu/PR517  and Regression/C++Frontend/2005-02-19-BitfieldStructCrash.cpp

Apparently the GCC IR allows 'X = Y' where X can be an aggregate, and Y is
a bitfield reference.  It also allows X to be a bitfield and Y to be an
aggregate.  No, there is no such thing in C as a aggregate bitfield.



---
Diffs of the changes:  (+81 -18)

 llvm-expand.c |   99 +++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 81 insertions(+), 18 deletions(-)


Index: llvm-gcc/gcc/llvm-expand.c
diff -u llvm-gcc/gcc/llvm-expand.c:1.82 llvm-gcc/gcc/llvm-expand.c:1.83
--- llvm-gcc/gcc/llvm-expand.c:1.82	Tue Feb 15 00:59:52 2005
+++ llvm-gcc/gcc/llvm-expand.c	Sat Feb 19 01:26:44 2005
@@ -2906,29 +2906,62 @@
 static void llvm_store_expr(llvm_function *Fn, tree From, llvm_value *Dest,
                             llvm_value **CompVal, unsigned BitStart,
                             unsigned BitSize, int isVolatile) {
+  llvm_type *SrcType = llvm_type_get_from_tree(TREE_TYPE(From));
   llvm_type *ResultType = GET_POINTER_TYPE_ELEMENT(Dest->Ty);
-  if (!llvm_type_is_composite(ResultType)) {
-    llvm_value *Val = llvm_expand_expr(Fn, From, 0);
-    
-    /* If expand was not able to provide the correct type, cast now */
-    Val = cast_if_type_not_equal(Fn, Val, ResultType);
-    if (CompVal) *CompVal = Val;
-    
-    /* Copy the value computed into the destination.  If this is not a bitfield,
-     * this is just a store, otherwise we need to emit a load, some masking,
-     * then a store.
+  llvm_value *Val = 0;
+
+  if (llvm_type_is_composite(SrcType)) {
+    llvm_value *TmpLoc;
+
+    /* If this isn't a bitfield reference, expand the value directly into the
+     * destination.
      */
-    Val = WriteBitField(Fn, Val, Dest, BitStart, BitSize, isVolatile);
+    if (BitSize == 0) {
+      /* Expand the RHS into the appropriate location directly. */
+      llvm_value *Val = llvm_expand_expr(Fn, From, Dest);
+      if (CompVal) *CompVal = 0;
+      assert(Val == 0 && "Structure value returned a value??");
+      return;
+    }
+
+    /* Otherwise, expand into a temporary location.  This must be an aggregate
+     * with one element.
+     */
+    TmpLoc = D2V(make_temporary_alloca(Fn, SrcType));
+    Val = llvm_expand_expr(Fn, From, TmpLoc);
+    assert(Val == 0 && "Structure value returned a value??");
 
-    append_inst(Fn, create_store_inst(Val, Dest, isVolatile));
+    /* This may be something like {{{{int}}}}, unwrap it. */
+    while (llvm_type_is_composite(SrcType)) {
+      assert(SrcType->ID == StructTyID && SrcType->NumElements == 1 &&
+             "Not a single element!?");
+      TmpLoc = append_inst(Fn, create_gep3(TmpLoc, llvm_constant_uint_0,
+                                           llvm_constant_uint_0));
+      SrcType = SrcType->Elements[0];
+    }
+    Val = append_inst(Fn, create_load_inst("aggel", TmpLoc, 0));
 
+    /* If the element is not exactly the right type, convert it now. */
+    Val = cast_if_type_not_equal(Fn, Val, ResultType);
   } else {
-    /* Expand the RHS into the appropriate location directly. */
-    llvm_value *Val = llvm_expand_expr(Fn, From, Dest);
-    if (CompVal) *CompVal = 0;
-    assert(Val == 0 && "Structure value returned a value??");
-    assert(!BitSize && "Store of aggregate into a bitfield??");
+    /* Simple scalar value, common case. */
+    Val = llvm_expand_expr(Fn, From, 0);
+
+    /* If expand was not able to provide the correct type, cast now */
+    Val = cast_if_type_not_equal(Fn, Val, ResultType);
+    if (CompVal) *CompVal = Val;
   }
+
+  assert(!llvm_type_is_composite(ResultType) &&
+         "Storing a scalar or bitfield value into a composite value?");
+    
+  /* Copy the value computed into the destination.  If this is not a bitfield,
+   * this is just a store, otherwise we need to emit a load, some masking,
+   * then a store.
+   */
+  Val = WriteBitField(Fn, Val, Dest, BitStart, BitSize, isVolatile);
+  
+  append_inst(Fn, create_store_inst(Val, Dest, isVolatile));
 }
 
 
@@ -5933,7 +5966,8 @@
       unsigned BitStart = 0, BitSize = 0;
       op0 = llvm_expand_lvalue_expr(Fn, exp, &BitStart, &BitSize);
 
-      if (!isDestTyComposite) {  /* Return a normal scalar by loading it */
+      /* Return a normal scalar by loading it. */
+      if (!llvm_type_is_composite(GET_POINTER_TYPE_ELEMENT(op0->Ty))) {
         unsigned ResultBitSize;
         Result = append_inst(Fn, create_load_inst("tmp", op0, expVolatile));
 
@@ -5953,6 +5987,35 @@
          */
         Result = ReadBitField(Fn, Result, BitStart, BitSize);
 
+        /* WIERDNESS: G++ allows loading from a bitfield and storing into an
+         * aggregate.  For example, the aggregate may have type "{ushort}", and
+         * the lvalue might be of type "int*" with some bit offset/size.  The
+         * bitfieldness has already been taken care of, we just check to see if
+         * we need to store to the aggregate location now.
+         */
+        if (isDestTyComposite) {
+          /* The destination can only be a single element structure.  We handle
+           * {{{uint}}} for generality.
+           */
+          while (llvm_type_is_composite(GET_POINTER_TYPE_ELEMENT(DestLoc->Ty))){
+            llvm_type *ElTy = GET_POINTER_TYPE_ELEMENT(DestLoc->Ty);
+            assert(ElTy->ID == StructTyID && ElTy->NumElements == 1 &&
+                   "Bitfield store to non-single-element aggregate!");
+            DestLoc = append_inst(Fn, create_gep3(DestLoc,
+                                                  llvm_constant_intptr_0,
+                                                  llvm_constant_uint_0));
+          }
+
+          /* If the source isn't the exact type needed for the store, make it so
+           * now.
+           */
+          Result =cast_if_type_not_equal(Fn, Result,
+                                         GET_POINTER_TYPE_ELEMENT(DestLoc->Ty));
+          /* Finally, do the store into the aggregate. */
+          append_inst(Fn, create_store_inst(Result, DestLoc, 0));
+          Result = 0;
+        }
+
       } else if (DestLoc) {              /* Generating structure, using value */
         unsigned Align = TYPE_ALIGN(TREE_TYPE(exp))/8;
         assert(BitSize == 0 && "Invalid bitfield read of composite value!");





From lattner at cs.uiuc.edu  Sat Feb 19 01:29:41 2005
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat, 19 Feb 2005 01:29:41 -0600
Subject: [llvm-commits] CVS: llvm/docs/ReleaseNotes.html 
Message-ID: <200502190729.j1J7TflK025683@apoc.cs.uiuc.edu>



Changes in directory llvm/docs:

ReleaseNotes.html updated: 1.298 -> 1.299
---
Log message:

Bug fixed.


---
Diffs of the changes:  (+3 -1)

 ReleaseNotes.html |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)


Index: llvm/docs/ReleaseNotes.html
diff -u llvm/docs/ReleaseNotes.html:1.298 llvm/docs/ReleaseNotes.html:1.299
--- llvm/docs/ReleaseNotes.html:1.298	Tue Feb 15 01:02:12 2005
+++ llvm/docs/ReleaseNotes.html	Sat Feb 19 01:29:25 2005
@@ -164,6 +164,8 @@
        miscalculated for some structure fields following bit fields
    [llvm-g++] Temporary lifetimes 
        incorrect for short circuit logical operations
+   [llvm-gcc] Crash compiling 
+       bitfield <-> aggregate assignment
 
 
 
@@ -585,7 +587,7 @@
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!" />
 
   The LLVM Compiler Infrastructure

-  Last modified: $Date: 2005/02/15 07:02:12 $
+  Last modified: $Date: 2005/02/19 07:29:25 $
 
 
 





From lattner at cs.uiuc.edu  Sat Feb 19 01:32:08 2005
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat, 19 Feb 2005 01:32:08 -0600
Subject: [llvm-commits] 
	CVS: llvm/test/Regression/C++Frontend/2005-01-03-StaticInitializers.cpp
Message-ID: <200502190732.j1J7W8KS025739@apoc.cs.uiuc.edu>



Changes in directory llvm/test/Regression/C++Frontend:

2005-01-03-StaticInitializers.cpp updated: 1.1 -> 1.2
---
Log message:

Adjust this test to pass after recent CFE changes.  We now generate:

%XX = global int cast (int* getelementptr ([2 x int]* getelementptr (%struct.S* null, int 0, uint 0), int 0, int 1) to int)

which is the literal translation of the testcase :)


---
Diffs of the changes:  (+1 -1)

 2005-01-03-StaticInitializers.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/test/Regression/C++Frontend/2005-01-03-StaticInitializers.cpp
diff -u llvm/test/Regression/C++Frontend/2005-01-03-StaticInitializers.cpp:1.1 llvm/test/Regression/C++Frontend/2005-01-03-StaticInitializers.cpp:1.2
--- llvm/test/Regression/C++Frontend/2005-01-03-StaticInitializers.cpp:1.1	Mon Jan  3 16:27:58 2005
+++ llvm/test/Regression/C++Frontend/2005-01-03-StaticInitializers.cpp	Sat Feb 19 01:31:54 2005
@@ -1,4 +1,4 @@
-// RUN: %llvmgxx %s -S -o - | grep '%XX = global int 4'
+// RUN: %llvmgxx %s -S -o - | not grep 'llvm.global_ctor'
 
 struct S {
   int  A[2];





From lattner at cs.uiuc.edu  Sat Feb 19 11:08:05 2005
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat, 19 Feb 2005 11:08:05 -0600
Subject: [llvm-commits] 
	CVS: llvm/test/Regression/C++Frontend/2005-02-19-UnnamedVirtualThunkArgument.cpp
Message-ID: <200502191708.j1JH84Lt007055@apoc.cs.uiuc.edu>



Changes in directory llvm/test/Regression/C++Frontend:

2005-02-19-UnnamedVirtualThunkArgument.cpp added (r1.1)
---
Log message:

Testcase for PR520: http://llvm.cs.uiuc.edu/PR520 


---
Diffs of the changes:  (+22 -0)

 2005-02-19-UnnamedVirtualThunkArgument.cpp |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+)


Index: llvm/test/Regression/C++Frontend/2005-02-19-UnnamedVirtualThunkArgument.cpp
diff -c /dev/null llvm/test/Regression/C++Frontend/2005-02-19-UnnamedVirtualThunkArgument.cpp:1.1
*** /dev/null	Sat Feb 19 11:07:59 2005
--- llvm/test/Regression/C++Frontend/2005-02-19-UnnamedVirtualThunkArgument.cpp	Sat Feb 19 11:07:48 2005
***************
*** 0 ****
--- 1,22 ----
+ // RUN: %llvmgxx -S %s -o /dev/null
+ 
+ struct Foo  {  
+     Foo();  
+     virtual ~Foo();  
+ };  
+   
+ struct Bar  {  
+     Bar();  
+     virtual ~Bar();  
+     virtual bool test(bool) const;  
+ };  
+   
+ struct Baz : public Foo, public Bar  {  
+     Baz();  
+     virtual ~Baz();  
+     virtual bool test(bool) const;  
+ };  
+   
+ bool Baz::test(bool) const  {  
+     return true;  
+ }  





From lattner at cs.uiuc.edu  Sat Feb 19 11:10:33 2005
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat, 19 Feb 2005 11:10:33 -0600
Subject: [llvm-commits] CVS: llvm-gcc/gcc/llvm-expand.c 
Message-ID: <200502191710.j1JHAXmS007072@apoc.cs.uiuc.edu>



Changes in directory llvm-gcc/gcc:

llvm-expand.c updated: 1.83 -> 1.84
---
Log message:

Make sure to give all arguments DECL_LLVM values even if they are unnamed.
Unnamed arguments cannot be referenced by the programmer, but they can
be referenced by compiler generated methods, like virtual function thunks.

Many MANY thanks to Adam Treat for coming up with 90% of this patch!

This fixes PR520: http://llvm.cs.uiuc.edu/PR520  and 
test/Regression/CC++Frontend/2005-02-19-UnnamedVirtualThunkArgument.cpp


---
Diffs of the changes:  (+14 -8)

 llvm-expand.c |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)


Index: llvm-gcc/gcc/llvm-expand.c
diff -u llvm-gcc/gcc/llvm-expand.c:1.83 llvm-gcc/gcc/llvm-expand.c:1.84
--- llvm-gcc/gcc/llvm-expand.c:1.83	Sat Feb 19 01:26:44 2005
+++ llvm-gcc/gcc/llvm-expand.c	Sat Feb 19 11:10:19 2005
@@ -5346,7 +5346,7 @@
   case PARM_DECL:
     if (!DECL_LLVM_SET_P (exp)) {
       error ("%Hprior parameter's size depends on '%D'",
-             &DECL_SOURCE_LOCATION (exp), exp);
+	      &DECL_SOURCE_LOCATION (exp), exp);
       return llvm_constant_VoidPtr_null;
     }
     /* ... fall through ...  */
@@ -7009,17 +7009,21 @@
       llvm_type *Ty = llvm_type_get_from_tree(TREE_TYPE(Args));
       int isLValue = 0;
 
+      if (DECL_NAME(Args)) Name = IDENTIFIER_POINTER(DECL_NAME(Args));
+
       if (isPassedByInvisibleReference(TREE_TYPE(Args))) {
         Ty = llvm_type_get_pointer(Ty);
         isLValue = 1;
-      }
-
-      if (DECL_NAME(Args)) Name = IDENTIFIER_POINTER(DECL_NAME(Args));
-      if (Name[0] && !isLValue) {   /* Only create values for named arguments */
+      } else {
         /* Add a suffix for the stack slot */
         char NameBuffer[100];
         char *ArgName = strlen(Name) > 90 ?xmalloc(strlen(Name)+10) :NameBuffer;
-        strcpy(ArgName, Name);
+        if (Name[0] != 0)   /* Not an empty name? */
+          strcpy(ArgName, Name);
+        else {
+          Name = "unnamed_arg";
+          strcpy(ArgName, "unnamed_arg");
+        }
         strcat(ArgName, "_addr");
         A = create_alloca_inst(ArgName, Ty, llvm_constant_uint_1);
         if (ArgName != NameBuffer)
@@ -7027,9 +7031,11 @@
 
         insert_alloca_into_entry_block(Fn, A);
         SET_DECL_LLVM(Args, D2V(A));  /* Remember lvalue address */
-      } else {
-        Name = "unnamed_arg";  /* we want llvm_value's to have names! */
       }
+      /* Add arguments to the function.  If there is a struct passed by value, *
+       * this could cause multiple LLVM arguments to be added for this one C
+       * argument.
+       */
       AddArguments(Fn, Ty, Name, D2V(A), &ArgNo);
 
       /* If the value is passed by "invisible reference", the l-value for the





From lattner at cs.uiuc.edu  Sat Feb 19 11:13:35 2005
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat, 19 Feb 2005 11:13:35 -0600
Subject: [llvm-commits] CVS: llvm/docs/ReleaseNotes.html 
Message-ID: <200502191713.j1JHDZ2F007104@apoc.cs.uiuc.edu>



Changes in directory llvm/docs:

ReleaseNotes.html updated: 1.299 -> 1.300
---
Log message:

Bug fixed.


---
Diffs of the changes:  (+3 -1)

 ReleaseNotes.html |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)


Index: llvm/docs/ReleaseNotes.html
diff -u llvm/docs/ReleaseNotes.html:1.299 llvm/docs/ReleaseNotes.html:1.300
--- llvm/docs/ReleaseNotes.html:1.299	Sat Feb 19 01:29:25 2005
+++ llvm/docs/ReleaseNotes.html	Sat Feb 19 11:13:20 2005
@@ -166,6 +166,8 @@
        incorrect for short circuit logical operations
    [llvm-gcc] Crash compiling 
        bitfield <-> aggregate assignment
+   [llvm-g++] Error compiling 
+       virtrual function thunk with an unnamed argument
 
 
 