System Library

+ + + + Reid Spencer + LLVM Compiler Infrastructure + Last modified: $Date: 2004/07/17 10:04:49 $ + · Enable trivial optimizations

OptimizationLevel
OptLevel
0
clEnumValEnd
clEnumVal
enum
@@ -648,7 +649,7 @@
     clEnumVal(constprop         , "Constant Propagation"),
    clEnumValN(inlining, "inline", "Procedure Integration"),
     clEnumVal(strip             , "Strip Symbols"),
-  0));
+  clEnumValEnd));
 
 
 
This defines a variable that is conceptually of the type
@@ -998,7 +999,8 @@
 
 
The cl::values attribute specifies
 the string-to-value mapping to be used by the generic parser.  It takes a
-null terminated list of (option, value, description) triplets that
+clEnumValEnd terminated list of (option, value, description) triplets 
+that
 specify the option name, the value mapped to, and the description shown in the
 --help for the tool.  Because the generic parser is used most
 frequently with enum values, two macros are often useful:
@@ -1707,7 +1709,7 @@
 
   Chris Lattner

   LLVM Compiler Infrastructure

-  Last modified: $Date: 2004/05/23 21:07:26 $
+  Last modified: $Date: 2004/07/16 00:10:54 $
 
 
 




From lattner at cs.uiuc.edu  Thu Jul 15 20:18:20 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu, 15 Jul 2004 20:18:20 -0500
Subject: [llvm-commits] CVS: llvm/lib/AsmParser/llvmAsmParser.y 
Message-ID: <200407160118.UAA31550@apoc.cs.uiuc.edu>



Changes in directory llvm/lib/AsmParser:

llvmAsmParser.y updated: 1.189 -> 1.190

---
Log message:

Fix the regressions handling unnamed global variables


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

Index: llvm/lib/AsmParser/llvmAsmParser.y
diff -u llvm/lib/AsmParser/llvmAsmParser.y:1.189 llvm/lib/AsmParser/llvmAsmParser.y:1.190

--- llvm/lib/AsmParser/llvmAsmParser.y:1.189	Wed Jul 14 18:07:13 2004
+++ llvm/lib/AsmParser/llvmAsmParser.y	Thu Jul 15 20:18:09 2004
@@ -561,6 +561,7 @@
     GV->setInitializer(Initializer);
     GV->setLinkage(Linkage);
     GV->setConstant(isConstantGlobal);
+    InsertValue(GV, CurModule.Values);
     return;
   }
 
@@ -595,8 +596,10 @@
   }
 
   // Otherwise there is no existing GV to use, create one now.
-  new GlobalVariable(Ty, isConstantGlobal, Linkage, Initializer, Name, 
-                     CurModule.CurrentModule);
+  GlobalVariable *GV =
+    new GlobalVariable(Ty, isConstantGlobal, Linkage, Initializer, Name, 
+                       CurModule.CurrentModule);
+  InsertValue(GV, CurModule.Values);
 }
 
 // setTypeName - Set the specified type to the name given.  The name may be




From lattner at cs.uiuc.edu  Fri Jul 16 01:12:15 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri, 16 Jul 2004 01:12:15 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/Skeleton/
Message-ID: <200407160612.BAA01525@apoc.cs.uiuc.edu>



Changes in directory llvm/lib/Target/Skeleton:


---
Log message:

Directory /home/vadve/shared/PublicCVS/llvm/lib/Target/Skeleton added to the repository


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



From lattner at cs.uiuc.edu  Fri Jul 16 01:12:38 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri, 16 Jul 2004 01:12:38 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/Skeleton/README.txt 
Message-ID: <200407160612.BAA01538@apoc.cs.uiuc.edu>



Changes in directory llvm/lib/Target/Skeleton:

README.txt added (r1.1)

---
Log message:

Initial readme


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

Index: llvm/lib/Target/Skeleton/README.txt
diff -c /dev/null llvm/lib/Target/Skeleton/README.txt:1.1
*** /dev/null	Fri Jul 16 01:12:38 2004
--- llvm/lib/Target/Skeleton/README.txt	Fri Jul 16 01:12:28 2004
***************
*** 0 ****
--- 1,19 ----
+ LLVM Target Skeleton
+ --------------------
+ 
+ This directory contains a very simple skeleton that can be used as the
+ starting point for new LLVM targets.  Basically you can take this code
+ and start filling stuff in.
+ 
+ This directory contains mainly stubs and placeholders; there is no binary 
+ machine code emitter, no assembly writer, and no instruction selector 
+ here.  Most of the functions in these files call abort() or fail assertions 
+ on purpose, just to reinforce the fact that they don't work.
+ 
+ The things that are implemented are stubbed out in a pseudo-PowerPC target.
+ This should give you an idea of what to do, but anything implemented should
+ be replaced with your target details.
+ 
+ As always, if you're starting a new port, please mention it on the llvmdev
+ list, and if you have questions, that is a great place to ask.
+ 




From lattner at cs.uiuc.edu  Fri Jul 16 01:21:06 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri, 16 Jul 2004 01:21:06 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/Skeleton/Makefile 
Message-ID: <200407160621.BAA01841@apoc.cs.uiuc.edu>



Changes in directory llvm/lib/Target/Skeleton:

Makefile added (r1.1)

---
Log message:

Add skeleton makefile


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

Index: llvm/lib/Target/Skeleton/Makefile
diff -c /dev/null llvm/lib/Target/Skeleton/Makefile:1.1
*** /dev/null	Fri Jul 16 01:21:06 2004
--- llvm/lib/Target/Skeleton/Makefile	Fri Jul 16 01:20:55 2004
***************
*** 0 ****
--- 1,44 ----
+ ##===- lib/Target/Skeleton/Makefile ------------------------*- Makefile -*-===##
+ # 
+ #                     The LLVM Compiler Infrastructure
+ #
+ # This file was developed by the LLVM research group and is distributed under
+ # the University of Illinois Open Source License. See LICENSE.TXT for details.
+ # 
+ ##===----------------------------------------------------------------------===##
+ 
+ LEVEL = ../../..
+ LIBRARYNAME = skeleton
+ include $(LEVEL)/Makefile.common
+ 
+ TARGET = Skeleton
+ TDFILES = $(wildcard $(SourceDir)/*.td)  $(SourceDir)/../Target.td
+ 
+ 
+ # Make sure that tblgen is run, first thing.
+ $(SourceDepend): $(TARGET)GenRegisterInfo.h.inc $(TARGET)GenRegisterNames.inc \
+                  $(TARGET)GenRegisterInfo.inc $(TARGET)GenInstrNames.inc \
+                  $(TARGET)GenInstrInfo.inc
+ 
+ $(TARGET)GenRegisterNames.inc:: $(TDFILES) $(TBLGEN)
+ 	@echo "Building $(TARGET).td register names with tblgen"
+ 	$(VERB) $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-register-enums -o $@
+ 
+ $(TARGET)GenRegisterInfo.h.inc:: $(TDFILES) $(TBLGEN)
+ 	@echo "Building $(TARGET).td register information header with tblgen"
+ 	$(VERB) $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-register-desc-header -o $@
+ 
+ $(TARGET)GenRegisterInfo.inc:: $(TDFILES) $(TBLGEN)
+ 	@echo "Building $(TARGET).td register information implementation with tblgen"
+ 	$(VERB) $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-register-desc -o $@
+ 
+ $(TARGET)GenInstrNames.inc:: $(TDFILES) $(TBLGEN)
+ 	@echo "Building $(TARGET).td instruction names with tblgen"
+ 	$(VERB) $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-instr-enums -o $@
+ 
+ $(TARGET)GenInstrInfo.inc:: $(TDFILES) $(TBLGEN)
+ 	@echo "Building $(TARGET).td instruction information with tblgen"
+ 	$(VERB) $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-instr-desc -o $@
+ 
+ clean::
+ 	$(VERB) rm -f *.inc




From lattner at cs.uiuc.edu  Fri Jul 16 01:29:29 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri, 16 Jul 2004 01:29:29 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/Skeleton/SkeletonInstrInfo.td
	SkeletonRegisterInfo.td Skeleton.td 
Message-ID: <200407160629.BAA02092@apoc.cs.uiuc.edu>



Changes in directory llvm/lib/Target/Skeleton:

SkeletonInstrInfo.td added (r1.1)
SkeletonRegisterInfo.td added (r1.1)
Skeleton.td added (r1.1)

---
Log message:

Initial skeleton tablegen files


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

Index: llvm/lib/Target/Skeleton/SkeletonInstrInfo.td
diff -c /dev/null llvm/lib/Target/Skeleton/SkeletonInstrInfo.td:1.1
*** /dev/null	Fri Jul 16 01:29:29 2004
--- llvm/lib/Target/Skeleton/SkeletonInstrInfo.td	Fri Jul 16 01:29:19 2004
***************
*** 0 ****
--- 1,39 ----
+ //===- SkeletonInstrInfo.td - Describe the Instruction Set ------*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by the LLVM research group and is distributed under
+ // the University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // Skeleton instruction information.  Fill in stuff here.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ class Format val> {
+   bits<4> Value = val;
+ }
+ 
+ // All of the PowerPC instruction formats, plus a pseudo-instruction format:
+ def Pseudo : Format<0>;
+ def IForm : Format<1>;
+ def BForm : Format<2>;
+ 
+ // Look at how other targets factor commonality between instructions.
+ class SkelInst opcd, Format f> : Instruction {
+   let Namespace = "Skeleton";
+ 
+   let Name = nm;
+   bits<6> Opcode = opcd;
+   Format Form = f;
+   bits<4> FormBits = Form.Value;
+ }
+ 
+ // Pseudo-instructions:
+ def PHI : SkelInst<"PHI", 0, Pseudo>;          // PHI node...
+ def NOP : SkelInst<"NOP", 0, Pseudo>;          // No-op
+ def ADJCALLSTACKDOWN : SkelInst<"ADJCALLSTACKDOWN", 0, Pseudo>;
+ def ADJCALLSTACKUP : SkelInst<"ADJCALLSTACKUP", 0, Pseudo>;
+ 
+ 


Index: llvm/lib/Target/Skeleton/SkeletonRegisterInfo.td
diff -c /dev/null llvm/lib/Target/Skeleton/SkeletonRegisterInfo.td:1.1
*** /dev/null	Fri Jul 16 01:29:29 2004
--- llvm/lib/Target/Skeleton/SkeletonRegisterInfo.td	Fri Jul 16 01:29:19 2004
***************
*** 0 ****
--- 1,86 ----
+ //===- SkeletonRegisterInfo.td - Describe the Register File -----*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by the LLVM research group and is distributed under
+ // the University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // This file defines the target's register file in Tablegen format.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ class SkelReg : Register {
+   let Namespace = "Skeleton";
+ }
+ 
+ // This is roughly the PPC register file.  You should replace all of this with
+ // whatever your target needs.
+ 
+ 
+ // GPR - One of the 32 32-bit general-purpose registers
+ class GPR num> : SkelReg {
+   field bits<5> Num = num;
+ }
+ 
+ // SPR - One of the 32-bit special-purpose registers
+ class SPR num> : SkelReg {
+   field bits<5> Num = num;
+ }
+ 
+ // FPR - One of the 32 64-bit floating-point registers
+ class FPR num> : SkelReg {
+   field bits<5> Num = num;
+ }
+ 
+ // CR - One of the 8 4-bit condition registers
+ class CR num> : SkelReg {
+   field bits<5> Num = num;
+ }
+ 
+ // General-purpose registers
+ def R0  : GPR< 0>;  def R1  : GPR< 1>;  def R2  : GPR< 2>;  def R3  : GPR< 3>;
+ def R4  : GPR< 4>;  def R5  : GPR< 5>;  def R6  : GPR< 6>;  def R7  : GPR< 7>;
+ def R8  : GPR< 8>;  def R9  : GPR< 9>;  def R10 : GPR<10>;  def R11 : GPR<11>;
+ def R12 : GPR<12>;  def R13 : GPR<13>;  def R14 : GPR<14>;  def R15 : GPR<15>;
+ def R16 : GPR<16>;  def R17 : GPR<17>;  def R18 : GPR<18>;  def R19 : GPR<19>;
+ def R20 : GPR<20>;  def R21 : GPR<21>;  def R22 : GPR<22>;  def R23 : GPR<23>;
+ def R24 : GPR<24>;  def R25 : GPR<25>;  def R26 : GPR<26>;  def R27 : GPR<27>;
+ def R28 : GPR<28>;  def R29 : GPR<29>;  def R30 : GPR<30>;  def R31 : GPR<31>;
+ 
+ // Floating-point registers
+ def F0  : FPR< 0>;  def F1  : FPR< 1>;  def F2  : FPR< 2>;  def F3  : FPR< 3>;
+ def F4  : FPR< 4>;  def F5  : FPR< 5>;  def F6  : FPR< 6>;  def F7  : FPR< 7>;
+ def F8  : FPR< 8>;  def F9  : FPR< 9>;  def F10 : FPR<10>;  def F11 : FPR<11>;
+ def F12 : FPR<12>;  def F13 : FPR<13>;  def F14 : FPR<14>;  def F15 : FPR<15>;
+ def F16 : FPR<16>;  def F17 : FPR<17>;  def F18 : FPR<18>;  def F19 : FPR<19>;
+ def F20 : FPR<20>;  def F21 : FPR<21>;  def F22 : FPR<22>;  def F23 : FPR<23>;
+ def F24 : FPR<24>;  def F25 : FPR<25>;  def F26 : FPR<26>;  def F27 : FPR<27>;
+ def F28 : FPR<28>;  def F29 : FPR<29>;  def F30 : FPR<30>;  def F31 : FPR<31>;
+ 
+ // Condition registers
+ def CR0 : CR<0>; def CR1 : CR<1>; def CR2 : CR<2>; def CR3 : CR<3>;
+ def CR4 : CR<4>; def CR5 : CR<5>; def CR6 : CR<6>; def CR7 : CR<7>;
+ 
+ // Floating-point status and control register
+ def FPSCR : SPR<0>;
+ // fiXed-point Exception Register? :-)
+ def XER : SPR<1>;
+ // Link register
+ def LR : SPR<2>;
+ // Count register
+ def CTR : SPR<3>;
+ // These are the "time base" registers which are read-only in user mode.
+ def TBL : SPR<4>;
+ def TBU : SPR<5>;
+ 
+ /// Register classes: one for floats and another for non-floats.
+ ///
+ def GPRC : RegisterClass;
+ def FPRC : RegisterClass;
+ 


Index: llvm/lib/Target/Skeleton/Skeleton.td
diff -c /dev/null llvm/lib/Target/Skeleton/Skeleton.td:1.1
*** /dev/null	Fri Jul 16 01:29:29 2004
--- llvm/lib/Target/Skeleton/Skeleton.td	Fri Jul 16 01:29:19 2004
***************
*** 0 ****
--- 1,40 ----
+ //===- PowerPC.td - Describe the PowerPC Target Machine ---------*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by the LLVM research group and is distributed under
+ // the University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ // Get the target-independent interfaces which we are implementing...
+ //
+ include "../Target.td"
+ 
+ //===----------------------------------------------------------------------===//
+ // Register File Description
+ //===----------------------------------------------------------------------===//
+ 
+ include "SkeletonRegisterInfo.td"
+ include "SkeletonInstrInfo.td"
+ 
+ def SkeletonInstrInfo : InstrInfo {
+   let PHIInst = PHI;
+ }
+ 
+ def PowerPC : Target {
+   // Pointers are 32-bits in size.
+   let PointerType = i32;
+ 
+   // Registers that must be saved by a function call go here.
+   let CalleeSavedRegisters = [R1, R13, R14, R15, R16, R17, R18, R19,
+     R20, R21, R22, R23, R24, R25, R26, R27, R28, R29, R30, R31, F14, F15,
+     F16, F17, F18, F19, F20, F21, F22, F23, F24, F25, F26, F27, F28, F29,
+     F30, F31, CR2, CR3, CR4];
+ 
+   // Pull in Instruction Info:
+   let InstructionSet = SkeletonInstrInfo;
+ }




From lattner at cs.uiuc.edu  Fri Jul 16 01:44:21 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri, 16 Jul 2004 01:44:21 -0500
Subject: [llvm-commits] CVS: llvm-gcc/gcc/config/ia64/t-ia64 
Message-ID: <200407160644.BAA02695@apoc.cs.uiuc.edu>



Changes in directory llvm-gcc/gcc/config/ia64:

t-ia64 updated: 1.1.1.1 -> 1.2

---
Log message:

First attempt at ia64 support


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

Index: llvm-gcc/gcc/config/ia64/t-ia64
diff -u llvm-gcc/gcc/config/ia64/t-ia64:1.1.1.1 llvm-gcc/gcc/config/ia64/t-ia64:1.2
--- llvm-gcc/gcc/config/ia64/t-ia64:1.1.1.1	Thu Jan  8 15:58:50 2004
+++ llvm-gcc/gcc/config/ia64/t-ia64	Fri Jul 16 01:44:11 2004
@@ -1,14 +1,14 @@
-LIB1ASMSRC    = ia64/lib1funcs.asm
+#LIB1ASMSRC    = ia64/lib1funcs.asm
 
 # We use different names for the DImode div/mod files so that they won't
 # conflict with libgcc2.c files.  We used to use __ia64 as a prefix, now
 # we use __ as the prefix.  Note that L_divdi3 in libgcc2.c actually defines
 # a TImode divide function, so there is no actual overlap here between
 # libgcc2.c and lib1funcs.asm.
-LIB1ASMFUNCS  = __divtf3 __divdf3 __divsf3 \
-	__divdi3 __moddi3 __udivdi3 __umoddi3 \
-	__divsi3 __modsi3 __udivsi3 __umodsi3 __save_stack_nonlocal \
-	__nonlocal_goto __restore_stack_nonlocal __trampoline
+#LIB1ASMFUNCS  = __divtf3 __divdf3 __divsf3 \
+#	__divdi3 __moddi3 __udivdi3 __umoddi3 \
+#	__divsi3 __modsi3 __udivsi3 __umodsi3 __save_stack_nonlocal \
+#	__nonlocal_goto __restore_stack_nonlocal __trampoline
 
 # ??? Hack to get -P option used when compiling lib1funcs.asm, because Intel
 # assembler does not accept # line number as a comment.
@@ -17,31 +17,31 @@
 # to support the Intel assembler.
 #LIBGCC2_DEBUG_CFLAGS = -g1 -P
 
-SHLIB_MAPFILES += $(srcdir)/config/ia64/libgcc-ia64.ver
+#SHLIB_MAPFILES += $(srcdir)/config/ia64/libgcc-ia64.ver
 
 # Effectively disable the crtbegin/end rules using crtstuff.c
 T = disable
 
 # Assemble startup files.
-crtbegin.o: $(srcdir)/config/ia64/crtbegin.asm $(GCC_PASSES)
-	$(GCC_FOR_TARGET) -I. -c -o crtbegin.o -x assembler-with-cpp \
-		$(srcdir)/config/ia64/crtbegin.asm
-crtend.o: $(srcdir)/config/ia64/crtend.asm $(GCC_PASSES)
-	$(GCC_FOR_TARGET) -I. -c -o crtend.o -x assembler-with-cpp \
-		$(srcdir)/config/ia64/crtend.asm
-crtbeginS.o: $(srcdir)/config/ia64/crtbegin.asm $(GCC_PASSES)
-	$(GCC_FOR_TARGET) -I. -DSHARED -c -o crtbeginS.o \
-		-x assembler-with-cpp \
-		$(srcdir)/config/ia64/crtbegin.asm
-crtendS.o: $(srcdir)/config/ia64/crtend.asm $(GCC_PASSES)
-	$(GCC_FOR_TARGET) -I. -DSHARED -c -o crtendS.o -x assembler-with-cpp \
-		$(srcdir)/config/ia64/crtend.asm
-crtfastmath.o: $(srcdir)/config/ia64/crtfastmath.c $(GCC_PASSES)
-	$(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -c -o crtfastmath.o \
-		$(srcdir)/config/ia64/crtfastmath.c
+#crtbegin.o: $(srcdir)/config/ia64/crtbegin.asm $(GCC_PASSES)
+#	$(GCC_FOR_TARGET) -I. -c -o crtbegin.o -x assembler-with-cpp \
+#		$(srcdir)/config/ia64/crtbegin.asm
+#crtend.o: $(srcdir)/config/ia64/crtend.asm $(GCC_PASSES)
+#	$(GCC_FOR_TARGET) -I. -c -o crtend.o -x assembler-with-cpp \
+#		$(srcdir)/config/ia64/crtend.asm
+#crtbeginS.o: $(srcdir)/config/ia64/crtbegin.asm $(GCC_PASSES)
+#	$(GCC_FOR_TARGET) -I. -DSHARED -c -o crtbeginS.o \
+#		-x assembler-with-cpp \
+#		$(srcdir)/config/ia64/crtbegin.asm
+#crtendS.o: $(srcdir)/config/ia64/crtend.asm $(GCC_PASSES)
+#	$(GCC_FOR_TARGET) -I. -DSHARED -c -o crtendS.o -x assembler-with-cpp \
+#		$(srcdir)/config/ia64/crtend.asm
+#crtfastmath.o: $(srcdir)/config/ia64/crtfastmath.c $(GCC_PASSES)
+#	$(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -c -o crtfastmath.o \
+#		$(srcdir)/config/ia64/crtfastmath.c
 
-LIB2ADDEH = $(srcdir)/config/ia64/unwind-ia64.c $(srcdir)/unwind-sjlj.c \
-  $(srcdir)/unwind-c.c
+#LIB2ADDEH = $(srcdir)/config/ia64/unwind-ia64.c $(srcdir)/unwind-sjlj.c \
+#  $(srcdir)/unwind-c.c
 
 ia64-c.o: $(srcdir)/config/ia64/ia64-c.c $(CONFIG_H) $(SYSTEM_H) \
     coretypes.h $(TM_H) $(TREE_H) $(CPPLIB_H) $(C_COMMON_H) c-pragma.h toplev.h




From lattner at cs.uiuc.edu  Fri Jul 16 01:49:35 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri, 16 Jul 2004 01:49:35 -0500
Subject: [llvm-commits] CVS: llvm-gcc/gcc/config/ia64/linux.h 
Message-ID: <200407160649.BAA02725@apoc.cs.uiuc.edu>



Changes in directory llvm-gcc/gcc/config/ia64:

linux.h updated: 1.1.1.1 -> 1.2

---
Log message:

Hack out more stuff


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

Index: llvm-gcc/gcc/config/ia64/linux.h
diff -u llvm-gcc/gcc/config/ia64/linux.h:1.1.1.1 llvm-gcc/gcc/config/ia64/linux.h:1.2
--- llvm-gcc/gcc/config/ia64/linux.h:1.1.1.1	Thu Jan  8 15:58:50 2004
+++ llvm-gcc/gcc/config/ia64/linux.h	Fri Jul 16 01:49:25 2004
@@ -6,8 +6,10 @@
 #define TARGET_VERSION fprintf (stderr, " (IA-64) Linux");
 
 /* This is for -profile to use -lc_p instead of -lc.  */
+/*
 #undef CC1_SPEC
 #define CC1_SPEC "%{profile:-p} %{G*}"
+*/
 
 /* Target OS builtins.  */
 #define TARGET_OS_CPP_BUILTINS()		\
@@ -20,6 +22,7 @@
 } while (0)
 
 /* Need to override linux.h STARTFILE_SPEC, since it has crtbeginT.o in.  */
+/*
 #undef STARTFILE_SPEC
 #ifdef HAVE_LD_PIE
 #define STARTFILE_SPEC \
@@ -30,16 +33,18 @@
   "%{!shared: %{pg|p|profile:gcrt1.o%s;:crt1.o%s}}\
    crti.o%s %{shared|pie:crtbeginS.o%s;:crtbegin.o%s}"
 #endif
-
+*/
 /* Similar to standard Linux, but adding -ffast-math support.  */
+/*
 #undef  ENDFILE_SPEC
 #define ENDFILE_SPEC \
   "%{ffast-math|funsafe-math-optimizations:crtfastmath.o%s} \
    %{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
 
+*/
 /* Define this for shared library support because it isn't in the main
    linux.h file.  */
-
+/*
 #undef LINK_SPEC
 #define LINK_SPEC "\
   %{shared:-shared} \
@@ -48,7 +53,7 @@
       %{rdynamic:-export-dynamic} \
       %{!dynamic-linker:-dynamic-linker /lib/ld-linux-ia64.so.2}} \
       %{static:-static}}"
-
+*/
 
 #define JMP_BUF_SIZE  76
 
@@ -60,7 +65,7 @@
 
 /* Do code reading to identify a signal frame, and set the frame
    state data appropriately.  See unwind-dw2.c for the structs.  */
-
+#if 0
 #ifdef IN_LIBGCC2
 #include 
 #include 
@@ -124,3 +129,4 @@
       goto SUCCESS;							\
     }
 #endif /* IN_LIBGCC2 */
+#endif




From lattner at cs.uiuc.edu  Fri Jul 16 02:11:28 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri, 16 Jul 2004 02:11:28 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/Skeleton/Skeleton.h
	SkeletonInstrInfo.cpp SkeletonInstrInfo.h SkeletonJITInfo.cpp
	SkeletonJITInfo.h SkeletonRegisterInfo.cpp
	SkeletonRegisterInfo.h SkeletonTargetMachine.cpp
	SkeletonTargetMachine.h Makefile Skeleton.td SkeletonInstrInfo.td 
Message-ID: <200407160711.CAA04404@apoc.cs.uiuc.edu>



Changes in directory llvm/lib/Target/Skeleton:

Skeleton.h added (r1.1)
SkeletonInstrInfo.cpp added (r1.1)
SkeletonInstrInfo.h added (r1.1)
SkeletonJITInfo.cpp added (r1.1)
SkeletonJITInfo.h added (r1.1)
SkeletonRegisterInfo.cpp added (r1.1)
SkeletonRegisterInfo.h added (r1.1)
SkeletonTargetMachine.cpp added (r1.1)
SkeletonTargetMachine.h added (r1.1)
Makefile updated: 1.1 -> 1.2
Skeleton.td updated: 1.1 -> 1.2
SkeletonInstrInfo.td updated: 1.1 -> 1.2

---
Log message:

Initial checkin of the rest of the skeleton target



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

Index: llvm/lib/Target/Skeleton/Skeleton.h
diff -c /dev/null llvm/lib/Target/Skeleton/Skeleton.h:1.1
*** /dev/null	Fri Jul 16 02:11:25 2004
--- llvm/lib/Target/Skeleton/Skeleton.h	Fri Jul 16 02:11:08 2004
***************
*** 0 ****
--- 1,33 ----
+ //===-- Skeleton.h - Target private header file -----------------*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by the LLVM research group and is distributed under
+ // the University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // This file contains the definitions shared among the various components of the
+ // Skeleton backend.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #ifndef TARGET_SKELETON_H
+ #define TARGET_SKELETON_H
+ 
+ #include 
+ 
+ /// Put prototypes here for functions used to create various passes.
+ 
+ 
+ // Defines symbolic enum names for target registers.  This defines a mapping
+ // from register name to register number.  These are generated by tblgen from
+ // your target file.
+ //
+ #include "SkeletonGenRegisterNames.inc"
+ 
+ // Defines symbolic enum names for the target instructions.
+ //
+ #include "SkeletonGenInstrNames.inc"
+ 
+ #endif


Index: llvm/lib/Target/Skeleton/SkeletonInstrInfo.cpp
diff -c /dev/null llvm/lib/Target/Skeleton/SkeletonInstrInfo.cpp:1.1
*** /dev/null	Fri Jul 16 02:11:26 2004
--- llvm/lib/Target/Skeleton/SkeletonInstrInfo.cpp	Fri Jul 16 02:11:09 2004
***************
*** 0 ****
--- 1,22 ----
+ //===- SkeletonInstrInfo.cpp - Instruction Information ----------*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by the LLVM research group and is distributed under
+ // the University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // This is where you implement methods for the TargetInstrInfo class.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #include "SkeletonInstrInfo.h"
+ #include "llvm/CodeGen/MachineInstrBuilder.h"
+ #include "SkeletonGenInstrInfo.inc"  // Get info from Tablegen
+ using namespace llvm;
+ 
+ SkeletonInstrInfo::SkeletonInstrInfo()
+   : TargetInstrInfo(SkeletonInsts,
+                     sizeof(SkeletonInsts)/sizeof(SkeletonInsts[0])){
+ }


Index: llvm/lib/Target/Skeleton/SkeletonInstrInfo.h
diff -c /dev/null llvm/lib/Target/Skeleton/SkeletonInstrInfo.h:1.1
*** /dev/null	Fri Jul 16 02:11:26 2004
--- llvm/lib/Target/Skeleton/SkeletonInstrInfo.h	Fri Jul 16 02:11:10 2004
***************
*** 0 ****
--- 1,36 ----
+ //===- SkeletonInstrInfo.h - Instruction Information ------------*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by the LLVM research group and is distributed under
+ // the University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // This file is where the target-specific implementation of the TargetInstrInfo
+ // class goes.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #ifndef SKELETON_INSTRUCTIONINFO_H
+ #define SKELETON_INSTRUCTIONINFO_H
+ 
+ #include "llvm/Target/TargetInstrInfo.h"
+ #include "SkeletonRegisterInfo.h"
+ 
+ namespace llvm {
+ 
+   class SkeletonInstrInfo : public TargetInstrInfo {
+     const SkeletonRegisterInfo RI;
+   public:
+     SkeletonInstrInfo();
+     
+     /// getRegisterInfo - TargetInstrInfo is a superset of MRegister info.  As
+     /// such, whenever a client has an instance of instruction info, it should
+     /// always be able to get register info as well (through this method).
+     ///
+     virtual const MRegisterInfo &getRegisterInfo() const { return RI; }
+   };
+ }
+ 
+ #endif


Index: llvm/lib/Target/Skeleton/SkeletonJITInfo.cpp
diff -c /dev/null llvm/lib/Target/Skeleton/SkeletonJITInfo.cpp:1.1
*** /dev/null	Fri Jul 16 02:11:26 2004
--- llvm/lib/Target/Skeleton/SkeletonJITInfo.cpp	Fri Jul 16 02:11:11 2004
***************
*** 0 ****
--- 1,37 ----
+ //===-- SkeletonCodeEmitter.cpp - JIT Code Emitter --------------*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by the LLVM research group and is distributed under
+ // the University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ // 
+ // This is a stub for a JIT code generator, which is obviously not implemented.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #include "SkeletonTargetMachine.h"
+ using namespace llvm;
+ 
+ /// addPassesToEmitMachineCode - Add passes to the specified pass manager to get
+ /// machine code emitted.  This uses a MachineCodeEmitter object to handle
+ /// actually outputting the machine code and resolving things like the address
+ /// of functions.  This method should returns true if machine code emission is
+ /// not supported.
+ ///
+ bool SkeletonTargetMachine::addPassesToEmitMachineCode(FunctionPassManager &PM,
+                                                        MachineCodeEmitter &MCE){
+   return true;  // Not implemented yet!
+ }
+ 
+ void *SkeletonJITInfo::getJITStubForFunction(Function *F,
+                                              MachineCodeEmitter &MCE) {
+   assert (0 && "getJITStubForFunction not implemented");
+   return 0;
+ }
+ 
+ void SkeletonJITInfo::replaceMachineCodeForFunction (void *Old, void *New) {
+   assert (0 && "replaceMachineCodeForFunction not implemented");
+ }
+ 


Index: llvm/lib/Target/Skeleton/SkeletonJITInfo.h
diff -c /dev/null llvm/lib/Target/Skeleton/SkeletonJITInfo.h:1.1
*** /dev/null	Fri Jul 16 02:11:27 2004
--- llvm/lib/Target/Skeleton/SkeletonJITInfo.h	Fri Jul 16 02:11:11 2004
***************
*** 0 ****
--- 1,49 ----
+ //===- SkeletonJITInfo.h - Skeleton impl of JIT interface -------*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by the LLVM research group and is distributed under
+ // the University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // This file contains the skeleton implementation of the TargetJITInfo class.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #ifndef SKELETONJITINFO_H
+ #define SKELETONJITINFO_H
+ 
+ #include "llvm/Target/TargetJITInfo.h"
+ 
+ namespace llvm {
+   class TargetMachine;
+   class IntrinsicLowering;
+ 
+   class SkeletonJITInfo : public TargetJITInfo {
+     TargetMachine &TM;
+   public:
+     SkeletonJITInfo(TargetMachine &tm) : TM(tm) {}
+ 
+     /// addPassesToJITCompile - Add passes to the specified pass manager to
+     /// implement a fast dynamic compiler for this target.  Return true if this
+     /// is not supported for this target.
+     ///
+     virtual void addPassesToJITCompile(FunctionPassManager &PM);
+     
+     /// replaceMachineCodeForFunction - Make it so that calling the function
+     /// whose machine code is at OLD turns into a call to NEW, perhaps by
+     /// overwriting OLD with a branch to NEW.  This is used for self-modifying
+     /// code.
+     ///
+     virtual void replaceMachineCodeForFunction(void *Old, void *New);
+     
+     /// getJITStubForFunction - Create or return a stub for the specified
+     /// function.  This stub acts just like the specified function, except that
+     /// it allows the "address" of the function to be taken without having to
+     /// generate code for it.
+     virtual void *getJITStubForFunction(Function *F, MachineCodeEmitter &MCE);
+   };
+ }
+ 
+ #endif


Index: llvm/lib/Target/Skeleton/SkeletonRegisterInfo.cpp
diff -c /dev/null llvm/lib/Target/Skeleton/SkeletonRegisterInfo.cpp:1.1
*** /dev/null	Fri Jul 16 02:11:27 2004
--- llvm/lib/Target/Skeleton/SkeletonRegisterInfo.cpp	Fri Jul 16 02:11:12 2004
***************
*** 0 ****
--- 1,94 ----
+ //===- SkeletonRegisterInfo.cpp - Skeleton Register Information -*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by the LLVM research group and is distributed under
+ // the University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // This file contains the Skeleton implementation of the MRegisterInfo class.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #include "Skeleton.h"
+ #include "SkeletonRegisterInfo.h"
+ #include "llvm/Type.h"
+ using namespace llvm;
+ 
+ SkeletonRegisterInfo::SkeletonRegisterInfo()
+   : SkeletonGenRegisterInfo(Skeleton::ADJCALLSTACKDOWN,
+                            Skeleton::ADJCALLSTACKUP) {}
+ 
+ int SkeletonRegisterInfo::storeRegToStackSlot(MachineBasicBlock &MBB,
+                                               MachineBasicBlock::iterator MBBI,
+                                               unsigned SrcReg, int FrameIdx,
+                                           const TargetRegisterClass *RC) const {
+   abort();
+   return -1;
+ }
+ 
+ int SkeletonRegisterInfo::loadRegFromStackSlot(MachineBasicBlock &MBB,
+                                                MachineBasicBlock::iterator MBBI,
+                                                unsigned DestReg, int FrameIdx,
+                                           const TargetRegisterClass *RC) const {
+   abort();
+   return -1;
+ }
+ 
+ int SkeletonRegisterInfo::copyRegToReg(MachineBasicBlock &MBB,
+                                        MachineBasicBlock::iterator MBBI,
+                                        unsigned DestReg, unsigned SrcReg,
+                                        const TargetRegisterClass *RC) const {
+   abort();
+   return -1;
+ }
+ 
+ void SkeletonRegisterInfo::
+ eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,
+                               MachineBasicBlock::iterator I) const {
+   abort();
+ }
+ 
+ void SkeletonRegisterInfo::eliminateFrameIndex(MachineFunction &MF,
+                                         MachineBasicBlock::iterator II) const {
+   abort();
+ }
+ 
+ void SkeletonRegisterInfo::
+ processFunctionBeforeFrameFinalized(MachineFunction &MF) const {
+   abort();
+ }
+ 
+ void SkeletonRegisterInfo::emitPrologue(MachineFunction &MF) const {
+   abort();
+ }
+ 
+ void SkeletonRegisterInfo::emitEpilogue(MachineFunction &MF,
+                                         MachineBasicBlock &MBB) const {
+   abort();
+ }
+ 
+ 
+ #include "SkeletonGenRegisterInfo.inc"
+ 
+ const TargetRegisterClass*
+ SkeletonRegisterInfo::getRegClassForType(const Type* Ty) const {
+   switch (Ty->getTypeID()) {
+   case Type::LongTyID:
+   case Type::ULongTyID: assert(0 && "Long values can't fit in registers!");
+   default:              assert(0 && "Invalid type to getClass!");
+   case Type::BoolTyID:
+   case Type::SByteTyID:
+   case Type::UByteTyID:
+   case Type::ShortTyID:
+   case Type::UShortTyID:
+   case Type::IntTyID:
+   case Type::UIntTyID:
+   case Type::PointerTyID: return &GPRCInstance;
+     
+   case Type::FloatTyID:
+   case Type::DoubleTyID: return &FPRCInstance;
+   }
+ }
+ 


Index: llvm/lib/Target/Skeleton/SkeletonRegisterInfo.h
diff -c /dev/null llvm/lib/Target/Skeleton/SkeletonRegisterInfo.h:1.1
*** /dev/null	Fri Jul 16 02:11:27 2004
--- llvm/lib/Target/Skeleton/SkeletonRegisterInfo.h	Fri Jul 16 02:11:13 2004
***************
*** 0 ****
--- 1,56 ----
+ //===- SkeletonRegisterInfo.h - Skeleton Register Information Impl -*- C++ -*-==//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by the LLVM research group and is distributed under
+ // the University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // This file contains the Skeleton implementation of the MRegisterInfo class.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #ifndef SKELETON_REGISTERINFO_H
+ #define SKELETON_REGISTERINFO_H
+ 
+ #include "llvm/Target/MRegisterInfo.h"
+ #include "SkeletonGenRegisterInfo.h.inc"
+ 
+ namespace llvm {
+   class Type;
+ 
+   struct SkeletonRegisterInfo : public SkeletonGenRegisterInfo {
+     SkeletonRegisterInfo();
+     const TargetRegisterClass* getRegClassForType(const Type* Ty) const;
+     
+     // See MRegisterInfo.h for information on these methods.
+     int storeRegToStackSlot(MachineBasicBlock &MBB,
+                             MachineBasicBlock::iterator MBBI,
+                             unsigned SrcReg, int FrameIndex,
+                             const TargetRegisterClass *RC) const;
+     
+     int loadRegFromStackSlot(MachineBasicBlock &MBB,
+                              MachineBasicBlock::iterator MBBI,
+                              unsigned DestReg, int FrameIndex,
+                              const TargetRegisterClass *RC) const;
+     
+     int copyRegToReg(MachineBasicBlock &MBB, MachineBasicBlock::iterator MBBI,
+                      unsigned DestReg, unsigned SrcReg,
+                      const TargetRegisterClass *RC) const;
+     
+     void eliminateCallFramePseudoInstr(MachineFunction &MF,
+                                        MachineBasicBlock &MBB,
+                                        MachineBasicBlock::iterator I) const;
+     
+     void eliminateFrameIndex(MachineFunction &MF,
+                              MachineBasicBlock::iterator II) const;
+     
+     void processFunctionBeforeFrameFinalized(MachineFunction &MF) const;
+     
+     void emitPrologue(MachineFunction &MF) const;
+     void emitEpilogue(MachineFunction &MF, MachineBasicBlock &MBB) const;
+   };
+ } // end namespace llvm
+ 
+ #endif


Index: llvm/lib/Target/Skeleton/SkeletonTargetMachine.cpp
diff -c /dev/null llvm/lib/Target/Skeleton/SkeletonTargetMachine.cpp:1.1
*** /dev/null	Fri Jul 16 02:11:27 2004
--- llvm/lib/Target/Skeleton/SkeletonTargetMachine.cpp	Fri Jul 16 02:11:14 2004
***************
*** 0 ****
--- 1,58 ----
+ //===-- SkeletonTargetMachine.cpp - Define TargetMachine for Skeleton -----===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by the LLVM research group and is distributed under
+ // the University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ // 
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #include "SkeletonTargetMachine.h"
+ #include "Skeleton.h"
+ #include "llvm/Module.h"
+ #include "llvm/PassManager.h"
+ #include "llvm/Target/TargetOptions.h"
+ #include "llvm/Target/TargetMachineRegistry.h"
+ #include "llvm/CodeGen/MachineFunction.h"
+ #include "llvm/CodeGen/Passes.h"
+ using namespace llvm;
+ 
+ namespace {
+   // Register the target.
+   RegisterTarget X("skeleton",
+                                           "  Target Skeleton (unusable)");
+ }
+ 
+ /// SkeletonTargetMachine ctor - Create an ILP32 architecture model
+ ///
+ SkeletonTargetMachine::SkeletonTargetMachine(const Module &M,
+                                            IntrinsicLowering *IL)
+   : TargetMachine("Skeleton", IL, true, 4, 4, 4, 4, 4),
+     FrameInfo(TargetFrameInfo::StackGrowsDown, 8, -4), JITInfo(*this) {
+ }
+ 
+ /// addPassesToEmitAssembly - Add passes to the specified pass manager
+ /// to implement a static compiler for this target.
+ ///
+ bool SkeletonTargetMachine::addPassesToEmitAssembly(PassManager &PM,
+ 					       std::ostream &Out) {
+   // 
+   PM.add(createRegisterAllocator());
+   PM.add(createPrologEpilogCodeInserter());
+   // 
+   PM.add(createMachineCodeDeleter());
+   return true; // change to `return false' when this actually works.
+ }
+ 
+ /// addPassesToJITCompile - Add passes to the specified pass manager to
+ /// implement a fast dynamic compiler for this target.
+ ///
+ void SkeletonJITInfo::addPassesToJITCompile(FunctionPassManager &PM) {
+   // 
+   PM.add(createRegisterAllocator());
+   PM.add(createPrologEpilogCodeInserter());
+ }
+ 


Index: llvm/lib/Target/Skeleton/SkeletonTargetMachine.h
diff -c /dev/null llvm/lib/Target/Skeleton/SkeletonTargetMachine.h:1.1
*** /dev/null	Fri Jul 16 02:11:27 2004
--- llvm/lib/Target/Skeleton/SkeletonTargetMachine.h	Fri Jul 16 02:11:15 2004
***************
*** 0 ****
--- 1,50 ----
+ //===-- SkeletonTargetMachine.h - TargetMachine for Skeleton ----*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by the LLVM research group and is distributed under
+ // the University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ // 
+ // This file declares the Skeleton specific subclass of TargetMachine.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #ifndef SKELETONTARGETMACHINE_H
+ #define SKELETONTARGETMACHINE_H
+ 
+ #include "llvm/Target/TargetMachine.h"
+ #include "llvm/Target/TargetFrameInfo.h"
+ #include "llvm/PassManager.h"
+ #include "SkeletonInstrInfo.h"
+ #include "SkeletonJITInfo.h"
+ 
+ namespace llvm {
+   class IntrinsicLowering;
+ 
+   class SkeletonTargetMachine : public TargetMachine {
+     SkeletonInstrInfo InstrInfo;
+     TargetFrameInfo FrameInfo;
+     SkeletonJITInfo JITInfo;
+   public:
+     SkeletonTargetMachine(const Module &M, IntrinsicLowering *IL);
+ 
+     virtual const SkeletonInstrInfo *getInstrInfo() const { return &InstrInfo; }
+     virtual const TargetFrameInfo  *getFrameInfo() const { return &FrameInfo; }
+     virtual const MRegisterInfo *getRegisterInfo() const {
+       return &InstrInfo.getRegisterInfo();
+     }
+     virtual TargetJITInfo *getJITInfo() {
+       return &JITInfo;
+     }
+ 
+     virtual bool addPassesToEmitMachineCode(FunctionPassManager &PM,
+                                             MachineCodeEmitter &MCE);
+   
+     virtual bool addPassesToEmitAssembly(PassManager &PM, std::ostream &Out);
+   };
+ 
+ } // end namespace llvm
+ 
+ #endif


Index: llvm/lib/Target/Skeleton/Makefile
diff -u llvm/lib/Target/Skeleton/Makefile:1.1 llvm/lib/Target/Skeleton/Makefile:1.2
--- llvm/lib/Target/Skeleton/Makefile:1.1	Fri Jul 16 01:20:55 2004
+++ llvm/lib/Target/Skeleton/Makefile	Fri Jul 16 02:11:07 2004
@@ -12,7 +12,8 @@
 include $(LEVEL)/Makefile.common
 
 TARGET = Skeleton
-TDFILES = $(wildcard $(SourceDir)/*.td)  $(SourceDir)/../Target.td
+TDFILES = $(SourceDir)/$(TARGET).td $(wildcard $(SourceDir)/*.td) \
+          $(SourceDir)/../Target.td
 
 
 # Make sure that tblgen is run, first thing.


Index: llvm/lib/Target/Skeleton/Skeleton.td
diff -u llvm/lib/Target/Skeleton/Skeleton.td:1.1 llvm/lib/Target/Skeleton/Skeleton.td:1.2
--- llvm/lib/Target/Skeleton/Skeleton.td:1.1	Fri Jul 16 01:29:19 2004
+++ llvm/lib/Target/Skeleton/Skeleton.td	Fri Jul 16 02:11:08 2004
@@ -1,4 +1,4 @@
-//===- PowerPC.td - Describe the PowerPC Target Machine ---------*- C++ -*-===//
+//===- Skeleton.td - Describe the Skeleton Target Machine -------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -25,7 +25,7 @@
   let PHIInst = PHI;
 }
 
-def PowerPC : Target {
+def Skeleton : Target {
   // Pointers are 32-bits in size.
   let PointerType = i32;
 


Index: llvm/lib/Target/Skeleton/SkeletonInstrInfo.td
diff -u llvm/lib/Target/Skeleton/SkeletonInstrInfo.td:1.1 llvm/lib/Target/Skeleton/SkeletonInstrInfo.td:1.2
--- llvm/lib/Target/Skeleton/SkeletonInstrInfo.td:1.1	Fri Jul 16 01:29:19 2004
+++ llvm/lib/Target/Skeleton/SkeletonInstrInfo.td	Fri Jul 16 02:11:10 2004
@@ -15,7 +15,7 @@
   bits<4> Value = val;
 }
 
-// All of the PowerPC instruction formats, plus a pseudo-instruction format:
+// Some of the powerpc instruction formats, plus a pseudo-instruction format:
 def Pseudo : Format<0>;
 def IForm : Format<1>;
 def BForm : Format<2>;




From lattner at cs.uiuc.edu  Fri Jul 16 02:12:04 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri, 16 Jul 2004 02:12:04 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/Makefile 
Message-ID: <200407160712.CAA04417@apoc.cs.uiuc.edu>



Changes in directory llvm/lib/Target:

Makefile updated: 1.14 -> 1.15

---
Log message:

Build the skeleton target


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

Index: llvm/lib/Target/Makefile
diff -u llvm/lib/Target/Makefile:1.14 llvm/lib/Target/Makefile:1.15
--- llvm/lib/Target/Makefile:1.14	Wed Mar 10 22:42:41 2004
+++ llvm/lib/Target/Makefile	Fri Jul 16 02:11:53 2004
@@ -7,7 +7,7 @@
 # 
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
-DIRS = CBackend X86 SparcV9 PowerPC
+DIRS = CBackend X86 SparcV9 Skeleton
 LIBRARYNAME = target
 BUILD_ARCHIVE = 1
 




From lattner at cs.uiuc.edu  Fri Jul 16 02:12:56 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri, 16 Jul 2004 02:12:56 -0500
Subject: [llvm-commits] CVS: llvm/tools/llc/Makefile 
Message-ID: <200407160712.CAA04432@apoc.cs.uiuc.edu>



Changes in directory llvm/tools/llc:

Makefile updated: 1.52 -> 1.53

---
Log message:

Build skeleton target


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

Index: llvm/tools/llc/Makefile
diff -u llvm/tools/llc/Makefile:1.52 llvm/tools/llc/Makefile:1.53
--- llvm/tools/llc/Makefile:1.52	Thu May 27 00:44:22 2004
+++ llvm/tools/llc/Makefile	Fri Jul 16 02:12:46 2004
@@ -1,4 +1,4 @@
-#===- tools/llc/Makefile ------------------------------*- Makefile -*-===##
+#===- tools/llc/Makefile -----------------------------------*- Makefile -*-===##
 # 
 #                     The LLVM Compiler Infrastructure
 #
@@ -6,12 +6,13 @@
 # the University of Illinois Open Source License. See LICENSE.TXT for details.
 # 
 ##===----------------------------------------------------------------------===##
+
 LEVEL = ../..
 TOOLNAME = llc
 USEDLIBS = cwriter \
            sparcv9 \
            x86 \
-           powerpc \
+           skeleton \
            selectiondag \
            sparcv9regalloc \
            sched \




From lattner at cs.uiuc.edu  Fri Jul 16 02:14:46 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri, 16 Jul 2004 02:14:46 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/PowerPC/Makefile PowerPC.h
	PowerPC.td PowerPCCodeEmitter.cpp PowerPCInstrInfo.cpp
	PowerPCInstrInfo.h PowerPCInstrs.td PowerPCJITInfo.h
	PowerPCReg.td PowerPCRegisterInfo.cpp PowerPCRegisterInfo.h
	PowerPCTargetMachine.cpp PowerPCTargetMachine.h README.txt 
Message-ID: <200407160714.CAA04465@apoc.cs.uiuc.edu>



Changes in directory llvm/lib/Target/PowerPC:

Makefile (r1.1) removed
PowerPC.h (r1.2) removed
PowerPC.td (r1.1) removed
PowerPCCodeEmitter.cpp (r1.1) removed
PowerPCInstrInfo.cpp (r1.3) removed
PowerPCInstrInfo.h (r1.2) removed
PowerPCInstrs.td (r1.1) removed
PowerPCJITInfo.h (r1.1) removed
PowerPCReg.td (r1.2) removed
PowerPCRegisterInfo.cpp (r1.5) removed
PowerPCRegisterInfo.h (r1.4) removed
PowerPCTargetMachine.cpp (r1.11) removed
PowerPCTargetMachine.h (r1.5) removed
README.txt (r1.2) removed

---
Log message:

The powerpc is now gone.  However it is now just known as the Skeleton target.



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



From lattner at cs.uiuc.edu  Fri Jul 16 02:17:19 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri, 16 Jul 2004 02:17:19 -0500
Subject: [llvm-commits] CVS: llvm-gcc/gcc/config/ia64/elf.h 
Message-ID: <200407160717.CAA04503@apoc.cs.uiuc.edu>



Changes in directory llvm-gcc/gcc/config/ia64:

elf.h updated: 1.1.1.1 -> 1.2

---
Log message:

*shred*


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

Index: llvm-gcc/gcc/config/ia64/elf.h
diff -u llvm-gcc/gcc/config/ia64/elf.h:1.1.1.1 llvm-gcc/gcc/config/ia64/elf.h:1.2
--- llvm-gcc/gcc/config/ia64/elf.h:1.1.1.1	Thu Jan  8 15:58:50 2004
+++ llvm-gcc/gcc/config/ia64/elf.h	Fri Jul 16 02:17:09 2004
@@ -5,6 +5,8 @@
 
 #define TARGET_VERSION fprintf (stderr, " (IA-64) ELF");
 
+#if 0
+
 /* A C string constant that tells the GNU CC driver program options to pass to
    the assembler.  It can also specify how to translate options you give to GNU
    CC into options for GNU CC to pass to the assembler.  */
@@ -46,5 +48,5 @@
 			 %{!symbolic: \
 			  %{pg:gcrt0.o%s}%{!pg:%{p:mcrt0.o%s}%{!p:crt0.o%s}}}}\
 			crti.o%s crtbegin.o%s"
-
+#endif
 /* End of elf.h */




From lattner at cs.uiuc.edu  Fri Jul 16 02:20:38 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri, 16 Jul 2004 02:20:38 -0500
Subject: [llvm-commits] CVS: llvm-gcc/gcc/config.gcc 
Message-ID: <200407160720.CAA04528@apoc.cs.uiuc.edu>



Changes in directory llvm-gcc/gcc:

config.gcc updated: 1.1.1.2 -> 1.2

---
Log message:

llvmgcc wants no extraparts


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

Index: llvm-gcc/gcc/config.gcc
diff -u llvm-gcc/gcc/config.gcc:1.1.1.2 llvm-gcc/gcc/config.gcc:1.2
--- llvm-gcc/gcc/config.gcc:1.1.1.2	Tue Jan 13 10:49:00 2004
+++ llvm-gcc/gcc/config.gcc	Fri Jul 16 02:20:28 2004
@@ -2205,6 +2205,8 @@
 	;;
 esac
 
+
+extra_parts=""
 # Support for --with-cpu and related options (and a few unrelated options,
 # too).
 	case "x$with_cpu" in




From alkis at cs.uiuc.edu  Fri Jul 16 05:18:20 2004
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Fri, 16 Jul 2004 05:18:20 -0500
Subject: [llvm-commits] CVS: llvm-java/test/Makefile.test 
Message-ID: <200407161018.FAA02174@zion.cs.uiuc.edu>



Changes in directory llvm-java/test:

Makefile.test updated: 1.2 -> 1.3

---
Log message:

Make linking step depend on runtime.ll.


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

Index: llvm-java/test/Makefile.test
diff -u llvm-java/test/Makefile.test:1.2 llvm-java/test/Makefile.test:1.3
--- llvm-java/test/Makefile.test:1.2	Thu Jul 15 06:28:44 2004
+++ llvm-java/test/Makefile.test	Fri Jul 16 05:18:10 2004
@@ -24,5 +24,5 @@
 	$(CLASS2LLVM) $* | $(LOPT) -mem2reg > $@
 
 #rule to link in runtime to raw bytecode
-Output/%.linked.bc: Output/%.raw.bc
-	$(LLVMTOOLCURRENT)/llvm-link$(EXEEXT) $< $(BUILD_SRC_ROOT)/runtime/runtime.bc -o $@
+Output/%.linked.bc: Output/%.raw.bc $(BUILD_SRC_ROOT)/runtime/runtime.bc
+	$(LLVMTOOLCURRENT)/llvm-link$(EXEEXT) $^ -o $@




From alkis at cs.uiuc.edu  Fri Jul 16 05:19:01 2004
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Fri, 16 Jul 2004 05:19:01 -0500
Subject: [llvm-commits] CVS: llvm-java/runtime/runtime.ll 
Message-ID: <200407161019.FAA02194@zion.cs.uiuc.edu>



Changes in directory llvm-java/runtime:

runtime.ll updated: 1.1 -> 1.2

---
Log message:

Add hooks for llvm_java_main and llvm_java_static_init.


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

Index: llvm-java/runtime/runtime.ll
diff -u llvm-java/runtime/runtime.ll:1.1 llvm-java/runtime/runtime.ll:1.2
--- llvm-java/runtime/runtime.ll:1.1	Thu Jul 15 06:28:44 2004
+++ llvm-java/runtime/runtime.ll	Fri Jul 16 05:18:51 2004
@@ -1,3 +1,13 @@
-"java/lang/Object" = type opaque
+"java/lang/Object" = type { }
 
-"java/lang/Object" = type { "java/lang/Object" }
+implementation
+
+declare void %llvm_java_static_init()
+declare int %llvm_java_main(int, sbyte**)
+
+int %main(int %argc, sbyte** %argv) {
+entry:
+        call void %llvm_java_static_init()
+        %result = call int %llvm_java_main(int %argc, sbyte** %argv)
+        ret int %result
+}




From alkis at cs.uiuc.edu  Fri Jul 16 07:04:38 2004
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Fri, 16 Jul 2004 07:04:38 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/iCall.cpp 
Message-ID: <200407161204.HAA15647@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

iCall.cpp updated: 1.25 -> 1.26

---
Log message:

Add convinience constructor for function calls with two args.


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

Index: llvm/lib/VMCore/iCall.cpp
diff -u llvm/lib/VMCore/iCall.cpp:1.25 llvm/lib/VMCore/iCall.cpp:1.26
--- llvm/lib/VMCore/iCall.cpp:1.25	Wed May 26 19:15:23 2004
+++ llvm/lib/VMCore/iCall.cpp	Fri Jul 16 07:04:28 2004
@@ -38,6 +38,21 @@
     Operands.push_back(Use(Params[i], this));
 }
 
+void CallInst::init(Value *Func, Value *Actual1, Value *Actual2)
+{
+  Operands.reserve(3);
+  Operands.push_back(Use(Func, this));
+  
+  const FunctionType *MTy = 
+    cast(cast(Func->getType())->getElementType());
+
+  assert((MTy->getNumParams() == 2 ||
+          (MTy->isVarArg() && MTy->getNumParams() == 0)) &&
+	 "Calling a function with bad signature");
+  Operands.push_back(Use(Actual1, this));
+  Operands.push_back(Use(Actual2, this));
+}
+
 void CallInst::init(Value *Func, Value *Actual)
 {
   Operands.reserve(2);
@@ -79,6 +94,22 @@
   init(Func, Params);
 }
 
+CallInst::CallInst(Value *Func, Value *Actual1, Value *Actual2,
+                   const std::string &Name, Instruction  *InsertBefore)
+  : Instruction(cast(cast(Func->getType())
+                                   ->getElementType())->getReturnType(),
+                Instruction::Call, Name, InsertBefore) {
+  init(Func, Actual1, Actual2);
+}
+
+CallInst::CallInst(Value *Func, Value *Actual1, Value *Actual2,
+                   const std::string &Name, BasicBlock  *InsertAtEnd)
+  : Instruction(cast(cast(Func->getType())
+                                   ->getElementType())->getReturnType(),
+                Instruction::Call, Name, InsertAtEnd) {
+  init(Func, Actual1, Actual2);
+}
+
 CallInst::CallInst(Value *Func, Value* Actual, const std::string &Name,
                    Instruction  *InsertBefore)
   : Instruction(cast(cast(Func->getType())




From alkis at cs.uiuc.edu  Fri Jul 16 07:04:38 2004
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Fri, 16 Jul 2004 07:04:38 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/iOther.h 
Message-ID: <200407161204.HAA15654@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

iOther.h updated: 1.46 -> 1.47

---
Log message:

Add convinience constructor for function calls with two args.


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

Index: llvm/include/llvm/iOther.h
diff -u llvm/include/llvm/iOther.h:1.46 llvm/include/llvm/iOther.h:1.47
--- llvm/include/llvm/iOther.h:1.46	Wed May 26 19:15:23 2004
+++ llvm/include/llvm/iOther.h	Fri Jul 16 07:04:28 2004
@@ -70,6 +70,7 @@
 class CallInst : public Instruction {
   CallInst(const CallInst &CI);
   void init(Value *Func, const std::vector &Params);
+  void init(Value *Func, Value *Actual1, Value *Actual2);
   void init(Value *Func, Value *Actual);
   void init(Value *Func);
 
@@ -79,7 +80,12 @@
   CallInst(Value *F, const std::vector &Par,
            const std::string &Name, BasicBlock *InsertAtEnd);
 
-  // Alternate CallInst ctors w/ one actual & no actuals, respectively.
+  // Alternate CallInst ctors w/ two actuals, w/ one actual and no
+  // actuals, respectively.
+  CallInst(Value *F, Value *Actual1, Value *Actual2,
+           const std::string& Name = "", Instruction *InsertBefore = 0);
+  CallInst(Value *F, Value *Actual1, Value *Actual2,
+           const std::string& Name, BasicBlock *InsertAtEnd);
   CallInst(Value *F, Value *Actual, const std::string& Name = "",
            Instruction *InsertBefore = 0);
   CallInst(Value *F, Value *Actual, const std::string& Name,




From alkis at cs.uiuc.edu  Fri Jul 16 07:05:14 2004
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Fri, 16 Jul 2004 07:05:14 -0500
Subject: [llvm-commits] CVS: llvm-java/lib/Compiler/Compiler.cpp 
Message-ID: <200407161205.HAA15870@zion.cs.uiuc.edu>



Changes in directory llvm-java/lib/Compiler:

Compiler.cpp updated: 1.59 -> 1.60

---
Log message:

Use newly added convinience constructor.


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

Index: llvm-java/lib/Compiler/Compiler.cpp
diff -u llvm-java/lib/Compiler/Compiler.cpp:1.59 llvm-java/lib/Compiler/Compiler.cpp:1.60
--- llvm-java/lib/Compiler/Compiler.cpp:1.59	Wed Jul 14 04:53:54 2004
+++ llvm-java/lib/Compiler/Compiler.cpp	Fri Jul 16 07:05:04 2004
@@ -633,13 +633,10 @@
             c = BinaryOperator::createSetLT(v1, v2, TMP, getBBAt(bcI));
             r = new SelectInst(c, ConstantSInt::get(Type::IntTy, -1), r, TMP,
                                getBBAt(bcI));
-            std::vector params;
-            params.push_back(v1);
-            params.push_back(v2);
             c = new CallInst(module_->getOrInsertFunction
                              ("llvm.isunordered",
                               Type::BoolTy, v1->getType(), v2->getType(), 0),
-                params, TMP, getBBAt(bcI));
+                v1, v2, TMP, getBBAt(bcI));
             r = new SelectInst(c,
                                ConstantSInt::get(Type::IntTy, valueIfUnordered),
                                r, TMP, getBBAt(bcI));




From alkis at cs.uiuc.edu  Fri Jul 16 07:17:42 2004
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Fri, 16 Jul 2004 07:17:42 -0500
Subject: [llvm-commits] CVS: llvm-java/lib/Compiler/Compiler.cpp 
Message-ID: <200407161217.HAA16415@zion.cs.uiuc.edu>



Changes in directory llvm-java/lib/Compiler:

Compiler.cpp updated: 1.60 -> 1.61

---
Log message:

Use llvm_java_main hooks to call the compiled class' main method.


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

Index: llvm-java/lib/Compiler/Compiler.cpp
diff -u llvm-java/lib/Compiler/Compiler.cpp:1.60 llvm-java/lib/Compiler/Compiler.cpp:1.61
--- llvm-java/lib/Compiler/Compiler.cpp:1.60	Fri Jul 16 07:05:04 2004
+++ llvm-java/lib/Compiler/Compiler.cpp	Fri Jul 16 07:17:32 2004
@@ -272,7 +272,7 @@
             return locals_[index];
         }
 
-        void compileMethodOnly(Module& module,
+        Function* compileMethodOnly(Module& module,
                                const std::string& classMethodDesc) {
             DEBUG(std::cerr << "Compiling method: " << classMethodDesc << '\n');
 
@@ -314,6 +314,8 @@
                 function->getBasicBlockList().push_front(prologue_);
                 new BranchInst(prologue_->getNext(), prologue_);
             }
+
+            return function;
         }
 
         std::pair
@@ -334,15 +336,18 @@
         }
 
     public:
-        void compileMethod(Module& module, const std::string& classMethodDesc) {
+        Function* compileMethod(Module& module,
+                                const std::string& classMethodDesc) {
             c2tMap_.insert(std::make_pair("java/lang/Object",
                                           OpaqueType::get()));
             module.addTypeName("java/lang/Object", c2tMap_["java/lang/Object"]);
-            compileMethodOnly(module, classMethodDesc);
+            Function* function = compileMethodOnly(module, classMethodDesc);
             for (unsigned i = 0; i != toCompileFunctions_.size(); ++i) {
                 Function* f = toCompileFunctions_[i];
                 compileMethodOnly(module, f->getName());
             }
+
+            return function;
         }
 
         void do_aconst_null(unsigned bcI) {
@@ -805,5 +810,20 @@
 {
     DEBUG(std::cerr << "Compiling class: " << className << '\n');
 
-    compilerImpl_->compileMethod(m, className + "/main([Ljava/lang/String;)I");
+    Function* main =
+        compilerImpl_->compileMethod(m,
+                                     className + "/main([Ljava/lang/String;)I");
+    Function* javaMain = m.getOrInsertFunction
+        ("llvm_java_main", Type::IntTy,
+         Type::IntTy, PointerType::get(PointerType::get(Type::SByteTy)), NULL);
+
+    BasicBlock* bb = new BasicBlock("entry", javaMain);
+    const FunctionType* mainTy = main->getFunctionType();
+    new ReturnInst(
+        new CallInst(main,
+                     // FIXME: Forward correct params from llvm_java_main
+                     llvm::Constant::getNullValue(mainTy->getParamType(0)),
+                     TMP,
+                     bb),
+                   bb);
 }




From criswell at cs.uiuc.edu  Fri Jul 16 09:20:31 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Fri, 16 Jul 2004 09:20:31 -0500
Subject: [llvm-commits] CVS: llvm/test/QMTest/expectations.darwin.qmr
	expectations.linux.qmr expectations.sunos.qmr
	expectations.unknown.qmr
Message-ID: <200407161420.JAA08775@choi.cs.uiuc.edu>



Changes in directory llvm/test/QMTest:

expectations.darwin.qmr updated: 1.3 -> 1.4
expectations.linux.qmr updated: 1.10 -> 1.11
expectations.sunos.qmr updated: 1.10 -> 1.11
expectations.unknown.qmr updated: 1.5 -> 1.6

---
Log message:

Regression.Assembler.2004-03-07-FunctionAddressAlignment is now expected
to pass.



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

Index: llvm/test/QMTest/expectations.darwin.qmr
diff -u llvm/test/QMTest/expectations.darwin.qmr:1.3 llvm/test/QMTest/expectations.darwin.qmr:1.4
--- llvm/test/QMTest/expectations.darwin.qmr:1.3	Mon Jun 21 10:05:48 2004
+++ llvm/test/QMTest/expectations.darwin.qmr	Fri Jul 16 09:20:20 2004
@@ -3,13 +3,13 @@
 qoq}q(U
_Result__kindqUtestqU_Result__outcomeqUPASSqU_Result__annotationsq}U_Result__idq	U0Regression.Assembler.2002-08-16-ConstExprInlinedq
 U_Result__contextq(cqm.test.context
 Context
-qo}q
(U_Context__propertiesq}U_Context__temporariesq}ubub.(hoq}q(hhhhh}h	U(Regression.Transforms.PruneEH.simpletestqh(ho}q(h}h}ubub.(hoq}q(hhhhh}h	U/Regression.CBackend.2002-08-19-HardConstantExprqh(ho}q(h}h}ubub.(hoq}q(hhhhh}h	URegression.Jello.test-shiftqh(ho}q(h}h}ubub.(hoq}q(hhhUFAILqh}h	U.Regression.Transforms.CorrelatedExprs.looptestqh(ho}q (h}h}ubub.(hoq!}q"(hhhhh}h	U-Regression.Linker.2003-08-23-GlobalVarLinkingq#h(ho}q$(h}h}ubub.(hoq%}q&(hhhhh}h	U?Regression.Transforms.Inline.2003-09-22-PHINodesInExceptionDestq'h(ho}q((h}h}ubub.(hoq)}q*(hhhhh}h	U,Regression.CFrontend.2003-02-12-NonlocalGotoq+h(ho}q,(h}h}ubub.(hoq-}q.(hhhhh}h	U2Regression.Transforms.FunctionResolve.retmismatch1q/h(ho}q0(h}h}ubub.(hoq1}q2(hhhhh}h	U>Regression.Transforms.LevelRaise.2002-05-02-BadCastEliminationq3h(ho}q4(h}h}ubub.(hoq5}q6(hhhhh}h	U8Regression.Transforms.ADCE.2003-01-22-!
 PredecessorProblemq7h(ho}q8(h}h}ubub.(hoq9}q:(hhhhh}h	U=Regression.Transforms.LevelRaise.2002-10-08-VarArgCallInfLoopq;h(ho}q<(h}h}ubub.(hoq=}q>(hhhhh}h	U5Regression.CFrontend.2003-07-22-ArrayAccessTypeSafetyq?h(ho}q@(h}h}ubub.(hoqA}qB(hhhhh}h	U8Regression.C++Frontend.2003-09-29-ArgumentNumberMismatchqCh(ho}qD(h}h}ubub.(hoqE}qF(hhhhh}h	U+Regression.CFrontend.2002-09-19-StarInLabelqGh(ho}qH(h}h}ubub.(hoqI}qJ(hhhhh}h	U.Regression.CFrontend.2003-08-23-LocalUnionTestqKh(ho}qL(h}h}ubub.(hoqM}qN(hhhhh}h	U"Regression.Jello.2003-06-05-PHIBugqOh(ho}qP(h}h}ubub.(hoqQ}qR(hhhUPASSqSh}h	U$Regression.BugPoint.misopt-basictestqTh(ho}qU(h}h}ubub.(hoqV}qW(hhhhh}h	U/Regression.Linker.2003-04-26-NullPtrLinkProblemqXh(ho}qY(h}h}ubub.(hoqZ}q[(hhhhh}h	U)Regression.Transforms.Reassociate.subtestq\h(ho}q](h}h}ubub.(hoq^}q_(hhhhh}h	U)Regression.Linker.2002-08-20-ConstantExprq`h(ho}qa(h}h}ubub.(h!
 oqb}qc(hhhhh}h	U=Regression.Transforms.Reassociate.2002-05-15-Agr
essiveSubMoveqdh(ho}qe(h}h}ubub.(hoqf}qg(hhhhh}h	UARegression.Transforms.CorrelatedExprs.2002-10-07-DominatorProblemqhh(ho}qi(h}h}ubub.(hoqj}qk(hhhhh}h	U3Regression.Transforms.PiNodeInserter.substitutetestqlh(ho}qm(h}h}ubub.(hoqn}qo(hhhhh}h	U4Regression.Transforms.SCCP.2003-08-26-InvokeHandlingqph(ho}qq(h}h}ubub.(hoqr}qs(hhhhh}h	U$Regression.Jello.2003-01-04-LoopTestqth(ho}qu(h}h}ubub.(hoqv}qw(hhhhh}h	U1Regression.Assembler.2002-04-04-PureVirtMethCall2qxh(ho}qy(h}h}ubub.(hoqz}q{(hhhhh}h	U)Regression.CFrontend.2002-07-14-MiscTestsq|h(ho}q}(h}h}ubub.(hoq~}q(hhhhh}h	U(hhhhh}h	U=Regression.Transforms.LevelRaise.2002-10-08-VarArgCallInfLoopq?h(ho}q@(h}h}ubub.(hoqA}qB(hhhhh}h	U5Regression.CFrontend.2003-07-22-ArrayAccessTypeSafetyqCh(ho}qD(h}h}ubub.(hoqE}qF(hhhhh}h	U8Regression.C++Frontend.2003-09-29-ArgumentNumberMismatchqGh(ho}qH(h}h}ubub.(hoqI}qJ(hhhhh}h	U+Regression.CFrontend.2002-09-19-StarInLabelqKh(ho}qL(h}h}ubub.(hoqM}qN(hhhhh}h	U.Regression.CFrontend.2003-08-23-LocalUnionTestqOh(ho}qP(h}h}ubub.(hoqQ}qR(hhhhh}h	U/Regression.Linker.2003-04-26-NullPtrLinkProblemqSh(ho}qT(h}h}ubub.(hoqU}qV(hhhhh}h	U)Regression.Transforms.Reassociate.subtestqWh(ho}qX(h}h}ubub.(hoqY}qZ(hhhhh}h	U)Regression.Linker.2002-08-20-ConstantExprq[h(ho}q\(h}h}ubub.(hoq]}q^(hhhhh}h	U=Regression.Transforms.Reassociate.2002-05-15-AgressiveSub!
 Moveq_h(ho}q`(h}h}ubub.(hoqa}qb(hhhhh}h	UARegression.Transfo
rms.CorrelatedExprs.2002-10-07-DominatorProblemqch(ho}qd(h}h}ubub.(hoqe}qf(hhhhh}h	U3Regression.Transforms.PiNodeInserter.substitutetestqgh(ho}qh(h}h}ubub.(hoqi}qj(hhhhh}h	U4Regression.Transforms.SCCP.2003-08-26-InvokeHandlingqkh(ho}ql(h}h}ubub.(hoqm}qn(hhhhh}h	U-Regression.CFrontend.2002-02-18-64bitConstantqoh(ho}qp(h}h}ubub.(hoqq}qr(hhhhh}h	U1Regression.Assembler.2002-04-04-PureVirtMethCall2qsh(ho}qt(h}h}ubub.(hoqu}qv(hhhhh}h	U(Regression.Reoptimizer.BinInterface.testqwh(ho}qx(h}h}ubub.(hoqy}qz(hhhhh}h	URegression.Transforms.CorrelatedExprs.2002-10-08-DominatorTestq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	URegression.Linker!
 .testlink2q?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U(Regression.Transforms.GCSE.RLE-Eliminateq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U4Regression.C++Frontend.2003-09-30-NestedFunctionDeclq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U=Regression.Transforms.CorrelatedExprs.2002-09-23-PHIUpdateBugq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U7Regression.Transforms.LowerSwitch.2003-05-01-PHIProblemq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U2Regression.Transforms.ADCE.2003-09-15-InfLoopCrashq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U*Regression.Transforms.DSAnalysis.recursionq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U)Regression.Jello.2003-01-15-AlignmentTestq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhUFAILq?h}h	UFeature.mc.simplecalltestq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U*Regression.CFrontend.2002-04-07-SwitchStmtq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U!Regression.Jello.2003-01-10-FUCOMq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U(Reg!
 ression.CFrontend.2003-08-21-StmtExprq?h(ho}q?(h}h}ubub.(hoq?}q?(
hhhUPASSq?h}h	U*Regression.Transforms.ScalarRepl.basictestq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhh"h}h	U6Regression.Transforms.LevelRaise.2002-02-11-ArrayShapeq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U1Regression.Assembler.2003-03-03-DuplicateConstantq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U.Regression.Transforms.ModuloSched.arith-simpleq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U%Regression.Transforms.InstCombine.andq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U)Regression.Other.2002-08-02-DomSetProblemq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U6Regression.Assembler.2002-07-25-ParserAssertionFailureq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U6Regression.Transforms.LevelRaise.2002-03-20-BadCodegenq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U%Regression.Transforms.ADCE.basictest1q?h(ho}q?(h}h}ubub.(hoq?}q?(hhhUFAILq?h}h	UFeature.mc.recursivetypeq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U$Regression.Transforms.InstCombine.orq?h(ho!
 }q?(h}h}ubub.(hoq?}q?(hhhhh}h	U Regression.Verifier.AmbiguousPhiq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U'Regression.Analysis.DSGraph.constantizeq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U6Regression.Transforms.GlobalDCE.2002-08-17-FunctionDGEq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U4Regression.Transforms.SimplifyCFG.2002-06-24-PHINodeq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U(Regression.Linker.2003-05-15-TypeProblemq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U#Regression.Transforms.SCCP.sccptestq?h(ho}q?(h}h}ubub.(hor+++++++++	\ No newline at end of file


Index: llvm/test/QMTest/expectations.linux.qmr
diff -u llvm/test/QMTest/expectations.linux.qmr:1.10 llvm/test/QMTest/expectations.linux.qmr:1.11
--- llvm/test/QMTest/expectations.linux.qmr:1.10	Mon Jun 21 10:05:48 2004
+++ llvm/test/QMTest/expectations.linux.qmr	Fri Jul 16 09:20:20 2004
@@ -3,13 +3,13 @@
 qoq}q(U
_Result__kindqUtestqU_Result__outcomeqUPASSqU_Result__annotationsq}U_Result__idq	U0Regression.Assembler.2002-08-16-ConstExprInlinedq
 U_Result__contextq(cqm.test.context
 Context
-qo}q
(U_Context__propertiesq}U_Context__temporariesq}ubub.(hoq}q(hhhhh}h	U(Regression.Transforms.PruneEH.simpletestqh(ho}q(h}h}ubub.(hoq}q(hhhhh}h	U/Regression.CBackend.2002-08-19-HardConstantExprqh(ho}q(h}h}ubub.(hoq}q(hhhhh}h	URegression.Jello.test-shiftqh(ho}q(h}h}ubub.(hoq}q(hhhhh}h	U9Regression.Transforms.Mem2Reg.2003-10-05-DeadPHIInsertionqh(ho}q(h}h}ubub.(hoq }q!(hhhUFAILq"h}h	U.Regression.Transforms.CorrelatedExprs.looptestq#h(ho}q$(h}h}ubub.(hoq%}q&(hhhhh}h	U-Regression.Linker.2003-08-23-GlobalVarLinkingq'h(ho}q((h}h}ubub.(hoq)}q*(hhhhh}h	U?Regression.Transforms.Inline.2003-09-22-PHINodesInExceptionDestq+h(ho}q,(h}h}ubub.(hoq-}q.(hhhh"h}h	U,Regression.CFrontend.2003-02-12-NonlocalGotoq/h(ho}q0(h}h}ubub.(hoq1}q2(hhhhh}h	U2Regression.Transforms.FunctionResolve.retmismatch1q3h(ho}q4(h}h}ubub.(hoq5}q6(hhhhh}h	U8Regression.Transforms.ADCE.2003-01-22-Prede!
 cessorProblemq7h(ho}q8(h}h}ubub.(hoq9}q:(hhhhh}h	U=Regression.Transforms.LevelRaise.2002-10-08-VarArgCallInfLoopq;h(ho}q<(h}h}ubub.(hoq=}q>(hhhhh}h	U Regression.Reoptimizer.ticm.ticmq?h(ho}q@(h}h}ubub.(hoqA}qB(hhhhh}h	U8Regression.C++Frontend.2003-09-29-ArgumentNumberMismatchqCh(ho}qD(h}h}ubub.(hoqE}qF(hhhhh}h	U+Regression.CFrontend.2002-09-19-StarInLabelqGh(ho}qH(h}h}ubub.(hoqI}qJ(hhhhh}h	U.Regression.CFrontend.2003-08-23-LocalUnionTestqKh(ho}qL(h}h}ubub.(hoqM}qN(hhhhh}h	U/Regression.Linker.2003-04-26-NullPtrLinkProblemqOh(ho}qP(h}h}ubub.(hoqQ}qR(hhhhh}h	U)Regression.Transforms.Reassociate.subtestqSh(ho}qT(h}h}ubub.(hoqU}qV(hhhhh}h	U)Regression.Linker.2002-08-20-ConstantExprqWh(ho}qX(h}h}ubub.(hoqY}qZ(hhhhh}h	U=Regression.Transforms.Reassociate.2002-05-15-AgressiveSubMoveq[h(ho}q\(h}h}ubub.(hoq]}q^(hhhhh}h	UARegression.Transforms.CorrelatedExprs.2002-10-07-DominatorProblemq_!
 h(ho}q`(h}h}ubub.(hoqa}qb(hhhhh}h	U3Regression.Transforms.Pi
NodeInserter.substitutetestqch(ho}qd(h}h}ubub.(hoqe}qf(hhhhh}h	U4Regression.Transforms.SCCP.2003-08-26-InvokeHandlingqgh(ho}qh(h}h}ubub.(hoqi}qj(hhhhh}h	U-Regression.CFrontend.2002-02-18-64bitConstantqkh(ho}ql(h}h}ubub.(hoqm}qn(hhhhh}h	U1Regression.Assembler.2002-04-04-PureVirtMethCall2qoh(ho}qp(h}h}ubub.(hoqq}qr(hhhhh}h	U(Regression.Reoptimizer.BinInterface.testqsh(ho}qt(h}h}ubub.(hoqu}qv(hhhhh}h	U(hhhhh}h	U8Regression.C++Frontend.2003-09-29-ArgumentNumberMismatchq?h(ho}q@(h}h}ubub.(hoqA}qB(hhhhh}h	U+Regression.CFrontend.2002-09-19-StarInLabelqCh(ho}qD(h}h}ubub.(hoqE}qF(hhhhh}h	U.Regression.CFrontend.2003-08-23-LocalUnionTestqGh(ho}qH(h}h}ubub.(hoqI}qJ(hhhhh}h	U-Regression.C++Frontend.2003-08-28-SaveExprBugqKh(ho}qL(h}h}ubub.(hoqM}qN(hhhhh}h	U"Regression.Jello.2003-06-05-PHIBugqOh(ho}qP(h}h}ubub.(hoqQ}qR(hhhhh}h	U/Regression.Linker.2003-04-26-NullPtrLinkProblemqSh(ho}qT(h}h}ubub.(hoqU}qV(hhhhh}h	U)Regression.Transforms.Reassociate.subtestqWh(ho}qX(h}h}ubub.(hoqY}qZ(hhhhh}h	U)Regression.Linker.2002-08-20-ConstantExprq[h(ho}q\(h}h}ubub.(hoq]}q^(hhhhh}h	U=Regression.Transforms.Reassociate.2002-05-15-AgressiveSubMoveq_h(ho}q`(h}h}ubub.(!
 hoqa}qb(hhhhh}h	UARegression.Transforms.CorrelatedExprs.2002-10-
07-DominatorProblemqch(ho}qd(h}h}ubub.(hoqe}qf(hhhhh}h	U>Regression.Transforms.InstCombine.2003-06-22-ConstantExprCrashqgh(ho}qh(h}h}ubub.(hoqi}qj(hhhhh}h	U3Regression.Transforms.PiNodeInserter.substitutetestqkh(ho}ql(h}h}ubub.(hoqm}qn(hhhhh}h	U4Regression.Transforms.SCCP.2003-08-26-InvokeHandlingqoh(ho}qp(h}h}ubub.(hoqq}qr(hhhhh}h	U$Regression.Jello.2003-01-04-LoopTestqsh(ho}qt(h}h}ubub.(hoqu}qv(hhhhh}h	U1Regression.Assembler.2002-04-04-PureVirtMethCall2qwh(ho}qx(h}h}ubub.(hoqy}qz(hhhhh}h	U)Regression.CFrontend.2002-07-14-MiscTestsq{h(ho}q|(h}h}ubub.(hoq}}q~(hhhhh}h	U(hhhhh}h	U8Regression.C++Frontend.2003-09-29-ArgumentNumberMismatchq?h(ho}q@(h}h}ubub.(hoqA}qB(hhhhh}h	U+Regression.CFrontend.2002-09-19-StarInLabelqCh(ho}qD(h}h}ubub.(hoqE}qF(hhhhh}h	U.Regression.CFrontend.2003-08-23-LocalUnionTestqGh(ho}qH(h}h}ubub.(hoqI}qJ(hhhhh}h	U-Regression.C++Frontend.2003-08-28-SaveExprBugqKh(ho}qL(h}h}ubub.(hoqM}qN(hhhhh}h	U"Regression.Jello.2003-06-05-PHIBugqOh(ho}qP(h}h}ubub.(hoqQ}qR(hhhhh}h	U/Regression.Linker.2003-04-26-NullPtrLinkProblemqSh(ho}qT(h}h}ubub.(hoqU}qV(hhhhh}h	U)Regression.Transforms.Reassociate.subtestqWh(ho}qX(h}h}ubub.(hoqY}qZ(hhhhh}h	U)Regression.Linker.2002-08-20-ConstantExprq[h(ho}q\(h}h}ubub.(hoq]}q^(hhhhh}h	U=Regression.Transforms.Reassociate.2002-05-15-AgressiveSubMoveq_h(ho}q`(h}h}ubub.(!
 hoqa}qb(hhhhh}h	UARegression.Transforms.CorrelatedExprs.2002-10-
07-DominatorProblemqch(ho}qd(h}h}ubub.(hoqe}qf(hhhhh}h	U>Regression.Transforms.InstCombine.2003-06-22-ConstantExprCrashqgh(ho}qh(h}h}ubub.(hoqi}qj(hhhhh}h	U3Regression.Transforms.PiNodeInserter.substitutetestqkh(ho}ql(h}h}ubub.(hoqm}qn(hhhhh}h	U4Regression.Transforms.SCCP.2003-08-26-InvokeHandlingqoh(ho}qp(h}h}ubub.(hoqq}qr(hhhhh}h	U$Regression.Jello.2003-01-04-LoopTestqsh(ho}qt(h}h}ubub.(hoqu}qv(hhhhh}h	U1Regression.Assembler.2002-04-04-PureVirtMethCall2qwh(ho}qx(h}h}ubub.(hoqy}qz(hhhhh}h	U)Regression.CFrontend.2002-07-14-MiscTestsq{h(ho}q|(h}h}ubub.(hoq}}q~(hhhhh}h	U(hhhhh}h	U=Regression.Transforms.LevelRaise.2002-10-08-VarArgCallInfLoopq?h(ho}q@(h}h}ubub.(hoqA}qB(hhhhh}h	U5Regression.CFrontend.2003-07-22-ArrayAccessTypeSafetyqCh(ho}qD(h}h}ubub.(hoqE}qF(hhhhh}h	U8Regression.C++Frontend.2003-09-29-ArgumentNumberMismatchqGh(ho}qH(h}h}ubub.(hoqI}qJ(hhhhh}h	U+Regression.CFrontend.2002-09-19-StarInLabelqKh(ho}qL(h}h}ubub.(hoqM}qN(hhhhh}h	U.Regression.CFrontend.2003-08-23-LocalUnionTestqOh(ho}qP(h}h}ubub.(hoqQ}qR(hhhhh}h	U/Regression.Linker.2003-04-26-NullPtrLinkProblemqSh(ho}qT(h}h}ubub.(hoqU}qV(hhhhh}h	U)Regression.Transforms.Reassociate.subtestqWh(ho}qX(h}h}ubub.(hoqY}qZ(hhhhh}h	U)Regression.Linker.2002-08-20-ConstantExprq[h(ho}q\(h}h}ubub.(hoq]}q^(hhhhh}h	U=Regression.Transforms.Reassociate.2002-05-15-Ag!
 ressiveSubMoveq_h(ho}q`(h}h}ubub.(hoqa}qb(hhhhh}h	UARegressi
on.Transforms.CorrelatedExprs.2002-10-07-DominatorProblemqch(ho}qd(h}h}ubub.(hoqe}qf(hhhhh}h	U3Regression.Transforms.PiNodeInserter.substitutetestqgh(ho}qh(h}h}ubub.(hoqi}qj(hhhhh}h	U4Regression.Transforms.SCCP.2003-08-26-InvokeHandlingqkh(ho}ql(h}h}ubub.(hoqm}qn(hhhhh}h	U-Regression.CFrontend.2002-02-18-64bitConstantqoh(ho}qp(h}h}ubub.(hoqq}qr(hhhhh}h	U1Regression.Assembler.2002-04-04-PureVirtMethCall2qsh(ho}qt(h}h}ubub.(hoqu}qv(hhhhh}h	U(Regression.Reoptimizer.BinInterface.testqwh(ho}qx(h}h}ubub.(hoqy}qz(hhhhh}h	U(hhhhh}h	U Regression.Reoptimizer.ticm.ticmq?h(ho}q@(h}h}ubub.(hoqA}qB(hhhhh}h	U8Regression.C++Frontend.2003-09-29-ArgumentNumberMismatchqCh(ho}qD(h}h}ubub.(hoqE}qF(hhhhh}h	U+Regression.CFrontend.2002-09-19-StarInLabelqGh(ho}qH(h}h}ubub.(hoqI}qJ(hhhhh}h	U.Regression.CFrontend.2003-08-23-LocalUnionTestqKh(ho}qL(h}h}ubub.(hoqM}qN(hhhhh}h	U/Regression.Linker.2003-04-26-NullPtrLinkProblemqOh(ho}qP(h}h}ubub.(hoqQ}qR(hhhhh}h	U)Regression.Transforms.Reassociate.subtestqSh(ho}qT(h}h}ubub.(hoqU}qV(hhhhh}h	U)Regression.Linker.2002-08-20-ConstantExprqWh(ho}qX(h}h}ubub.(hoqY}qZ(hhhhh}h	U=Regression.Transforms.Reassociate.2002-05-15-AgressiveSubMoveq[h(ho}q\(h}h}ubub.(hoq]}q^(hhhhh}h	UARegression.Transforms.CorrelatedExprs.2002-10-07-DominatorProblemq_!
 h(ho}q`(h}h}ubub.(hoqa}qb(hhhhh}h	U3Regression.Transforms.Pi
NodeInserter.substitutetestqch(ho}qd(h}h}ubub.(hoqe}qf(hhhhh}h	U4Regression.Transforms.SCCP.2003-08-26-InvokeHandlingqgh(ho}qh(h}h}ubub.(hoqi}qj(hhhhh}h	U-Regression.CFrontend.2002-02-18-64bitConstantqkh(ho}ql(h}h}ubub.(hoqm}qn(hhhhh}h	U1Regression.Assembler.2002-04-04-PureVirtMethCall2qoh(ho}qp(h}h}ubub.(hoqq}qr(hhhhh}h	U(Regression.Reoptimizer.BinInterface.testqsh(ho}qt(h}h}ubub.(hoqu}qv(hhhhh}h	URegression.Transforms.CorrelatedExprs.2002-10-08-DominatorTestq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	URegression.Linker.testlink2q?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U(Regression.Transforms.GCSE.RLE-Eliminateq?h(ho}q?(h}h}ubu!
 b.(hoq?}q?(hhhhh}h	U4Regression.C++Frontend.2003-09-30-NestedFunctionDeclq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U=Regression.Transforms.CorrelatedExprs.2002-09-23-PHIUpdateBugq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U7Regression.Transforms.LowerSwitch.2003-05-01-PHIProblemq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U2Regression.Transforms.ADCE.2003-09-15-InfLoopCrashq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U*Regression.Transforms.DSAnalysis.recursionq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U)Regression.Jello.2003-01-15-AlignmentTestq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhUFAILq?h}h	UFeature.mc.simplecalltestq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U*Regression.CFrontend.2002-04-07-SwitchStmtq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U!Regression.Jello.2003-01-10-FUCOMq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U(Regression.CFrontend.2003-08-21-StmtExprq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhUPASSq?h}h	U*Regression.Transforms.Scalar!
 Repl.basictestq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhh"h}h	U6Regressi
on.Transforms.LevelRaise.2002-02-11-ArrayShapeq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U1Regression.Assembler.2003-03-03-DuplicateConstantq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U.Regression.Transforms.ModuloSched.arith-simpleq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U%Regression.Transforms.InstCombine.andq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U)Regression.Other.2002-08-02-DomSetProblemq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U6Regression.Assembler.2002-07-25-ParserAssertionFailureq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U6Regression.Transforms.LevelRaise.2002-03-20-BadCodegenq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U6Regression.Transforms.ADCE.2002-07-17-AssertionFailureq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhUFAILq?h}h	UFeature.mc.recursivetypeq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U$Regression.Transforms.InstCombine.orq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U Regression.Verifier.AmbiguousPhiq?h(ho}q?(h}h}ubub.(hoq?}!
 q?(hhhhh}h	U'Regression.Analysis.DSGraph.constantizeq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U6Regression.Transforms.GlobalDCE.2002-08-17-FunctionDGEq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U4Regression.Transforms.SimplifyCFG.2002-06-24-PHINodeq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U(Regression.Linker.2003-05-15-TypeProblemq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U#Regression.Transforms.SCCP.sccptestq?h(ho}q?(h}h}ubub.(hoq?}q?(hhhhh}h	U2Regression.Transforms.FunctionResolve.retmismatch3q?h(ho}q?(h}h}ubub.(hor---------	\ No newline at end of file
+qo}q
(U_Context__propertiesq}U_Context__temporariesq}ubub.(hoq}q(hhhhh}h	U(Regression.Transforms.PruneEH.simpletestqh(ho}q(h}h}ubub.(hoq}q(hhhhh}h	U/Regression.CBackend.2002-08-19-HardConstantExprqh(ho}q(h}h}ubub.(hoq}q(hhhhh}h	URegression.Jello.test-shiftqh(ho}q(h}h}ubub.(hoq}q(hhhUFAILqh}h	U.Regression.Transforms.CorrelatedExprs.looptestqh(ho}q (h}h}ubub.(hoq!}q"(hhhhh}h	U-Regression.Linker.2003-08-23-GlobalVarLinkingq#h(ho}q$(h}h}ubub.(hoq%}q&(hhhhh}h	U?Regression.Transforms.Inline.2003-09-22-PHINodesInExceptionDestq'h(ho}q((h}h}ubub.(hoq)}q*(hhhhh}h	U,Regression.CFrontend.2003-02-12-NonlocalGotoq+h(ho}q,(h}h}ubub.(hoq-}q.(hhhhh}h	U2Regression.Transforms.FunctionResolve.retmismatch1q/h(ho}q0(h}h}ubub.(hoq1}q2(hhhhh}h	U>Regression.Transforms.LevelRaise.2002-05-02-BadCastEliminationq3h(ho}q4(h}h}ubub.(hoq5}q6(hhhhh}h	U8Regression.Transforms.ADCE.2003-01-22-!
 PredecessorProblemq7h(ho}q8(h}h}ubub.(hoq9}q:(hhhhh}h	U=Regression.Transforms.LevelRaise.2002-10-08-VarArgCallInfLoopq;h(ho}q<(h}h}ubub.(hoq=}q>(hhhhh}h	U Regression.Reoptimizer.ticm.ticmq?h(ho}q@(h}h}ubub.(hoqA}qB(hhhhh}h	U8Regression.C++Frontend.2003-09-29-ArgumentNumberMismatchqCh(ho}qD(h}h}ubub.(hoqE}qF(hhhhh}h	U+Regression.CFrontend.2002-09-19-StarInLabelqGh(ho}qH(h}h}ubub.(hoqI}qJ(hhhhh}h	U.Regression.CFrontend.2003-08-23-LocalUnionTestqKh(ho}qL(h}h}ubub.(hoqM}qN(hhhhh}h	U"Regression.Jello.2003-06-05-PHIBugqOh(ho}qP(h}h}ubub.(hoqQ}qR(hhhUPASSqSh}h	U$Regression.BugPoint.misopt-basictestqTh(ho}qU(h}h}ubub.(hoqV}qW(hhhhh}h	U/Regression.Linker.2003-04-26-NullPtrLinkProblemqXh(ho}qY(h}h}ubub.(hoqZ}q[(hhhhh}h	U)Regression.Transforms.Reassociate.subtestq\h(ho}q](h}h}ubub.(hoq^}q_(hhhhh}h	U)Regression.Linker.2002-08-20-ConstantExprq`h(ho}qa(h}h}ubub.(hoqb}qc(hhhhh}h	U!
 =Regression.Transforms.Reassociate.2002-05-15-AgressiveSubMoveqdh(ho
}qe(h}h}ubub.(hoqf}qg(hhhhh}h	UARegression.Transforms.CorrelatedExprs.2002-10-07-DominatorProblemqhh(ho}qi(h}h}ubub.(hoqj}qk(hhhhh}h	U3Regression.Transforms.PiNodeInserter.substitutetestqlh(ho}qm(h}h}ubub.(hoqn}qo(hhhhh}h	U4Regression.Transforms.SCCP.2003-08-26-InvokeHandlingqph(ho}qq(h}h}ubub.(hoqr}qs(hhhhh}h	U$Regression.Jello.2003-01-04-LoopTestqth(ho}qu(h}h}ubub.(hoqv}qw(hhhhh}h	U1Regression.Assembler.2002-04-04-PureVirtMethCall2qxh(ho}qy(h}h}ubub.(hoqz}q{(hhhhh}h	U)Regression.CFrontend.2002-07-14-MiscTestsq|h(ho}q}(h}h}ubub.(hoq~}q(hhhhh}h	U



Changes in directory llvm/lib/Target/Skeleton:

README.txt updated: 1.1 -> 1.2

---
Log message:

Fix grammar.


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

Index: llvm/lib/Target/Skeleton/README.txt
diff -u llvm/lib/Target/Skeleton/README.txt:1.1 llvm/lib/Target/Skeleton/README.txt:1.2
--- llvm/lib/Target/Skeleton/README.txt:1.1	Fri Jul 16 01:12:28 2004
+++ llvm/lib/Target/Skeleton/README.txt	Fri Jul 16 12:40:28 2004
@@ -2,7 +2,7 @@
 --------------------
 
 This directory contains a very simple skeleton that can be used as the
-starting point for new LLVM targets.  Basically you can take this code
+starting point for new LLVM targets.  Basically, you can take this code
 and start filling stuff in.
 
 This directory contains mainly stubs and placeholders; there is no binary 
@@ -16,4 +16,3 @@
 
 As always, if you're starting a new port, please mention it on the llvmdev
 list, and if you have questions, that is a great place to ask.
-




From brukman at cs.uiuc.edu  Fri Jul 16 13:11:17 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Fri, 16 Jul 2004 13:11:17 -0500
Subject: [llvm-commits] 
	CVS: llvm/test/Programs/SingleSource/Benchmarks/Shootout/ary3.c
Message-ID: <200407161811.NAA27106@zion.cs.uiuc.edu>



Changes in directory llvm/test/Programs/SingleSource/Benchmarks/Shootout:

ary3.c updated: 1.3 -> 1.4

---
Log message:

Remove unneeded  tag from comments.


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

Index: llvm/test/Programs/SingleSource/Benchmarks/Shootout/ary3.c
diff -u llvm/test/Programs/SingleSource/Benchmarks/Shootout/ary3.c:1.3 llvm/test/Programs/SingleSource/Benchmarks/Shootout/ary3.c:1.4
--- llvm/test/Programs/SingleSource/Benchmarks/Shootout/ary3.c:1.3	Tue Jun  8 12:21:42 2004
+++ llvm/test/Programs/SingleSource/Benchmarks/Shootout/ary3.c	Fri Jul 16 13:11:07 2004
@@ -1,11 +1,11 @@
 /* -*- mode: c -*-
- * $Id: ary3.c,v 1.3 2004/06/08 17:21:42 lattner Exp $
+ * $Id: ary3.c,v 1.4 2004/07/16 18:11:07 brukman Exp $
  * http://www.bagley.org/~doug/shootout/
  *
  * this program is modified from:
  *   http://cm.bell-labs.com/cm/cs/who/bwk/interps/pap.html
  * Timing Trials, or, the Trials of Timing: Experiments with Scripting
- * and User-Interface Languages by Brian W. Kernighan and
+ * and User-Interface Languages by Brian W. Kernighan and
  * Christopher J. Van Wyk.
  *
  * I added free() to deallocate memory.




From brukman at cs.uiuc.edu  Fri Jul 16 14:45:56 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Fri, 16 Jul 2004 14:45:56 -0500
Subject: [llvm-commits] CVS: llvm/lib/Support/ToolRunner.cpp 
Message-ID: <200407161945.OAA27876@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Support:

ToolRunner.cpp updated: 1.24 -> 1.25

---
Log message:

Correctly build shared objects on MacOS X for debugging code generators


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

Index: llvm/lib/Support/ToolRunner.cpp
diff -u llvm/lib/Support/ToolRunner.cpp:1.24 llvm/lib/Support/ToolRunner.cpp:1.25
--- llvm/lib/Support/ToolRunner.cpp:1.24	Tue May  4 17:02:41 2004
+++ llvm/lib/Support/ToolRunner.cpp	Fri Jul 16 14:45:45 2004
@@ -403,7 +403,11 @@
     InputFile.c_str(),           // Specify the input filename...
 #if defined(sparc) || defined(__sparc__) || defined(__sparcv9)
     "-G",                        // Compile a shared library, `-G' for Sparc
-#else                             
+#elif (defined(__POWERPC__) || defined(__ppc__)) && defined(__APPLE__)
+    "-dynamiclib",               // `-dynamiclib' for MacOS X/PowerPC
+    "-fno-common",               // allow global vars w/o initializers to live
+                                 // in data segment, rather than generating blocks
+#else
     "-shared",                   // `-shared' for Linux/X86, maybe others
 #endif
     "-o", OutputFile.c_str(),    // Output to the right filename...




From gaeke at cs.uiuc.edu  Fri Jul 16 16:40:43 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Fri, 16 Jul 2004 16:40:43 -0500 (CDT)
Subject: [llvm-commits] CVS: llvm/runtime/GC/SemiSpace/semispace.c 
Message-ID: <200407162140.QAA20267@kain.cs.uiuc.edu>



Changes in directory llvm/runtime/GC/SemiSpace:

semispace.c updated: 1.3 -> 1.4

---
Log message:

Fix warning on 64-bit machines


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

Index: llvm/runtime/GC/SemiSpace/semispace.c
diff -u llvm/runtime/GC/SemiSpace/semispace.c:1.3 llvm/runtime/GC/SemiSpace/semispace.c:1.4
--- llvm/runtime/GC/SemiSpace/semispace.c:1.3	Thu May 27 00:51:31 2004
+++ llvm/runtime/GC/SemiSpace/semispace.c	Fri Jul 16 16:40:32 2004
@@ -75,7 +75,7 @@
 
 
 static void process_pointer(void **Root, void *Meta) {
-  printf("process_root[0x%X] = 0x%X\n", (unsigned) Root, (unsigned) *Root);
+  printf("process_root[0x%p] = 0x%p\n", (void*) Root, (void*) *Root);
 }
 
 void llvm_gc_collect() {




From lattner at cs.uiuc.edu  Fri Jul 16 20:57:37 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri, 16 Jul 2004 20:57:37 -0500
Subject: [llvm-commits] CVS: llvm-gcc/gcc/config/ia64/ia64.h 
Message-ID: <200407170157.UAA15515@apoc.cs.uiuc.edu>



Changes in directory llvm-gcc/gcc/config/ia64:

ia64.h updated: 1.1.1.1 -> 1.2

---
Log message:

Hack to get vtables working with LLVM.  This breaks ABI compliance with the
standard C++ compilers, but it should work for now.


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

Index: llvm-gcc/gcc/config/ia64/ia64.h
diff -u llvm-gcc/gcc/config/ia64/ia64.h:1.1.1.1 llvm-gcc/gcc/config/ia64/ia64.h:1.2
--- llvm-gcc/gcc/config/ia64/ia64.h:1.1.1.1	Thu Jan  8 15:58:50 2004
+++ llvm-gcc/gcc/config/ia64/ia64.h	Fri Jul 16 20:57:26 2004
@@ -390,6 +390,7 @@
    For reasons known only to HP, the vtable entries (as opposed to
    normal function descriptors) are 16 bytes wide in 32-bit mode as
    well, even though the 3rd and 4th words are unused.  */
+#if 0 /* FIXME: DISABLED BY LLVM */
 #define TARGET_VTABLE_USES_DESCRIPTORS (TARGET_ILP32 ? 4 : 2)
 
 /* Due to silliness in the HPUX linker, vtable entries must be
@@ -400,6 +401,7 @@
 /* Due to the above, we need extra padding for the data entries below 0
    to retain the alignment of the descriptors.  */
 #define TARGET_VTABLE_DATA_ENTRY_DISTANCE (TARGET_ILP32 ? 2 : 1)
+#endif  /* end of fixme */
 
 /* Layout of Source Language Data Types */
 




From lattner at cs.uiuc.edu  Fri Jul 16 21:04:51 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri, 16 Jul 2004 21:04:51 -0500
Subject: [llvm-commits] CVS: llvm/docs/ReleaseNotes.html 
Message-ID: <200407170204.VAA15553@apoc.cs.uiuc.edu>



Changes in directory llvm/docs:

ReleaseNotes.html updated: 1.217 -> 1.218

---
Log message:

Add note about IA64 C++


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

Index: llvm/docs/ReleaseNotes.html
diff -u llvm/docs/ReleaseNotes.html:1.217 llvm/docs/ReleaseNotes.html:1.218
--- llvm/docs/ReleaseNotes.html:1.217	Wed Jul 14 23:30:35 2004
+++ llvm/docs/ReleaseNotes.html	Fri Jul 16 21:04:41 2004
@@ -628,6 +628,13 @@
 
The C++ front-end inherits all problems afflicting the C
     front-end.

 

+
+IA64 note: The C++ front-end does not use IA64 ABI compliant layout of vtables.
+In particular, it just stores function pointers instead of function
+descriptors in the vtable.  This bug prevents mixing C++ code compiled with
+LLVM with C++ objects compiled by other C++ compilers.
+
 

 
 
@@ -755,7 +762,7 @@
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!" />
 
   The LLVM Compiler Infrastructure

-  Last modified: $Date: 2004/07/15 04:30:35 $
+  Last modified: $Date: 2004/07/17 02:04:41 $
 
 
 




From lattner at cs.uiuc.edu  Fri Jul 16 21:19:55 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri, 16 Jul 2004 21:19:55 -0500
Subject: [llvm-commits] CVS: llvm-gcc/gcc/llvm-expand.c 
Message-ID: <200407170219.VAA17560@apoc.cs.uiuc.edu>



Changes in directory llvm-gcc/gcc:

llvm-expand.c updated: 1.48 -> 1.49

---
Log message:

Add more debug output


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

Index: llvm-gcc/gcc/llvm-expand.c
diff -u llvm-gcc/gcc/llvm-expand.c:1.48 llvm-gcc/gcc/llvm-expand.c:1.49
--- llvm-gcc/gcc/llvm-expand.c:1.48	Tue Jul  6 22:34:17 2004
+++ llvm-gcc/gcc/llvm-expand.c	Fri Jul 16 21:19:45 2004
@@ -4392,7 +4392,11 @@
   enum built_in_function fcode = DECL_FUNCTION_CODE (fndecl);
   llvm_type *DestTy = llvm_type_get_from_tree(TREE_TYPE(exp));
 
-  assert(DECL_BUILT_IN_CLASS (fndecl) != BUILT_IN_MD);
+  if (DECL_BUILT_IN_CLASS (fndecl) != BUILT_IN_MD) {
+    fprintf(stderr, "UNKNOWN BUILTIN TYPE: \n");
+    debug_tree(fndecl);
+    abort();
+  }
 
   /* Generate library calls for functions that we can do so for. */
   switch (fcode) {




From lattner at cs.uiuc.edu  Fri Jul 16 21:30:15 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri, 16 Jul 2004 21:30:15 -0500
Subject: [llvm-commits] CVS: llvm-gcc/gcc/llvm-expand.c 
Message-ID: <200407170230.VAA17604@apoc.cs.uiuc.edu>



Changes in directory llvm-gcc/gcc:

llvm-expand.c updated: 1.49 -> 1.50

---
Log message:

Fix previous patch


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

Index: llvm-gcc/gcc/llvm-expand.c
diff -u llvm-gcc/gcc/llvm-expand.c:1.49 llvm-gcc/gcc/llvm-expand.c:1.50
--- llvm-gcc/gcc/llvm-expand.c:1.49	Fri Jul 16 21:19:45 2004
+++ llvm-gcc/gcc/llvm-expand.c	Fri Jul 16 21:30:05 2004
@@ -4392,7 +4392,7 @@
   enum built_in_function fcode = DECL_FUNCTION_CODE (fndecl);
   llvm_type *DestTy = llvm_type_get_from_tree(TREE_TYPE(exp));
 
-  if (DECL_BUILT_IN_CLASS (fndecl) != BUILT_IN_MD) {
+  if (DECL_BUILT_IN_CLASS (fndecl) == BUILT_IN_MD) {
     fprintf(stderr, "UNKNOWN BUILTIN TYPE: \n");
     debug_tree(fndecl);
     abort();




From lattner at cs.uiuc.edu  Fri Jul 16 21:39:51 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri, 16 Jul 2004 21:39:51 -0500
Subject: [llvm-commits] 
	CVS: llvm-gcc/libstdc++-v3/config/cpu/ia64/atomicity.h
Message-ID: <200407170239.VAA17647@apoc.cs.uiuc.edu>



Changes in directory llvm-gcc/libstdc++-v3/config/cpu/ia64:

atomicity.h updated: 1.1.1.1 -> 1.2

---
Log message:

ia64 support for LLVM


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

Index: llvm-gcc/libstdc++-v3/config/cpu/ia64/atomicity.h
diff -u llvm-gcc/libstdc++-v3/config/cpu/ia64/atomicity.h:1.1.1.1 llvm-gcc/libstdc++-v3/config/cpu/ia64/atomicity.h:1.2
--- llvm-gcc/libstdc++-v3/config/cpu/ia64/atomicity.h:1.1.1.1	Thu Jan  8 15:59:29 2004
+++ llvm-gcc/libstdc++-v3/config/cpu/ia64/atomicity.h	Fri Jul 16 21:39:41 2004
@@ -38,14 +38,25 @@
 __attribute__ ((__unused__))
 __exchange_and_add (volatile _Atomic_word *__mem, int __val)
 {
+#ifdef __llvm__
+  register _Atomic_word __result;
+  __result = *__mem;
+  *__mem += __val;
+  return __result;
+#else
   return __sync_fetch_and_add (__mem, __val);
+#endif
 }
 
 static inline void
 __attribute__ ((__unused__))
 __atomic_add (volatile _Atomic_word* __mem, int __val)
 {
+#ifdef __llvm__
+  __exchange_and_add(__mem, __val);
+#else
   __sync_fetch_and_add (__mem, __val);
+#endif
 }
 
 #endif /* atomicity.h */




From lattner at cs.uiuc.edu  Fri Jul 16 21:56:58 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri, 16 Jul 2004 21:56:58 -0500
Subject: [llvm-commits] CVS: llvm/include/Config/link.h 
Message-ID: <200407170256.VAA19552@apoc.cs.uiuc.edu>



Changes in directory llvm/include/Config:

link.h (r1.3) removed

---
Log message:

Remove dead file


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



From lattner at cs.uiuc.edu  Fri Jul 16 22:09:22 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri, 16 Jul 2004 22:09:22 -0500
Subject: [llvm-commits] CVS: llvm/include/Config/dlfcn.h 
Message-ID: <200407170309.WAA21624@apoc.cs.uiuc.edu>



Changes in directory llvm/include/Config:

dlfcn.h updated: 1.3 -> 1.4

---
Log message:

link.h causes problems on some platforms and is not needed on solaris, where
the comment came from.


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

Index: llvm/include/Config/dlfcn.h
diff -u llvm/include/Config/dlfcn.h:1.3 llvm/include/Config/dlfcn.h:1.4
--- llvm/include/Config/dlfcn.h:1.3	Mon Oct 20 15:11:34 2003
+++ llvm/include/Config/dlfcn.h	Fri Jul 16 22:09:12 2004
@@ -16,17 +16,8 @@
 
 #include "Config/config.h"
 
-/*
- * According to the man pages on dlopen(), we sometimes need link.h.  So,
- * go grab it just in case.
- */
 #ifdef HAVE_DLFCN_H
 #include 
-
-#ifdef HAVE_LINK_H
-#include 
-#endif
-
 #endif
 
 #endif




From lattner at cs.uiuc.edu  Fri Jul 16 23:23:42 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri, 16 Jul 2004 23:23:42 -0500
Subject: [llvm-commits] CVS: llvm-www/www-index.html 
Message-ID: <200407170423.XAA21847@apoc.cs.uiuc.edu>



Changes in directory llvm-www:

www-index.html updated: 1.107 -> 1.108

---
Log message:

Attempt to address the most prominant misunderstanding of LLVM


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

Index: llvm-www/www-index.html
diff -u llvm-www/www-index.html:1.107 llvm-www/www-index.html:1.108
--- llvm-www/www-index.html:1.107	Thu Jul 15 18:15:04 2004
+++ llvm-www/www-index.html	Fri Jul 16 23:23:31 2004
@@ -40,6 +40,12 @@
 href="CurrentWork.html">Current Projects" for information about other
 components under development.
 
+LLVM does not imply things that you would expect from a 
+high-level virtual machine.  It does not require garbage collection or 
+run-time code generation (In fact, LLVM makes a great static compiler!).
+Note that optional LLVM components can be used to build high-level 
+virtual machines and other systems that need these services.
+
 
 
 LLVM is a robust system, particularly well suited for developing new




From lattner at cs.uiuc.edu  Sat Jul 17 01:28:59 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat, 17 Jul 2004 01:28:59 -0500
Subject: [llvm-commits] CVS: llvm/lib/Analysis/AliasAnalysisEvaluator.cpp 
Message-ID: <200407170628.BAA25208@apoc.cs.uiuc.edu>



Changes in directory llvm/lib/Analysis:

AliasAnalysisEvaluator.cpp updated: 1.14 -> 1.15

---
Log message:

Cleanups: fold two loops into one
New features: -print-all-alias-modref-info option, print more info


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

Index: llvm/lib/Analysis/AliasAnalysisEvaluator.cpp
diff -u llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.14 llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.15
--- llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.14	Sun Jul  4 07:19:55 2004
+++ llvm/lib/Analysis/AliasAnalysisEvaluator.cpp	Sat Jul 17 01:28:49 2004
@@ -32,6 +32,8 @@
 using namespace llvm;
 
 namespace {
+  cl::opt PrintAll("print-all-alias-modref-info", cl::ReallyHidden);
+
   cl::opt PrintNoAlias("print-no-aliases", cl::ReallyHidden);
   cl::opt PrintMayAlias("print-may-aliases", cl::ReallyHidden);
   cl::opt PrintMustAlias("print-must-aliases", cl::ReallyHidden);
@@ -54,6 +56,11 @@
     bool doInitialization(Module &M) { 
       NoAlias = MayAlias = MustAlias = 0; 
       NoModRef = Mod = Ref = ModRef = 0;
+
+      if (PrintAll) {
+        PrintNoAlias = PrintMayAlias = PrintMustAlias = true;
+        PrintNoModRef = PrintMod = PrintRef = PrintModRef = true;
+      }
       return false; 
     }
 
@@ -90,16 +97,15 @@
     for (User::op_iterator OI = (*I).op_begin(); OI != (*I).op_end(); ++OI)
       if (isa((*OI)->getType()))
         Pointers.insert(*OI);
-  }
 
-  for (inst_iterator I = inst_begin(F), E = inst_end(F); I != E; ++I) {
     CallSite CS = CallSite::get(&*I);
     if (CS.getInstruction()) CallSites.insert(CS);
   }
 
   if (PrintNoAlias || PrintMayAlias || PrintMustAlias ||
       PrintNoModRef || PrintMod || PrintRef || PrintModRef)
-    std::cerr << "Function: " << F.getName() << "\n";
+    std::cerr << "Function: " << F.getName() << ": " << Pointers.size()
+              << " pointers, " << CallSites.size() << " call sites\n";
 
   // iterate over the worklist, and run the full (n^2)/2 disambiguations
   for (std::set::iterator I1 = Pointers.begin(), E = Pointers.end();




From lattner at cs.uiuc.edu  Sat Jul 17 01:43:31 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat, 17 Jul 2004 01:43:31 -0500
Subject: [llvm-commits] CVS: llvm/lib/Analysis/AliasAnalysisEvaluator.cpp 
Message-ID: <200407170643.BAA27626@apoc.cs.uiuc.edu>



Changes in directory llvm/lib/Analysis:

AliasAnalysisEvaluator.cpp updated: 1.15 -> 1.16

---
Log message:

Print modref information in a useful way.


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

Index: llvm/lib/Analysis/AliasAnalysisEvaluator.cpp
diff -u llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.15 llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.16
--- llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.15	Sat Jul 17 01:28:49 2004
+++ llvm/lib/Analysis/AliasAnalysisEvaluator.cpp	Sat Jul 17 01:43:20 2004
@@ -81,6 +81,16 @@
   }
 }
 
+static inline void 
+PrintModRefResults(const char *Msg, bool P, Instruction *I, Value *Ptr,
+                   Module *M) {
+  if (P) {
+    std::cerr << "  " << Msg << ":  Ptr: ";
+    WriteAsOperand(std::cerr, Ptr, true, true, M);
+    std::cerr << "\t<->" << *I;
+  }
+}
+
 bool AAEval::runOnFunction(Function &F) {
   AliasAnalysis &AA = getAnalysis();
   
@@ -133,16 +143,16 @@
       Instruction *I = C->getInstruction();
       switch (AA.getModRefInfo(*C, *V, (*V)->getType()->getPrimitiveSize())) {
       case AliasAnalysis::NoModRef:
-        PrintResults("NoModRef", PrintNoModRef, I, *V, F.getParent());
+        PrintModRefResults("NoModRef", PrintNoModRef, I, *V, F.getParent());
         ++NoModRef; break;
       case AliasAnalysis::Mod:
-        PrintResults("Mod", PrintMod, I, *V, F.getParent());
+        PrintModRefResults("     Mod", PrintMod, I, *V, F.getParent());
         ++Mod; break;
       case AliasAnalysis::Ref:
-        PrintResults("Ref", PrintRef, I, *V, F.getParent());
+        PrintModRefResults("     Ref", PrintRef, I, *V, F.getParent());
         ++Ref; break;
       case AliasAnalysis::ModRef:
-        PrintResults("ModRef", PrintModRef, I, *V, F.getParent());
+        PrintModRefResults("  ModRef", PrintModRef, I, *V, F.getParent());
         ++ModRef; break;
       default:
         std::cerr << "Unknown alias query result!\n";




From lattner at cs.uiuc.edu  Sat Jul 17 02:40:44 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat, 17 Jul 2004 02:40:44 -0500
Subject: [llvm-commits] CVS: llvm/lib/Analysis/AliasAnalysisEvaluator.cpp 
Message-ID: <200407170740.CAA31518@apoc.cs.uiuc.edu>



Changes in directory llvm/lib/Analysis:

AliasAnalysisEvaluator.cpp updated: 1.16 -> 1.17

---
Log message:

Fix incorrect computation of mod/ref sets.  Do not ask for mod/ref information
for objects of size 0.


---
Diffs of the changes:  (+29 -21)

Index: llvm/lib/Analysis/AliasAnalysisEvaluator.cpp
diff -u llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.16 llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.17
--- llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.16	Sat Jul 17 01:43:20 2004
+++ llvm/lib/Analysis/AliasAnalysisEvaluator.cpp	Sat Jul 17 02:40:34 2004
@@ -21,7 +21,7 @@
 #include "llvm/iOther.h"
 #include "llvm/iTerminators.h"
 #include "llvm/Pass.h"
-#include "llvm/Type.h"
+#include "llvm/DerivedTypes.h"
 #include "llvm/Analysis/AliasAnalysis.h"
 #include "llvm/Assembly/Writer.h"
 #include "llvm/Support/InstIterator.h"
@@ -137,27 +137,35 @@
 
   // Mod/ref alias analysis: compare all pairs of calls and values
   for (std::set::iterator V = Pointers.begin(), Ve = Pointers.end();
-       V != Ve; ++V)
-    for (std::set::iterator C = CallSites.begin(), 
-           Ce = CallSites.end(); C != Ce; ++C) {
-      Instruction *I = C->getInstruction();
-      switch (AA.getModRefInfo(*C, *V, (*V)->getType()->getPrimitiveSize())) {
-      case AliasAnalysis::NoModRef:
-        PrintModRefResults("NoModRef", PrintNoModRef, I, *V, F.getParent());
-        ++NoModRef; break;
-      case AliasAnalysis::Mod:
-        PrintModRefResults("     Mod", PrintMod, I, *V, F.getParent());
-        ++Mod; break;
-      case AliasAnalysis::Ref:
-        PrintModRefResults("     Ref", PrintRef, I, *V, F.getParent());
-        ++Ref; break;
-      case AliasAnalysis::ModRef:
-        PrintModRefResults("  ModRef", PrintModRef, I, *V, F.getParent());
-        ++ModRef; break;
-      default:
-        std::cerr << "Unknown alias query result!\n";
+       V != Ve; ++V) {
+    unsigned Size = 0;
+    if (const PointerType *PTy = dyn_cast((*V)->getType()))
+      if (!(Size = PTy->getElementType()->getPrimitiveSize()))
+        if (isa(PTy->getElementType()))
+          Size = 4;   // This is a hack, but it's good enough for eval.
+
+    if (Size) 
+      for (std::set::iterator C = CallSites.begin(), 
+             Ce = CallSites.end(); C != Ce; ++C) {
+        Instruction *I = C->getInstruction();
+        switch (AA.getModRefInfo(*C, *V, Size)) {
+        case AliasAnalysis::NoModRef:
+          PrintModRefResults("NoModRef", PrintNoModRef, I, *V, F.getParent());
+          ++NoModRef; break;
+        case AliasAnalysis::Mod:
+          PrintModRefResults("     Mod", PrintMod, I, *V, F.getParent());
+          ++Mod; break;
+        case AliasAnalysis::Ref:
+          PrintModRefResults("     Ref", PrintRef, I, *V, F.getParent());
+          ++Ref; break;
+        case AliasAnalysis::ModRef:
+          PrintModRefResults("  ModRef", PrintModRef, I, *V, F.getParent());
+          ++ModRef; break;
+        default:
+          std::cerr << "Unknown alias query result!\n";
+        }
       }
-    }
+  }
 
   return false;
 }




From llvm at cs.uiuc.edu  Sat Jul 17 03:40:04 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 03:40:04 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/System/README.txt 
Message-ID: <200407170840.DAA05758@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/System:

README.txt added (r1.1)

---
Log message:

Added a README to point users to the documentation on the design of this
library which is a prerequisite for maintaining the library.


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

Index: llvm/include/llvm/System/README.txt
diff -c /dev/null llvm/include/llvm/System/README.txt:1.1
*** /dev/null	Sat Jul 17 03:40:04 2004
--- llvm/include/llvm/System/README.txt	Sat Jul 17 03:39:53 2004
***************
*** 0 ****
--- 1,14 ----
+ System Utilities Interface
+ ==========================
+ 
+ The design of this library has several key constraints aimed at shielding LLVM
+ from the vagaries of operating system differences. The goal here is to provide
+ interfaces to operating system concepts (files, memory maps, sockets, signals,
+ locking, etc) efficiently and in such a way that the remainder of LLVM is
+ completely operating system agnostic. 
+ 
+ PLEASE READ AND COMPREHEND FULLY THE DOCUMENTATION in 
+ 
+ llvm/docs/SystemLibrary.html 
+ 
+ before making changes to this library.




From llvm at cs.uiuc.edu  Sat Jul 17 05:04:59 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 05:04:59 -0500
Subject: [llvm-commits] CVS: llvm/docs/SystemLibrary.html 
Message-ID: <200407171004.FAA15668@zion.cs.uiuc.edu>



Changes in directory llvm/docs:

SystemLibrary.html added (r1.1)

---
Log message:

Initial (outline only) draft of the System Library requirements, design
and details documentation.


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

Index: llvm/docs/SystemLibrary.html
diff -c /dev/null llvm/docs/SystemLibrary.html:1.1
*** /dev/null	Sat Jul 17 05:04:59 2004
--- llvm/docs/SystemLibrary.html	Sat Jul 17 05:04:49 2004
***************
*** 0 ****
--- 1,201 ----
+ 
+ 
+ 
+   System Library
+   
+ 
+ 
+ 
+ 
 System Library
+ 
+ Warning: This document is a work in progress.
+ 
+ 
+   Abstract
+   System Library Requirements
+   
+     Hide System Header Files
+     No Exposed Functions
+     No Exposed Data
+     No Exceptions
+     Standard Error Codes
+     Minimize Overhead
+   
+   System Library Design
+   
+     Use Opaque Classes
+     Common Implementations
+     Multiple Implementations
+     Use Low Level Interfaces
+     No Memory Allocation
+     No Virtual Methods
+   
+   System Library Details
+   
+     Tracking Bugzilla Bug: 351
+     Reference Implementatation
+   
+ 
+ 
+ 
+   Written by the Reid Spencer
+ 
+ 
+ 
+ 
+ Abstract
+ 
+   This document describes the requirements, design, and implementation 
+   details of LLVM's System Library. The library is composed of the header files
+   in llvm/include/llvm/System and the source files in 
+   llvm/lib/System. The goal of this library is to completely shield 
+   LLVM from the variations in operating system interfaces. By centralizing 
+   LLVM's use of operating system interfaces, we make it possible for the LLVM
+   tool chain and runtime libraries to be more easily ported to new platforms.
+   The library also unclutters the rest of LLVM from #ifdef use and special
+   cases for specific operating systems.
+   The System Library was donated to LLVM by Reid Spencer who formulated the
+   original design as part of the eXtensible Programming System (XPS) which is
+   based, in part, on LLVM.
+ 
+ 
+ 
+ 
+   System Library Requirements
+ 
+ 
+   The System library's requirements are aimed at shielding LLVM from the
+   variations in operating system interfaces. The following sections define the
+   requirements needed to fulfill this objective.
+ 
+ 
+ 
+ Hide System Header Files
+ 
+   To be written.
+ 
+ 
+ 
+ No Exposed Functions
+ 
+   To be written.
+ 
+ 
+ 
+ No Exposed Data
+ 
+   To be written.
+ 
+ 
+ 
+ No Exceptions
+ 
+   To be written.
+ 
+ 
+ 
+ Standard Error Codes
+ 
+   To be written.
+ 
+ 
+ 
+ Minimize Overhead
+ 
+   To be written.
+ 
+ 
+ 
+ System Library Design
+ 
+   In order to fulfill the requirements of the system library, strict design
+   objectives must be maintained in the library as it evolves.  The goal here 
+   is to provide interfaces to operating system concepts (files, memory maps, 
+   sockets, signals, locking, etc) efficiently and in such a way that the 
+   remainder of LLVM is completely operating system agnostic.
+ 
+ 
+ 
+ Use Opaque Classes
+ 
+   no public data
+   onlyprimitive typed private/protected data
+   data size is "right" for platform, not max of all platforms
+   each class corresponds to O/S concept
+ 
+ 
+ 
+ Common Implementations
+ 
+   To be written.
+ 
+ 
+ 
+ 
+   Multiple Implementations
+ 
+ 
+   To be written.
+ 
+ 
+ 
+ 
+   Use Low Level Interfaces
+ 
+ 
+   To be written.
+ 
+ 
+ 
+ No Memory Allocation
+ 
+   To be written.
+ 
+ 
+ 
+ No Virtual Methods
+ 
+   To be written.
+ 
+ 
+ 
+ System Library Details
+ 
+   To be written.
+ 
+ 
+ 
+ Bug 251
+ 
+   See bug 351
+   for further details on the progress of this work
+ 
+ 
+ 
+ 
+   Reference Implementation
+ 
+ 
+   The linux implementation of the system library will always be the
+   reference implementation. This means that (a) the concepts defined by the
+   linux must be identically replicated in the other implementations and (b) the
+   linux implementation must always be complete (provide implementations for all
+   concepts).
+ 
+ 
+ 
+ 
+ 
+ 
+   
+   
+ 
+   Reid Spencer

+   LLVM Compiler Infrastructure

+   Last modified: $Date: 2004/07/17 10:04:49 $
+ 
+ 
+ 




From lattner at cs.uiuc.edu  Sat Jul 17 13:50:29 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat, 17 Jul 2004 13:50:29 -0500
Subject: [llvm-commits] CVS: llvm/docs/SystemLibrary.html 
Message-ID: <200407171850.NAA12356@apoc.cs.uiuc.edu>



Changes in directory llvm/docs:

SystemLibrary.html updated: 1.1 -> 1.2

---
Log message:

Hrm, I think we need a "Reid is buggy" bug  ;-)



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

Index: llvm/docs/SystemLibrary.html
diff -u llvm/docs/SystemLibrary.html:1.1 llvm/docs/SystemLibrary.html:1.2
--- llvm/docs/SystemLibrary.html:1.1	Sat Jul 17 05:04:49 2004
+++ llvm/docs/SystemLibrary.html	Sat Jul 17 13:50:19 2004
@@ -166,9 +166,9 @@
 
 
 
-Bug 251
+Bug 351
 
-  See bug 351
+  
See bug 351
   for further details on the progress of this work
 
 
@@ -195,7 +195,7 @@
 
   Reid Spencer

   LLVM Compiler Infrastructure

-  Last modified: $Date: 2004/07/17 10:04:49 $
+  Last modified: $Date: 2004/07/17 18:50:19 $
 
 
 




From lattner at cs.uiuc.edu  Sat Jul 17 15:24:16 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat, 17 Jul 2004 15:24:16 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86RegisterInfo.cpp 
Message-ID: <200407172024.PAA21990@apoc.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86RegisterInfo.cpp updated: 1.87 -> 1.88

---
Log message:

Reserve the correct amt of space.


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

Index: llvm/lib/Target/X86/X86RegisterInfo.cpp
diff -u llvm/lib/Target/X86/X86RegisterInfo.cpp:1.87 llvm/lib/Target/X86/X86RegisterInfo.cpp:1.88
--- llvm/lib/Target/X86/X86RegisterInfo.cpp:1.87	Sat Jul 10 23:17:04 2004
+++ llvm/lib/Target/X86/X86RegisterInfo.cpp	Sat Jul 17 15:24:05 2004
@@ -100,7 +100,7 @@
 
 static MachineInstr *MakeMRIInst(unsigned Opcode, unsigned FrameIndex,
                                  MachineInstr *MI) {
-  return addFrameReference(BuildMI(Opcode, 5), FrameIndex)
+  return addFrameReference(BuildMI(Opcode, 6), FrameIndex)
       .addReg(MI->getOperand(1).getReg())
       .addZImm(MI->getOperand(2).getImmedValue());
 }
@@ -127,7 +127,7 @@
 static MachineInstr *MakeRMIInst(unsigned Opcode, unsigned FrameIndex,
                                  MachineInstr *MI) {
   const MachineOperand& op = MI->getOperand(0);
-  return addFrameReference(BuildMI(Opcode, 5, op.getReg(), op.getUseType()),
+  return addFrameReference(BuildMI(Opcode, 6, op.getReg(), op.getUseType()),
                         FrameIndex).addZImm(MI->getOperand(2).getImmedValue());
 }
 




From lattner at cs.uiuc.edu  Sat Jul 17 15:26:25 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat, 17 Jul 2004 15:26:25 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86CodeEmitter.cpp 
Message-ID: <200407172026.PAA22413@apoc.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86CodeEmitter.cpp updated: 1.61 -> 1.62

---
Log message:

Make sure to emit the immediate byte for instructions like:
shrd [mem], reg, imm

This fixes the jit-ls failure on 186.crafty.



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

Index: llvm/lib/Target/X86/X86CodeEmitter.cpp
diff -u llvm/lib/Target/X86/X86CodeEmitter.cpp:1.61 llvm/lib/Target/X86/X86CodeEmitter.cpp:1.62
--- llvm/lib/Target/X86/X86CodeEmitter.cpp:1.61	Wed Jun  2 00:55:25 2004
+++ llvm/lib/Target/X86/X86CodeEmitter.cpp	Sat Jul 17 15:26:14 2004
@@ -577,6 +577,8 @@
   case X86II::MRMDestMem:
     MCE.emitByte(BaseOpcode);
     emitMemModRMByte(MI, 0, getX86RegNum(MI.getOperand(4).getReg()));
+    if (MI.getNumOperands() == 6)
+      emitConstant(MI.getOperand(5).getImmedValue(), sizeOfImm(Desc));
     break;
 
   case X86II::MRMSrcReg:




From llvm at cs.uiuc.edu  Sat Jul 17 16:26:10 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 16:26:10 -0500
Subject: [llvm-commits] 
	CVS: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/perl/doio.c
Message-ID: <200407172126.QAA08523@zion.cs.uiuc.edu>



Changes in directory llvm/test/Programs/MultiSource/Benchmarks/MallocBench/perl:

doio.c updated: 1.2 -> 1.3

---
Log message:

get rid of incorrect declaration of shmat(). If it isn't in sys/shm.h then
"oh well.."


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

Index: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/perl/doio.c
diff -u llvm/test/Programs/MultiSource/Benchmarks/MallocBench/perl/doio.c:1.2 llvm/test/Programs/MultiSource/Benchmarks/MallocBench/perl/doio.c:1.3
--- llvm/test/Programs/MultiSource/Benchmarks/MallocBench/perl/doio.c:1.2	Fri Jun 25 03:07:12 2004
+++ llvm/test/Programs/MultiSource/Benchmarks/MallocBench/perl/doio.c	Sat Jul 17 16:26:00 2004
@@ -1,4 +1,4 @@
-/* $RCSfile: doio.c,v $$Revision: 1.2 $$Date: 2004/06/25 08:07:12 $
+/* $RCSfile: doio.c,v $$Revision: 1.3 $$Date: 2004/07/17 21:26:00 $
  *
  *    Copyright (c) 1989, Larry Wall
  *
@@ -6,6 +6,10 @@
  *    as specified in the README file that comes with the perl 3.0 kit.
  *
  * $Log: doio.c,v $
+ * Revision 1.3  2004/07/17 21:26:00  reid
+ * get rid of incorrect declaration of shmat(). If it isn't in sys/shm.h then
+ * "oh well.."
+ *
  * Revision 1.2  2004/06/25 08:07:12  lattner
  * fix the test on FreeBSD, contributed by Vladimir Merzliakov
  *
@@ -2680,7 +2684,7 @@
 #endif
 }
 
-int
+int 
 do_shmio(optype, arglast)
 int optype;
 int *arglast;
@@ -2692,9 +2696,6 @@
     char *mbuf, *shm;
     int id, mpos, msize;
     struct shmid_ds shmds;
-#if !defined(__FreeBSD__)
-    extern char *shmat();
-#endif
 
     id = (int)str_gnum(st[++sp]);
     mstr = st[++sp];




From lattner at cs.uiuc.edu  Sat Jul 17 16:51:35 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat, 17 Jul 2004 16:51:35 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/LiveIntervals.cpp 
Message-ID: <200407172151.QAA31297@apoc.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

LiveIntervals.cpp updated: 1.88 -> 1.89

---
Log message:

It looks like physref->virtreg joining is working fine.  Enable it by default
but make virtreg->virtreg joining stay off by default


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

Index: llvm/lib/CodeGen/LiveIntervals.cpp
diff -u llvm/lib/CodeGen/LiveIntervals.cpp:1.88 llvm/lib/CodeGen/LiveIntervals.cpp:1.89
--- llvm/lib/CodeGen/LiveIntervals.cpp:1.88	Fri Jul  9 06:25:27 2004
+++ llvm/lib/CodeGen/LiveIntervals.cpp	Sat Jul 17 16:51:25 2004
@@ -57,9 +57,13 @@
     ("liveintervals", "Number of loads/stores folded into instructions");
 
     cl::opt
-    join("join-liveintervals",
-         cl::desc("Join compatible live intervals"),
-         cl::init(false));
+    EnableJoining("join-liveintervals",
+                  cl::desc("Join compatible live intervals"),
+                  cl::init(true));
+    cl::opt
+    EnableVirtVirtJoining("join-liveintervals-virtvirtjoining",
+                      cl::desc("Join live intervals for virtreg pairs (buggy)"),
+                          cl::init(false));
 };
 
 void LiveIntervals::getAnalysisUsage(AnalysisUsage &AU) const
@@ -115,7 +119,7 @@
     numIntervals += intervals_.size();
 
     // join intervals if requested
-    if (join) joinIntervals();
+    if (EnableJoining) joinIntervals();
 
     numIntervalsAfter += intervals_.size();
 
@@ -494,15 +498,21 @@
                     continue;
 
                 Reg2IntervalMap::iterator r2iA = r2iMap_.find(regA);
-                assert(r2iA != r2iMap_.end());
+                assert(r2iA != r2iMap_.end() &&
+                       "Found unknown vreg in 'isMoveInstr' instruction");
                 Reg2IntervalMap::iterator r2iB = r2iMap_.find(regB);
-                assert(r2iB != r2iMap_.end());
+                assert(r2iB != r2iMap_.end() &&
+                       "Found unknown vreg in 'isMoveInstr' instruction");
 
                 Intervals::iterator intA = r2iA->second;
                 Intervals::iterator intB = r2iB->second;
 
                 // both A and B are virtual registers
-                if (MRegisterInfo::isVirtualRegister(intA->reg) &&
+
+                // FIXME: coallescing two virtual registers together is
+                // apparently broken.
+                if (EnableVirtVirtJoining && 
+                    MRegisterInfo::isVirtualRegister(intA->reg) &&
                     MRegisterInfo::isVirtualRegister(intB->reg)) {
 
                     const TargetRegisterClass *rcA, *rcB;
@@ -519,9 +529,8 @@
                         r2rMap_.insert(std::make_pair(intB->reg, intA->reg));
                         intervals_.erase(intB);
                     }
-                }
-                else if (MRegisterInfo::isPhysicalRegister(intA->reg) ^
-                         MRegisterInfo::isPhysicalRegister(intB->reg)) {
+                } else if (MRegisterInfo::isPhysicalRegister(intA->reg) ^
+                           MRegisterInfo::isPhysicalRegister(intB->reg)) {
                     if (MRegisterInfo::isPhysicalRegister(intB->reg)) {
                         std::swap(regA, regB);
                         std::swap(intA, intB);




From lattner at cs.uiuc.edu  Sat Jul 17 18:17:05 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat, 17 Jul 2004 18:17:05 -0500
Subject: [llvm-commits] CVS: llvm-www/ProjectsWithLLVM/index.html 
Message-ID: <200407172317.SAA01532@apoc.cs.uiuc.edu>



Changes in directory llvm-www/ProjectsWithLLVM:

index.html updated: 1.14 -> 1.15

---
Log message:

Add scheme front-end link

Cleanup the page a lot to make it not look really bad and emphasize that
which is important.  The use of doc_subsubsection leaves something to be
desired though.


---
Diffs of the changes:  (+76 -32)

Index: llvm-www/ProjectsWithLLVM/index.html
diff -u llvm-www/ProjectsWithLLVM/index.html:1.14 llvm-www/ProjectsWithLLVM/index.html:1.15
--- llvm-www/ProjectsWithLLVM/index.html:1.14	Thu May 13 16:50:00 2004
+++ llvm-www/ProjectsWithLLVM/index.html	Sat Jul 17 18:16:54 2004
@@ -1,6 +1,8 @@
 
 Projects built with LLVM
 
+
+
 This page is an incomplete list of the projects built with LLVM, sorted in
 reverse chronological order.  The idea of this list is to show some of the things
 that have been done with LLVM for various course projects or for other purposes,
@@ -20,20 +22,47 @@
 would like to put up the "polished results" of your work, including reports,
 papers, presentations, posters, or anything else you have.
 
+
+
+
+
+  Scheme to LLVM Translator

+
+
+
+By: Tobias Nurmiranta
+
+
+
+This is a small scheme
+compiler for LLVM, written in scheme.  It is good enough to compile itself
+and work.
+
+The code is quite similar to the code in the book SICP (Structure and
+Interpretation of Computer Programs), chapter five, with the difference that it
+implements the extra functionality that SICP assumes that the explicit control
+evaluator (virtual machine) already have. Much functionality of the compiler is
+implemented in a subset of scheme, llvm-defines, which are compiled to llvm
+functions.
+
+
+
 
-
-CS497rej: Object-Oriented Programming and Design (Spring 2004)
+
+LLVM Visualization Tool
 
 
 
+
+
 
 
-LLVM Visualization Tool

-Misha Brukman,
+By: Misha Brukman,
 Tanya Brethour, and
-Brian Gaeke
+Brian Gaeke

 
 
+
 
 The LLVM Visualization Tool (LLVM-TV) can be used to visualize the effects
 of transformations written in the LLVM framework.  Our visualizations
@@ -59,18 +88,21 @@
 page with overview; design doc, user manual & download on the
 LLVM-TV website
 
+
+
 
-
-CS426: Advanced Compilers (Fall 2003)
+
+Improvements to Linear Scan register allocation
 
 
 
 
 
-Improvements to Linear Scan register allocation

-Alkis Evlogimenos
+
+By: Alkis Evlogimenos
 
 
+
 Linear scan register allocation is a fast global register allocation first
 presented in Linear
 Scan Register Allocation as an alternative to the more widely used graph
@@ -82,11 +114,16 @@
 
Project report: PS, PDF
 
+
+
 
-XPS - eXtensible Programming System - eXtensible
-Systems, Inc.
+XPS - eXtensible Programming System
 
 
+By: eXtensible Systems, Inc.
+
+
+
 The XPS project's purpose is to provide a comprehensive application
 programming platform that will make development of high-quality Internet-aware
 applications easier and accessible to the non-programmer. This project also
@@ -124,18 +161,20 @@
 This information is somewhat dated but may provide an overview.  XPS is getting
 a new home on the Internet soon. We'll update this link when its available.
 
+
+
 
-CS497YYZ: Hot Topics in Operating Systems (Fall
-2003)
+LLVA-emu project
+
 
 
 
 
-LLVA-emu project

 Misha Brukman, 
 Brian Gaeke
 
 
+
 "Traditional architectures use the hardware instruction set for dual
 purposes: first, as a language in which to express the semantics of software
 programs, and second, as a means for controlling the hardware. The thesis of
@@ -167,12 +206,19 @@
 PDF
 
 
-
+
+
+
+
+SPEDI: Static Patch Extraction and Dynamic Insertion
+
+
+
 
-SPEDI: Static Patch Extraction and Dynamic Insertion

-Brian Fahs
+By: Brian Fahs
 
 
+
 "As every modern computer user has experienced, software updates and
 upgrades frequently require programs and sometimes the entire operating system
 to be restarted. This can be a painful and annoying experience. What if this
@@ -190,28 +236,22 @@
 
Project report: PS, PDF
 
+
 
 
-
-
-
-
-
+An LLVM Implementation of
+ SSAPRE
 
 
-
-CS426: Advanced Compilers (Fall 2002)
-
+
 
 
 
-An LLVM Implementation of SSAPRE

 Tanya Brethour,
 Joel Stanley, Bill Wendling
 
 
+
 "In this report we present implementation details, empirical performance
 data, and notable modifications to an algorithm for PRE based on [the 1999
 TOPLAS SSAPRE paper].  In [the 1999 TOPLAS SSAPRE paper], a particular
@@ -224,21 +264,24 @@
 
 
Project report: PS, PDF
+
 
 
-CS497CZ: Dynamic Translation and Optimization
-(Spring 2002)
+
+Jello: a retargetable Just-In-Time compiler
+               for LLVM bytecode
+
+
 
 
 
 
-Jello: a retargetable Just-In-Time compiler
-               for LLVM bytecode

 Chris Lattner,
 Misha Brukman, 
 Brian Gaeke
 
 
+
 "We present the design and implementation of Jello, a retargetable
 Just-In-Time (JIT) compiler for the Intel IA32 architecture.  The input to Jello
 is a C program statically compiled to Low-Level Virtual Machine (LLVM) bytecode.
@@ -258,5 +301,6 @@
 
 
Project report: PS, PDF
+
 
 




From llvm at cs.uiuc.edu  Sat Jul 17 18:23:40 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 18:23:40 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Bytecode/BytecodeHandler.h 
Message-ID: <200407172323.SAA08969@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Bytecode:

BytecodeHandler.h updated: 1.3 -> 1.4

---
Log message:

Constant value not needed after CPR's disappear.


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

Index: llvm/include/llvm/Bytecode/BytecodeHandler.h
diff -u llvm/include/llvm/Bytecode/BytecodeHandler.h:1.3 llvm/include/llvm/Bytecode/BytecodeHandler.h:1.4
--- llvm/include/llvm/Bytecode/BytecodeHandler.h:1.3	Sun Jul  4 06:29:56 2004
+++ llvm/include/llvm/Bytecode/BytecodeHandler.h	Sat Jul 17 18:23:30 2004
@@ -255,8 +255,7 @@
   virtual void handleConstantPointer( 
     const PointerType* PT, ///< Type of the pointer
     unsigned Slot,         ///< Slot num of initializer value
-    GlobalValue* GV,       ///< Referenced global value
-    Constant* Val          ///< Value of constant
+    GlobalValue* GV        ///< Referenced global value
   ) {}
 
   /// @brief Handle a constant strings (array special case)




From llvm at cs.uiuc.edu  Sat Jul 17 18:26:23 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 18:26:23 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Constant.h 
Message-ID: <200407172326.SAA08997@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

Constant.h updated: 1.13 -> 1.14

---
Log message:

Extend constructor so that it can support GlobalValue's (with names).
Make GlobalValue a "classof" Constant
Fix the classof(Value*) to include GlobalValue's


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

Index: llvm/include/llvm/Constant.h
diff -u llvm/include/llvm/Constant.h:1.13 llvm/include/llvm/Constant.h:1.14
--- llvm/include/llvm/Constant.h:1.13	Mon Mar  8 00:10:32 2004
+++ llvm/include/llvm/Constant.h	Sat Jul 17 18:26:12 2004
@@ -20,7 +20,9 @@
 
 class Constant : public User {
 protected:
-  inline Constant(const Type *Ty) : User(Ty, Value::ConstantVal) {}
+  inline Constant(const Type *Ty, ValueTy vty = Value::ConstantVal, 
+	          const std::string& Name = "" ) 
+  : User(Ty, vty, Name) {}
   ~Constant() {}
 
   void destroyConstantImpl();
@@ -50,20 +52,16 @@
   /// available cached constants.  Implementations should call
   /// destroyConstantImpl as the last thing they do, to destroy all users and
   /// delete this.
-  ///
-  /// Note that this call is only valid on non-primitive constants: You cannot
-  /// destroy an integer constant for example.  This API is used to delete
-  /// constants that have ConstantPointerRef's embeded in them when the module
-  /// is deleted, and it is used by GlobalDCE to remove ConstantPointerRefs that
-  /// are unneeded, allowing globals to be DCE'd.
-  ///
   virtual void destroyConstant() { assert(0 && "Not reached!"); }
 
   
   //// Methods for support type inquiry through isa, cast, and dyn_cast:
   static inline bool classof(const Constant *) { return true; }
+  static inline bool classof(const GlobalValue *) { return true; }
   static inline bool classof(const Value *V) {
-    return V->getValueType() == Value::ConstantVal;
+    return V->getValueType() == Value::ConstantVal ||
+	   V->getValueType() == Value::FunctionVal ||
+	   V->getValueType() == Value::GlobalVariableVal;
   }
 
   /// replaceUsesOfWithOnConstant - This method is a special form of




From llvm at cs.uiuc.edu  Sat Jul 17 18:27:07 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 18:27:07 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Constants.h 
Message-ID: <200407172327.SAA09011@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

Constants.h updated: 1.49 -> 1.50

---
Log message:

****** ABOLISH ConstantPointerRef *****


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

Index: llvm/include/llvm/Constants.h
diff -u llvm/include/llvm/Constants.h:1.49 llvm/include/llvm/Constants.h:1.50
--- llvm/include/llvm/Constants.h:1.49	Mon Jul 12 15:36:08 2004
+++ llvm/include/llvm/Constants.h	Sat Jul 17 18:26:57 2004
@@ -465,44 +465,6 @@
 };
 
 
-//===---------------------------------------------------------------------------
-/// ConstantPointerRef - a constant pointer value that is initialized to
-/// point to a global value, which lies at a constant, fixed address.
-///
-class ConstantPointerRef : public Constant {
-  friend class Module;   // Modules maintain these references
-  ConstantPointerRef(const ConstantPointerRef &); // DNI!
-
-protected:
-  ConstantPointerRef(GlobalValue *GV);
-public:
-  /// get() - Static factory methods - Return objects of the specified value
-  static ConstantPointerRef *get(GlobalValue *GV);
-
-  const GlobalValue *getValue() const { 
-    return cast(Operands[0].get());
-  }
-
-  GlobalValue *getValue() {
-    return cast(Operands[0].get());
-  }
-
-  /// isNullValue - Return true if this is the value that would be returned by
-  /// getNullValue.
-  virtual bool isNullValue() const { return false; }
-
-  virtual void destroyConstant();
-  virtual void replaceUsesOfWithOnConstant(Value *From, Value *To,
-                                           bool DisableChecking = false);
-
-  /// Methods for support type inquiry through isa, cast, and dyn_cast:
-  static inline bool classof(const ConstantPointerRef *) { return true; }
-  static bool classof(const Constant *CPV);
-  static inline bool classof(const Value *V) {
-    return isa(V) && classof(cast(V));
-  }
-};
-
 // ConstantExpr - a constant value that is initialized with an expression using
 // other constant values.  This is only used to represent values that cannot be
 // evaluated at compile-time (e.g., something derived from an address) because




From llvm at cs.uiuc.edu  Sat Jul 17 18:28:38 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 18:28:38 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/GlobalValue.h 
Message-ID: <200407172328.SAA09027@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

GlobalValue.h updated: 1.15 -> 1.16

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- derive from Constant
- declare needed overrides from Constant class


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

Index: llvm/include/llvm/GlobalValue.h
diff -u llvm/include/llvm/GlobalValue.h:1.15 llvm/include/llvm/GlobalValue.h:1.16
--- llvm/include/llvm/GlobalValue.h:1.15	Sun Jul 11 20:17:52 2004
+++ llvm/include/llvm/GlobalValue.h	Sat Jul 17 18:28:28 2004
@@ -17,14 +17,14 @@
 #ifndef LLVM_GLOBALVALUE_H
 #define LLVM_GLOBALVALUE_H
 
-#include "llvm/User.h"
+#include "llvm/Constant.h"
 
 namespace llvm {
 
 class PointerType;
 class Module;
 
-class GlobalValue : public User {
+class GlobalValue : public Constant {
   GlobalValue(const GlobalValue &);             // do not implement
 public:
   enum LinkageTypes {
@@ -37,12 +37,19 @@
 protected:
   GlobalValue(const Type *Ty, ValueTy vty, LinkageTypes linkage,
 	      const std::string &name = "")
-    : User(Ty, vty, name), Linkage(linkage), Parent(0) {}
+    : Constant(Ty, vty, name), Linkage(linkage), Parent(0) { }
 
   LinkageTypes Linkage;   // The linkage of this global
   Module *Parent;
 public:
-  ~GlobalValue() {}
+  virtual ~GlobalValue();
+
+  /// If the usage is empty (except transitively dead constants), then this
+  /// global value can can be safely deleted since the destructor wll 
+  /// delete the dead constants as well.
+  /// @brief Determine if theusage of this global value is empty except 
+  /// for transitively dead constants.
+  bool use_empty_except_constants();
 
   /// getType - Global values are always pointers.
   inline const PointerType *getType() const {
@@ -56,6 +63,13 @@
   bool hasInternalLinkage()  const { return Linkage == InternalLinkage; }
   void setLinkage(LinkageTypes LT) { Linkage = LT; }
   LinkageTypes getLinkage() const { return Linkage; }
+
+  /// Override from Constant class. No GlobalValue's have null values so
+  /// this always returns false.
+  virtual bool isNullValue() const { return false; }
+
+  /// Override from Constant class.
+  virtual void destroyConstant();
 
   /// isExternal - Return true if the primary definition of this global value is
   /// outside of the current translation unit...




From llvm at cs.uiuc.edu  Sat Jul 17 18:29:56 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 18:29:56 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/GlobalVariable.h 
Message-ID: <200407172329.SAA09049@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

GlobalVariable.h updated: 1.27 -> 1.28

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
Now that GlobalVariable is a constant (via derivation from GlobalValue), 
override the replaceUsesOfWithOnConstant method.


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

Index: llvm/include/llvm/GlobalVariable.h
diff -u llvm/include/llvm/GlobalVariable.h:1.27 llvm/include/llvm/GlobalVariable.h:1.28
--- llvm/include/llvm/GlobalVariable.h:1.27	Fri Jul  2 13:41:18 2004
+++ llvm/include/llvm/GlobalVariable.h	Sat Jul 17 18:29:46 2004
@@ -98,6 +98,11 @@
   bool isConstant() const { return isConstantGlobal; }
   void setConstant(bool Value) { isConstantGlobal = Value; }
   
+  /// Override Constant's implementation of this method so we can 
+  /// replace constant initializers.
+  virtual void replaceUsesOfWithOnConstant(Value *From, Value *To,
+                                           bool DisableChecking = false);
+  
   virtual void print(std::ostream &OS) const;
 
   // Methods for support type inquiry through isa, cast, and dyn_cast:




From llvm at cs.uiuc.edu  Sat Jul 17 18:30:21 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 18:30:21 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Module.h 
Message-ID: <200407172330.SAA09083@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

Module.h updated: 1.45 -> 1.46

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
We don't need to keep track of CPRs any more.


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

Index: llvm/include/llvm/Module.h
diff -u llvm/include/llvm/Module.h:1.45 llvm/include/llvm/Module.h:1.46
--- llvm/include/llvm/Module.h:1.45	Tue Jun  8 12:44:21 2004
+++ llvm/include/llvm/Module.h	Sat Jul 17 18:30:11 2004
@@ -66,7 +66,6 @@
 private:
   GlobalListType GlobalList;     // The Global Variables in the module
   FunctionListType FunctionList; // The Functions in the module
-  GlobalValueRefMap *GVRefMap;   // Keep track of GlobalValueRef's
   SymbolTable *SymTab;           // Symbol Table for the module
   std::string ModuleID;    // Human readable identifier for the module
 




From llvm at cs.uiuc.edu  Sat Jul 17 18:30:55 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 18:30:55 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/SymbolTable.h 
Message-ID: <200407172330.SAA09095@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

SymbolTable.h updated: 1.36 -> 1.37

---
Log message:

Fix a comment.


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

Index: llvm/include/llvm/SymbolTable.h
diff -u llvm/include/llvm/SymbolTable.h:1.36 llvm/include/llvm/SymbolTable.h:1.37
--- llvm/include/llvm/SymbolTable.h:1.36	Sun Jul  4 05:49:41 2004
+++ llvm/include/llvm/SymbolTable.h	Sat Jul 17 18:30:45 2004
@@ -159,9 +159,8 @@
     insertEntry(Val->getName(), Val->getType(), Val);
   }
 
-  /// Inserts a constant or type into the symbol table with the specified
-  /// name. There can be a many to one mapping between names and constants
-  /// or types.
+  /// Inserts a constant into the symbol table with the specified
+  /// name. There can be a many to one mapping between names and constants.
   /// @brief Insert a constant or type.
   inline void insert(const std::string &Name, Value *Val) {
     assert(Val && "Can't insert null type into symbol table!");




From llvm at cs.uiuc.edu  Sat Jul 17 18:32:21 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 18:32:21 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/User.h 
Message-ID: <200407172332.SAA09116@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

User.h updated: 1.30 -> 1.31

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
Remove redundancy in User::classof(Value*); GlobalValue isa Constant now.


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

Index: llvm/include/llvm/User.h
diff -u llvm/include/llvm/User.h:1.30 llvm/include/llvm/User.h:1.31
--- llvm/include/llvm/User.h:1.30	Sun Jun 27 13:01:15 2004
+++ llvm/include/llvm/User.h	Sat Jul 17 18:32:11 2004
@@ -87,8 +87,7 @@
   // Methods for support type inquiry through isa, cast, and dyn_cast:
   static inline bool classof(const User *) { return true; }
   static inline bool classof(const Value *V) {
-    return isa(V) || isa(V) ||
-           isa(V);
+    return isa(V) || isa(V);
   }
 };
 




From llvm at cs.uiuc.edu  Sat Jul 17 18:34:57 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 18:34:57 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Value.h 
Message-ID: <200407172334.SAA09139@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

Value.h updated: 1.57 -> 1.58

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Add ValueListTy to TypeTy so that the bcreader can have its own User
  category that won't get factored into any optimizations or cleanup.
- Correct an isa_impl to correctly include GlobalValue now that it isa 
  Constant.


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

Index: llvm/include/llvm/Value.h
diff -u llvm/include/llvm/Value.h:1.57 llvm/include/llvm/Value.h:1.58
--- llvm/include/llvm/Value.h:1.57	Wed Jul 14 21:54:36 2004
+++ llvm/include/llvm/Value.h	Sat Jul 17 18:34:47 2004
@@ -128,6 +128,7 @@
     GlobalVariableVal,      // This is an instance of GlobalVariable
     ConstantVal,            // This is an instance of Constant
     InstructionVal,         // This is an instance of Instruction
+    ValueListVal           // This is for bcreader, a special ValTy
   };
   unsigned getValueType() const {
     return SubclassID;
@@ -177,7 +178,9 @@
 // the subtype header files to test to see if the value is a subclass...
 //
 template <> inline bool isa_impl(const Value &Val) { 
-  return Val.getValueType() == Value::ConstantVal; 
+  return Val.getValueType() == Value::ConstantVal ||
+         Val.getValueType() == Value::FunctionVal ||
+	 Val.getValueType() == Value::GlobalVariableVal;
 }
 template <> inline bool isa_impl(const Value &Val) { 
   return Val.getValueType() == Value::ArgumentVal;




From llvm at cs.uiuc.edu  Sat Jul 17 18:37:08 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 18:37:08 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Analysis/InstForest.h 
Message-ID: <200407172337.SAA09155@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Analysis:

InstForest.h updated: 1.25 -> 1.26

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
remove redundant isa
ensure isa case is processed before is



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

Index: llvm/include/llvm/Analysis/InstForest.h
diff -u llvm/include/llvm/Analysis/InstForest.h:1.25 llvm/include/llvm/Analysis/InstForest.h:1.26
--- llvm/include/llvm/Analysis/InstForest.h:1.25	Wed Jul 14 21:50:38 2004
+++ llvm/include/llvm/Analysis/InstForest.h	Sat Jul 17 18:36:58 2004
@@ -163,8 +163,8 @@
   void removeInstFromRootList(Instruction *I) {
     for (unsigned i = this->size(); i > 0; --i)
       if ((*this)[i-1]->getValue() == I) {
-	this->erase(this->begin()+i-1);
-	return;
+        this->erase(this->begin()+i-1);
+        return;
       }
   }
 
@@ -238,15 +238,17 @@
 //
 template 
 InstTreeNode::InstTreeNode(InstForest &IF, Value *V,
-				    InstTreeNode *Parent) : super(Parent) {
+                                    InstTreeNode *Parent) : super(Parent) {
   this->getTreeData().first.first = V;   // Save tree node
  
   if (!isa(V)) {
-    assert((isa(V) || isa(V) ||
-	    isa(V) || isa(V)) &&
-	   "Unrecognized value type for InstForest Partition!");
+    assert(isa(V) || isa(V) || isa(V) &&
+           "Unrecognized value type for InstForest Partition!");
     if (isa(V))
-      this->getTreeData().first.second = ConstNode;
+      if (isa(V))
+        this->getTreeData().first.second = TemporaryNode;
+      else
+        this->getTreeData().first.second = ConstNode;
     else if (isa(V))
       this->getTreeData().first.second = BasicBlockNode;
     else 




From llvm at cs.uiuc.edu  Sat Jul 17 18:45:33 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 18:45:33 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/AsmWriter.cpp 
Message-ID: <200407172345.SAA09211@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

AsmWriter.cpp updated: 1.147 -> 1.148

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage
- Minimize redundant isa usage
- Correct isa for GlobalValue subclass


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

Index: llvm/lib/VMCore/AsmWriter.cpp
diff -u llvm/lib/VMCore/AsmWriter.cpp:1.147 llvm/lib/VMCore/AsmWriter.cpp:1.148
--- llvm/lib/VMCore/AsmWriter.cpp:1.147	Wed Jul 14 21:51:31 2004
+++ llvm/lib/VMCore/AsmWriter.cpp	Sat Jul 17 18:45:23 2004
@@ -381,6 +381,7 @@
   }
 }
 
+/// @brief Internal constant writer. 
 static void WriteConstantInt(std::ostream &Out, const Constant *CV, 
                              bool PrintName,
                              std::map &TypeTable,
@@ -493,9 +494,6 @@
   } else if (isa(CV)) {
     Out << "null";
 
-  } else if (const ConstantPointerRef *PR = dyn_cast(CV)) {
-    WriteAsOperandInternal(Out, PR->getValue(), true, TypeTable, Machine);
-
   } else if (const ConstantExpr *CE = dyn_cast(CV)) {
     Out << CE->getOpcodeName() << " (";
     
@@ -527,12 +525,13 @@
                                   std::map &TypeTable,
                                    SlotMachine *Machine) {
   Out << ' ';
-  if (PrintName && V->hasName()) {
+  if ((PrintName || isa(V)) && V->hasName())
     Out << getLLVMName(V->getName());
-  } else {
-    if (const Constant *CV = dyn_cast(V)) {
+  else {
+    const Constant *CV = dyn_cast(V);
+    if (CV && !isa(CV))
       WriteConstantInt(Out, CV, PrintName, TypeTable, Machine);
-    } else {
+    else {
       int Slot;
       if (Machine) {
         Slot = Machine->getSlot(V);
@@ -764,8 +763,14 @@
   Out << (GV->isConstant() ? "constant " : "global ");
   printType(GV->getType()->getElementType());
 
-  if (GV->hasInitializer())
-    writeOperand(GV->getInitializer(), false, false);
+  if (GV->hasInitializer()) {
+    Constant* C = cast(GV->getInitializer());
+    assert(C &&  "GlobalVar initializer isn't constant?");
+    if (isa(C))
+      writeOperand(GV->getInitializer(), false, true);
+    else
+      writeOperand(GV->getInitializer(), false, false);
+  }
 
   printInfoComment(*GV);
   Out << "\n";
@@ -794,8 +799,9 @@
     SymbolTable::value_const_iterator VE = ST.value_end(PI->first);
 
     for (; VI != VE; ++VI) {
-      const Value *V = VI->second;
-      if (const Constant *CPV = dyn_cast(V)) {
+      const Value* V = VI->second;
+      const Constant *CPV = dyn_cast(V) ;
+      if (CPV && !isa(V)) {
         printConstant(CPV);
       }
     }
@@ -1162,12 +1168,6 @@
 void Constant::print(std::ostream &o) const {
   if (this == 0) { o << " constant value\n"; return; }
 
-  // Handle CPR's special, because they have context information...
-  if (const ConstantPointerRef *CPR = dyn_cast(this)) {
-    CPR->getValue()->print(o);  // Print as a global value, with context info.
-    return;
-  }
-
   o << ' ' << getType()->getDescription() << ' ';
 
   std::map TypeTable;
@@ -1347,10 +1347,6 @@
   // Check for uninitialized state and do lazy initialization
   this->initialize();
 
-  // Do not number CPR's at all. They are an abomination
-  if ( const ConstantPointerRef* CPR = dyn_cast(V) )
-    V = CPR->getValue() ;
-
   // Get the type of the value
   const Type* VTy = V->getType();
 
@@ -1593,8 +1589,8 @@
   SC_DEBUG("  Inserting value [" << VTy << "] = " << V << " slot=" << 
            DestSlot << " [");
   // G = Global, C = Constant, T = Type, F = Function, o = other
-  SC_DEBUG((isa(V) ? 'G' : (isa(V) ? 'C' : 
-           (isa(V) ? 'F' : 'o'))));
+  SC_DEBUG((isa(V) ? 'G' : (isa(V) ? 'F' : 
+           (isa(V) ? 'C' : 'o'))));
   SC_DEBUG("]\n");
   return DestSlot;
 }




From llvm at cs.uiuc.edu  Sat Jul 17 18:47:11 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 18:47:11 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/ConstantFolding.cpp 
Message-ID: <200407172347.SAA09227@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

ConstantFolding.cpp updated: 1.61 -> 1.62

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage
- Minimize redundant isa usage
- Correct isa for GlobalValue subclass


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

Index: llvm/lib/VMCore/ConstantFolding.cpp
diff -u llvm/lib/VMCore/ConstantFolding.cpp:1.61 llvm/lib/VMCore/ConstantFolding.cpp:1.62
--- llvm/lib/VMCore/ConstantFolding.cpp:1.61	Wed Jul 14 20:16:59 2004
+++ llvm/lib/VMCore/ConstantFolding.cpp	Sat Jul 17 18:47:01 2004
@@ -486,7 +486,7 @@
   static DirectFPRules  DoubleR;
 
   if (isa(V1) || isa(V2) ||
-      isa(V1) || isa(V2))
+      isa(V1) || isa(V2))
     return EmptyR;
 
   switch (V1->getType()->getTypeID()) {
@@ -525,12 +525,12 @@
   if (V->getType() == DestTy) return (Constant*)V;
 
   // Cast of a global address to boolean is always true.
-  if (const ConstantPointerRef *CPR = dyn_cast(V))
+  if (const GlobalValue *GV = dyn_cast(V))
     if (DestTy == Type::BoolTy)
       // FIXME: When we support 'external weak' references, we have to prevent
       // this transformation from happening.  In the meantime we avoid folding
       // any cast of an external symbol.
-      if (!CPR->getValue()->isExternal())
+      if (!GV->isExternal())
         return ConstantBool::True;
 
   if (const ConstantExpr *CE = dyn_cast(V))
@@ -624,15 +624,15 @@
 
 /// evaluateRelation - This function determines if there is anything we can
 /// decide about the two constants provided.  This doesn't need to handle simple
-/// things like integer comparisons, but should instead handle ConstantExpr's
-/// and ConstantPointerRef's.  If we can determine that the two constants have a
+/// things like integer comparisons, but should instead handle ConstantExprs
+/// and GlobalValuess.  If we can determine that the two constants have a
 /// particular relation to each other, we should return the corresponding SetCC
 /// code, otherwise return Instruction::BinaryOpsEnd.
 ///
 /// To simplify this code we canonicalize the relation so that the first
 /// operand is always the most "complex" of the two.  We consider simple
 /// constants (like ConstantInt) to be the simplest, followed by
-/// ConstantPointerRef's, followed by ConstantExpr's (the most complex).
+/// GlobalValues, followed by ConstantExpr's (the most complex).
 ///
 static Instruction::BinaryOps evaluateRelation(const Constant *V1,
                                                const Constant *V2) {
@@ -640,15 +640,15 @@
          "Cannot compare different types of values!");
   if (V1 == V2) return Instruction::SetEQ;
 
-  if (!isa(V1) && !isa(V1)) {
+  if (!isa(V1) && !isa(V1)) {
     // If the first operand is simple, swap operands.
-    assert((isa(V2) || isa(V2)) &&
+    assert((isa(V2) || isa(V2)) &&
            "Simple cases should have been handled by caller!");
     Instruction::BinaryOps SwappedRelation = evaluateRelation(V2, V1);
     if (SwappedRelation != Instruction::BinaryOpsEnd)
       return SetCondInst::getSwappedCondition(SwappedRelation);
 
-  } else if (const ConstantPointerRef *CPR1 = dyn_cast(V1)){
+  } else if (const GlobalValue *CPR1 = dyn_cast(V1)){
     if (isa(V2)) {  // Swap as necessary.
     Instruction::BinaryOps SwappedRelation = evaluateRelation(V2, V1);
     if (SwappedRelation != Instruction::BinaryOpsEnd)
@@ -657,11 +657,11 @@
       return Instruction::BinaryOpsEnd;
     }
 
-    // Now we know that the RHS is a ConstantPointerRef or simple constant,
+    // Now we know that the RHS is a GlobalValue or simple constant,
     // which (since the types must match) means that it's a ConstantPointerNull.
-    if (const ConstantPointerRef *CPR2 = dyn_cast(V2)) {
-      assert(CPR1->getValue() != CPR2->getValue() &&
-             "CPRs for the same value exist at different addresses??");
+    if (const GlobalValue *CPR2 = dyn_cast(V2)) {
+      assert(CPR1 != CPR2 &&
+             "GVs for the same value exist at different addresses??");
       // FIXME: If both globals are external weak, they might both be null!
       return Instruction::SetNE;
     } else {
@@ -693,7 +693,7 @@
       if (isa(V2)) {
         // If we are comparing a GEP to a null pointer, check to see if the base
         // of the GEP equals the null pointer.
-        if (isa(CE1Op0)) {
+        if (isa(CE1Op0)) {
           // FIXME: this is not true when we have external weak references!
           // No offset can go from a global to a null pointer.
           return Instruction::SetGT;
@@ -708,13 +708,11 @@
           return Instruction::SetEQ;
         }
         // Otherwise, we can't really say if the first operand is null or not.
-      } else if (const ConstantPointerRef *CPR2 =
-                                             dyn_cast(V2)) {
+      } else if (const GlobalValue *CPR2 = dyn_cast(V2)) {
         if (isa(CE1Op0)) {
           // FIXME: This is not true with external weak references.
           return Instruction::SetLT;
-        } else if (const ConstantPointerRef *CPR1 =
-                   dyn_cast(CE1Op0)) {
+        } else if (const GlobalValue *CPR1 = dyn_cast(CE1Op0)) {
           if (CPR1 == CPR2) {
             // If this is a getelementptr of the same global, then it must be
             // different.  Because the types must match, the getelementptr could
@@ -741,8 +739,7 @@
         case Instruction::GetElementPtr:
           // By far the most common case to handle is when the base pointers are
           // obviously to the same or different globals.
-          if (isa(CE1Op0) &&
-              isa(CE2Op0)) {
+          if (isa(CE1Op0) && isa(CE2Op0)) {
             if (CE1Op0 != CE2Op0) // Don't know relative ordering, but not equal
               return Instruction::SetNE;
             // Ok, we know that both getelementptr instructions are based on the
@@ -896,13 +893,13 @@
           return const_cast(V1);                       // X & -1 == X
         if (V2->isNullValue()) return const_cast(V2);  // X & 0 == 0
         if (CE1->getOpcode() == Instruction::Cast &&
-            isa(CE1->getOperand(0))) {
-          ConstantPointerRef *CPR =cast(CE1->getOperand(0));
+            isa(CE1->getOperand(0))) {
+          GlobalValue *CPR =cast(CE1->getOperand(0));
 
           // Functions are at least 4-byte aligned.  If and'ing the address of a
           // function with a constant < 4, fold it to zero.
           if (const ConstantInt *CI = dyn_cast(V2))
-            if (CI->getRawValue() < 4 && isa(CPR->getValue()))
+            if (CI->getRawValue() < 4 && isa(CPR))
               return Constant::getNullValue(CI->getType());
         }
         break;




From llvm at cs.uiuc.edu  Sat Jul 17 18:48:43 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 18:48:43 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Constants.cpp 
Message-ID: <200407172348.SAA09253@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

Constants.cpp updated: 1.94 -> 1.95

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage
- Minimize redundant isa usage
- Correct isa for GlobalValue subclass
- Delete ConstantPointerRef member function implementations


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

Index: llvm/lib/VMCore/Constants.cpp
diff -u llvm/lib/VMCore/Constants.cpp:1.94 llvm/lib/VMCore/Constants.cpp:1.95
--- llvm/lib/VMCore/Constants.cpp:1.94	Mon Jul 12 15:35:11 2004
+++ llvm/lib/VMCore/Constants.cpp	Sat Jul 17 18:48:33 2004
@@ -14,6 +14,7 @@
 #include "llvm/Constants.h"
 #include "ConstantFolding.h"
 #include "llvm/DerivedTypes.h"
+#include "llvm/GlobalValue.h"
 #include "llvm/iMemory.h"
 #include "llvm/SymbolTable.h"
 #include "llvm/Module.h"
@@ -54,8 +55,8 @@
                 << *V << "\n\n";
 #endif
     assert(isa(V) && "References remain to Constant being destroyed");
-    Constant *CPV = cast(V);
-    CPV->destroyConstant();
+    Constant *CV = cast(V);
+    CV->destroyConstant();
 
     // The constant should remove itself from our use list...
     assert((use_empty() || use_back() != V) && "Constant not removed!");
@@ -267,12 +268,6 @@
   }
 }
 
-ConstantPointerRef::ConstantPointerRef(GlobalValue *GV)
-  : Constant(GV->getType()) {
-  Operands.reserve(1);
-  Operands.push_back(Use(GV, this));
-}
-
 ConstantExpr::ConstantExpr(unsigned Opcode, Constant *C, const Type *Ty)
   : Constant(Ty), iType(Opcode) {
   Operands.reserve(1);
@@ -420,16 +415,10 @@
 }
 
 bool ConstantPointerNull::classof(const Constant *CPV) {
-  return isa(CPV->getType()) && !isa(CPV) &&
+  return !isa(CPV) && isa(CPV->getType()) && !isa(CPV) &&
          CPV->getNumOperands() == 0;
 }
 
-bool ConstantPointerRef::classof(const Constant *CPV) {
-  return isa(CPV->getType()) && !isa(CPV) &&
-         CPV->getNumOperands() == 1;
-}
-
-
 
 //===----------------------------------------------------------------------===//
 //                      isValueValidForType implementations
@@ -532,31 +521,6 @@
   destroyConstant();
 }
 
-void ConstantPointerRef::replaceUsesOfWithOnConstant(Value *From, Value *To,
-                                                     bool DisableChecking) {
-  if (isa(To)) {
-    assert(From == getOperand(0) && "Doesn't contain from!");
-    ConstantPointerRef *Replacement =
-      ConstantPointerRef::get(cast(To));
-    
-    // Everyone using this now uses the replacement...
-    if (DisableChecking)
-      uncheckedReplaceAllUsesWith(Replacement);
-    else
-      replaceAllUsesWith(Replacement);
-    
-  } else {
-    // Just replace ourselves with the To value specified.
-    if (DisableChecking)
-      uncheckedReplaceAllUsesWith(To);
-    else
-      replaceAllUsesWith(To);
-  }
-
-  // Delete the old constant!
-  destroyConstant();
-}
-
 void ConstantExpr::replaceUsesOfWithOnConstant(Value *From, Value *ToV,
                                                bool DisableChecking) {
   assert(isa(ToV) && "Cannot make Constant refer to non-constant!");
@@ -1050,23 +1014,6 @@
 }
 
 
-//---- ConstantPointerRef::get() implementation...
-//
-ConstantPointerRef *ConstantPointerRef::get(GlobalValue *GV) {
-  assert(GV->getParent() && "Global Value must be attached to a module!");
-  
-  // The Module handles the pointer reference sharing...
-  return GV->getParent()->getConstantPointerRef(GV);
-}
-
-// destroyConstant - Remove the constant from the constant table...
-//
-void ConstantPointerRef::destroyConstant() {
-  getValue()->getParent()->destroyConstantPointerRef(this);
-  destroyConstantImpl();
-}
-
-
 //---- ConstantExpr::get() implementations...
 //
 typedef std::pair > ExprMapKeyType;
@@ -1259,3 +1206,4 @@
 const char *ConstantExpr::getOpcodeName() const {
   return Instruction::getOpcodeName(getOpcode());
 }
+




From llvm at cs.uiuc.edu  Sat Jul 17 18:50:29 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 18:50:29 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Function.cpp 
Message-ID: <200407172350.SAA09341@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

Function.cpp updated: 1.75 -> 1.76

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Move GlobalValue and GlobalVariable implementations to Globals.cpp


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

Index: llvm/lib/VMCore/Function.cpp
diff -u llvm/lib/VMCore/Function.cpp:1.75 llvm/lib/VMCore/Function.cpp:1.76
--- llvm/lib/VMCore/Function.cpp:1.75	Mon Jul 12 15:27:31 2004
+++ llvm/lib/VMCore/Function.cpp	Sat Jul 17 18:50:19 2004
@@ -68,7 +68,7 @@
 void Argument::setName(const std::string &name, SymbolTable *ST) {
   Function *P;
   assert((ST == 0 || (!getParent() || ST == &getParent()->getSymbolTable())) &&
-	 "Invalid symtab argument!");
+         "Invalid symtab argument!");
   if ((P = getParent()) && hasName()) P->getSymbolTable().remove(this);
   Value::setName(name);
   if (P && hasName()) P->getSymbolTable().insert(this);
@@ -82,42 +82,6 @@
     LeakDetector::removeGarbageObject(this);
 }
 
-static bool removeDeadConstantUsers(Constant *C) {
-  while (!C->use_empty()) {
-    if (Constant *CU = dyn_cast(C->use_back())) {
-      if (!removeDeadConstantUsers(CU))
-        return false;  // Constant wasn't dead.
-    } else {
-      return false;    // Nonconstant user of the global.
-    }
-  }
-
-  C->destroyConstant();
-  return true;
-}
-
-
-/// removeDeadConstantUsers - If there are any dead constant users dangling
-/// off of this global value, remove them.  This method is useful for clients
-/// that want to check to see if a global is unused, but don't want to deal
-/// with potentially dead constants hanging off of the globals.
-///
-/// This function returns true if the global value is now dead.  If all 
-/// users of this global are not dead, this method may return false and
-/// leave some of them around.
-bool GlobalValue::removeDeadConstantUsers() {
-  while (!use_empty()) {
-    if (Constant *C = dyn_cast(use_back())) {
-      if (!::removeDeadConstantUsers(C))
-        return false;  // Constant wasn't dead.
-    } else {
-      return false;    // Nonconstant user of the global.
-    }
-  }
-  return true;
-}
-
-
 //===----------------------------------------------------------------------===//
 // Function Implementation
 //===----------------------------------------------------------------------===//
@@ -161,7 +125,7 @@
 void Function::setName(const std::string &name, SymbolTable *ST) {
   Module *P;
   assert((ST == 0 || (!getParent() || ST == &getParent()->getSymbolTable())) &&
-	 "Invalid symtab argument!");
+         "Invalid symtab argument!");
   if ((P = getParent()) && hasName()) P->getSymbolTable().remove(this);
   Value::setName(name);
   if (P && hasName()) P->getSymbolTable().insert(this);
@@ -294,37 +258,4 @@
 }
 
 
-//===----------------------------------------------------------------------===//
-// GlobalVariable Implementation
-//===----------------------------------------------------------------------===//
-
-GlobalVariable::GlobalVariable(const Type *Ty, bool constant, LinkageTypes Link,
-			       Constant *Initializer,
-			       const std::string &Name, Module *ParentModule)
-  : GlobalValue(PointerType::get(Ty), Value::GlobalVariableVal, Link, Name),
-    isConstantGlobal(constant) {
-  if (Initializer) Operands.push_back(Use((Value*)Initializer, this));
-
-  LeakDetector::addGarbageObject(this);
-
-  if (ParentModule)
-    ParentModule->getGlobalList().push_back(this);
-}
-
-void GlobalVariable::setParent(Module *parent) {
-  if (getParent())
-    LeakDetector::addGarbageObject(this);
-  Parent = parent;
-  if (getParent())
-    LeakDetector::removeGarbageObject(this);
-}
-
-// Specialize setName to take care of symbol table majik
-void GlobalVariable::setName(const std::string &name, SymbolTable *ST) {
-  Module *P;
-  assert((ST == 0 || (!getParent() || ST == &getParent()->getSymbolTable())) &&
-	 "Invalid symtab argument!");
-  if ((P = getParent()) && hasName()) P->getSymbolTable().remove(this);
-  Value::setName(name);
-  if (P && hasName()) P->getSymbolTable().insert(this);
-}
+// vim: sw=2 ai




From llvm at cs.uiuc.edu  Sat Jul 17 18:51:07 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 18:51:07 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Linker.cpp 
Message-ID: <200407172351.SAA09353@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

Linker.cpp updated: 1.73 -> 1.74

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage
- Correct isa for GlobalValue subclass


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

Index: llvm/lib/VMCore/Linker.cpp
diff -u llvm/lib/VMCore/Linker.cpp:1.73 llvm/lib/VMCore/Linker.cpp:1.74
--- llvm/lib/VMCore/Linker.cpp:1.73	Sun Jul  4 06:52:49 2004
+++ llvm/lib/VMCore/Linker.cpp	Sat Jul 17 18:50:57 2004
@@ -307,10 +307,8 @@
       Result = ConstantStruct::get(cast(CPS->getType()), Operands);
     } else if (isa(CPV)) {
       Result = const_cast(CPV);
-    } else if (const ConstantPointerRef *CPR =
-                      dyn_cast(CPV)) {
-      Value *V = RemapOperand(CPR->getValue(), LocalMap, GlobalMap);
-      Result = ConstantPointerRef::get(cast(V));
+    } else if (isa(CPV)) {
+      Result = cast(RemapOperand(CPV, LocalMap, GlobalMap));
     } else if (const ConstantExpr *CE = dyn_cast(CPV)) {
       if (CE->getOpcode() == Instruction::GetElementPtr) {
         Value *Ptr = RemapOperand(CE->getOperand(0), LocalMap, GlobalMap);
@@ -834,9 +832,8 @@
 
       // FIXME: This should rewrite simple/straight-forward uses such as
       // getelementptr instructions to not use the Cast!
-      ConstantPointerRef *NGCP = ConstantPointerRef::get(NG);
-      G1->replaceAllUsesWith(ConstantExpr::getCast(NGCP, G1->getType()));
-      G2->replaceAllUsesWith(ConstantExpr::getCast(NGCP, G2->getType()));
+      G1->replaceAllUsesWith(ConstantExpr::getCast(NG, G1->getType()));
+      G2->replaceAllUsesWith(ConstantExpr::getCast(NG, G2->getType()));
 
       // Remove the two globals from the module now...
       M->getGlobalList().erase(G1);




From llvm at cs.uiuc.edu  Sat Jul 17 18:53:33 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 18:53:33 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Module.cpp 
Message-ID: <200407172353.SAA09373@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

Module.cpp updated: 1.52 -> 1.53

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Module doesn't need to manage ConstantPointerRefs any more.


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

Index: llvm/lib/VMCore/Module.cpp
diff -u llvm/lib/VMCore/Module.cpp:1.52 llvm/lib/VMCore/Module.cpp:1.53
--- llvm/lib/VMCore/Module.cpp:1.52	Sat Jul 10 11:37:42 2004
+++ llvm/lib/VMCore/Module.cpp	Sat Jul 17 18:53:23 2004
@@ -56,17 +56,6 @@
 template class SymbolTableListTraits;
 template class SymbolTableListTraits;
 
-// Define the GlobalValueRefMap as a struct that wraps a map so that we don't
-// have Module.h depend on 
-//
-namespace llvm {
-  struct GlobalValueRefMap {
-    typedef std::map MapTy;
-    typedef MapTy::iterator iterator;
-    std::map Map;
-  };
-}
-
 //===----------------------------------------------------------------------===//
 // Primitive Module methods.
 //
@@ -77,7 +66,6 @@
   FunctionList.setParent(this);
   GlobalList.setItemParent(this);
   GlobalList.setParent(this);
-  GVRefMap = 0;
   SymTab = new SymbolTable();
 }
 
@@ -300,38 +288,5 @@
 
   for(Module::giterator I = gbegin(), E = gend(); I != E; ++I)
     I->dropAllReferences();
-
-  // If there are any GlobalVariable references still out there, nuke them now.
-  // Since all references are hereby dropped, nothing could possibly reference
-  // them still.  Note that destroying all of the constant pointer refs will
-  // eventually cause the GVRefMap field to be set to null (by
-  // destroyConstantPointerRef, below).
-  //
-  while (GVRefMap)
-    // Delete the ConstantPointerRef node...  
-    GVRefMap->Map.begin()->second->destroyConstant();
-}
-
-// Accessor for the underlying GlobalValRefMap...
-ConstantPointerRef *Module::getConstantPointerRef(GlobalValue *V){
-  // Create ref map lazily on demand...
-  if (GVRefMap == 0) GVRefMap = new GlobalValueRefMap();
-
-  GlobalValueRefMap::iterator I = GVRefMap->Map.find(V);
-  if (I != GVRefMap->Map.end()) return I->second;
-
-  ConstantPointerRef *Ref = new ConstantPointerRef(V);
-  GVRefMap->Map[V] = Ref;
-  return Ref;
-}
-
-void Module::destroyConstantPointerRef(ConstantPointerRef *CPR) {
-  assert(GVRefMap && "No map allocated, but we have a CPR?");
-  if (!GVRefMap->Map.erase(CPR->getValue()))  // Remove it from the map...
-    assert(0 && "ConstantPointerRef not found in module CPR map!");
-  
-  if (GVRefMap->Map.empty()) {   // If the map is empty, delete it.
-    delete GVRefMap;
-    GVRefMap = 0;
-  }
 }
+




From llvm at cs.uiuc.edu  Sat Jul 17 18:57:46 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 18:57:46 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/SymbolTable.cpp 
Message-ID: <200407172357.SAA09408@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

SymbolTable.cpp updated: 1.46 -> 1.47

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Correct isa for GlobalValue subclass
- Fix some tabs and indentation.


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

Index: llvm/lib/VMCore/SymbolTable.cpp
diff -u llvm/lib/VMCore/SymbolTable.cpp:1.46 llvm/lib/VMCore/SymbolTable.cpp:1.47
--- llvm/lib/VMCore/SymbolTable.cpp:1.46	Sun Jul  4 06:55:08 2004
+++ llvm/lib/VMCore/SymbolTable.cpp	Sat Jul 17 18:57:36 2004
@@ -39,10 +39,10 @@
   for (plane_iterator PI = pmap.begin(); PI != pmap.end(); ++PI) {
     for (value_iterator VI = PI->second.begin(); VI != PI->second.end(); ++VI)
       if (!isa(VI->second) ) {
-	std::cerr << "Value still in symbol table! Type = '"
+        std::cerr << "Value still in symbol table! Type = '"
                   << PI->first->getDescription() << "' Name = '"
                   << VI->first << "'\n";
-	LeftoverValues = false;
+        LeftoverValues = false;
       }
   }
   
@@ -300,15 +300,13 @@
     value_iterator B = Plane.begin(), Bend = Plane.end();
     while (B != Bend) {   // Found nonempty type plane!
       Value *V = B->second;
-      if (isa(V)) {
-	remove(V);
+      if (!isa(V) || cast(V)->hasInternalLinkage()){
+        // Set name to "", removing from symbol table!
+        V->setName("", this);
+        RemovedSymbol = true;
+      } else if (isa(V) ) {
+        remove(V);
         RemovedSymbol = true;
-      } else {
-        if (!isa(V) || cast(V)->hasInternalLinkage()){
-          // Set name to "", removing from symbol table!
-          V->setName("", this);
-          RemovedSymbol = true;
-        }
       }
       ++B;
     }
@@ -326,7 +324,7 @@
 
 // This function is called when one of the types in the type plane are refined
 void SymbolTable::refineAbstractType(const DerivedType *OldType,
-				     const Type *NewType) {
+                                     const Type *NewType) {
 
   // Search to see if we have any values of the type Oldtype.  If so, we need to
   // move them into the newtype plane...
@@ -441,9 +439,9 @@
       I->second = (Type*)NewType;  // TODO FIXME when types aren't const
       if (NewType->isAbstract()) {
 #if DEBUG_ABSTYPE
-	std::cerr << "Added type " << NewType->getDescription() << "\n";
+        std::cerr << "Added type " << NewType->getDescription() << "\n";
 #endif
-	cast(NewType)->addAbstractTypeUser(this);
+        cast(NewType)->addAbstractTypeUser(this);
       }
     }
   }




From llvm at cs.uiuc.edu  Sat Jul 17 19:02:01 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:02:01 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Value.cpp 
Message-ID: <200407180002.TAA09483@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

Value.cpp updated: 1.46 -> 1.47

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Correct isa for GlobalValue subclass


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

Index: llvm/lib/VMCore/Value.cpp
diff -u llvm/lib/VMCore/Value.cpp:1.46 llvm/lib/VMCore/Value.cpp:1.47
--- llvm/lib/VMCore/Value.cpp:1.46	Wed Jul  7 13:07:46 2004
+++ llvm/lib/VMCore/Value.cpp	Sat Jul 17 19:01:50 2004
@@ -15,6 +15,7 @@
 #include "llvm/SymbolTable.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Constant.h"
+#include "llvm/GlobalValue.h"
 #include "Support/LeakDetector.h"
 #include 
 #include 
@@ -71,7 +72,10 @@
     // Must handle Constants specially, we cannot call replaceUsesOfWith on a
     // constant!
     if (Constant *C = dyn_cast(U.getUser())) {
-      C->replaceUsesOfWithOnConstant(this, New, true);
+      if (!isa(C))
+        C->replaceUsesOfWithOnConstant(this, New, true);
+      else 
+        U.set(New);
     } else {
       U.set(New);
     }
@@ -97,7 +101,7 @@
 void User::replaceUsesOfWith(Value *From, Value *To) {
   if (From == To) return;   // Duh what?
 
-  assert(!isa(this) &&
+  assert(!isa(this) || isa(this) &&
          "Cannot call User::replaceUsesofWith on a constant!");
 
   for (unsigned i = 0, E = getNumOperands(); i != E; ++i)
@@ -108,3 +112,4 @@
       setOperand(i, To); // Fix it now...
     }
 }
+




From llvm at cs.uiuc.edu  Sat Jul 17 19:02:51 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:02:51 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Verifier.cpp 
Message-ID: <200407180002.TAA09496@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

Verifier.cpp updated: 1.114 -> 1.115

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Correct an assert to not have redundant isa


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

Index: llvm/lib/VMCore/Verifier.cpp
diff -u llvm/lib/VMCore/Verifier.cpp:1.114 llvm/lib/VMCore/Verifier.cpp:1.115
--- llvm/lib/VMCore/Verifier.cpp:1.114	Sun Jul  4 06:53:53 2004
+++ llvm/lib/VMCore/Verifier.cpp	Sat Jul 17 19:02:41 2004
@@ -123,8 +123,6 @@
       for (Module::giterator I = M.gbegin(), E = M.gend(); I != E; ++I)
         visitGlobalValue(*I);
 
-      
-
       // If the module is broken, abort at this time.
       abortIfBroken();
       return false;
@@ -709,8 +707,7 @@
   case Intrinsic::gcroot:
     Assert1(FT->getNumParams() == 2,
             "Illegal # arguments for intrinsic function!", IF);
-    Assert1(isa(CI.getOperand(2)) ||
-            isa(CI.getOperand(2)),
+    Assert1(isa(CI.getOperand(2)),
             "Second argument to llvm.gcroot must be a constant!", &CI);
     NumArgs = 2;
     break;




From llvm at cs.uiuc.edu  Sat Jul 17 19:03:59 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:03:59 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/iCall.cpp 
Message-ID: <200407180003.TAA09514@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

iCall.cpp updated: 1.26 -> 1.27

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage
- Replace tabs.


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

Index: llvm/lib/VMCore/iCall.cpp
diff -u llvm/lib/VMCore/iCall.cpp:1.26 llvm/lib/VMCore/iCall.cpp:1.27
--- llvm/lib/VMCore/iCall.cpp:1.26	Fri Jul 16 07:04:28 2004
+++ llvm/lib/VMCore/iCall.cpp	Sat Jul 17 19:03:48 2004
@@ -33,7 +33,7 @@
 
   assert((Params.size() == FTy->getNumParams() || 
           (FTy->isVarArg() && Params.size() > FTy->getNumParams())) &&
-	 "Calling a function with bad signature");
+         "Calling a function with bad signature");
   for (unsigned i = 0; i != Params.size(); i++)
     Operands.push_back(Use(Params[i], this));
 }
@@ -48,7 +48,7 @@
 
   assert((MTy->getNumParams() == 2 ||
           (MTy->isVarArg() && MTy->getNumParams() == 0)) &&
-	 "Calling a function with bad signature");
+         "Calling a function with bad signature");
   Operands.push_back(Use(Actual1, this));
   Operands.push_back(Use(Actual2, this));
 }
@@ -63,7 +63,7 @@
 
   assert((MTy->getNumParams() == 1 ||
           (MTy->isVarArg() && MTy->getNumParams() == 0)) &&
-	 "Calling a function with bad signature");
+         "Calling a function with bad signature");
   Operands.push_back(Use(Actual, this));
 }
 
@@ -81,16 +81,16 @@
 CallInst::CallInst(Value *Func, const std::vector &Params, 
                    const std::string &Name, Instruction *InsertBefore) 
   : Instruction(cast(cast(Func->getType())
-				 ->getElementType())->getReturnType(),
-		Instruction::Call, Name, InsertBefore) {
+                                 ->getElementType())->getReturnType(),
+                Instruction::Call, Name, InsertBefore) {
   init(Func, Params);
 }
 
 CallInst::CallInst(Value *Func, const std::vector &Params, 
                    const std::string &Name, BasicBlock *InsertAtEnd) 
   : Instruction(cast(cast(Func->getType())
-				 ->getElementType())->getReturnType(),
-		Instruction::Call, Name, InsertAtEnd) {
+                                 ->getElementType())->getReturnType(),
+                Instruction::Call, Name, InsertAtEnd) {
   init(Func, Params);
 }
 
@@ -152,15 +152,11 @@
 const Function *CallInst::getCalledFunction() const {
   if (const Function *F = dyn_cast(Operands[0]))
     return F;
-  if (const ConstantPointerRef *CPR = dyn_cast(Operands[0]))
-    return cast(CPR->getValue());
   return 0;
 }
 Function *CallInst::getCalledFunction() {
   if (Function *F = dyn_cast(Operands[0]))
     return F;
-  if (ConstantPointerRef *CPR = dyn_cast(Operands[0]))
-    return cast(CPR->getValue());
   return 0;
 }
 
@@ -180,30 +176,30 @@
     cast(cast(Fn->getType())->getElementType());
   
   assert((Params.size() == MTy->getNumParams()) || 
-	 (MTy->isVarArg() && Params.size() > MTy->getNumParams()) &&
-	 "Calling a function with bad signature");
+         (MTy->isVarArg() && Params.size() > MTy->getNumParams()) &&
+         "Calling a function with bad signature");
   
   for (unsigned i = 0; i < Params.size(); i++)
     Operands.push_back(Use(Params[i], this));
 }
 
 InvokeInst::InvokeInst(Value *Fn, BasicBlock *IfNormal,
-		       BasicBlock *IfException,
+                       BasicBlock *IfException,
                        const std::vector &Params,
-		       const std::string &Name, Instruction *InsertBefore)
+                       const std::string &Name, Instruction *InsertBefore)
   : TerminatorInst(cast(cast(Fn->getType())
-				    ->getElementType())->getReturnType(),
-		   Instruction::Invoke, Name, InsertBefore) {
+                                    ->getElementType())->getReturnType(),
+                   Instruction::Invoke, Name, InsertBefore) {
   init(Fn, IfNormal, IfException, Params);
 }
 
 InvokeInst::InvokeInst(Value *Fn, BasicBlock *IfNormal,
-		       BasicBlock *IfException,
+                       BasicBlock *IfException,
                        const std::vector &Params,
-		       const std::string &Name, BasicBlock *InsertAtEnd)
+                       const std::string &Name, BasicBlock *InsertAtEnd)
   : TerminatorInst(cast(cast(Fn->getType())
-				    ->getElementType())->getReturnType(),
-		   Instruction::Invoke, Name, InsertAtEnd) {
+                                    ->getElementType())->getReturnType(),
+                   Instruction::Invoke, Name, InsertAtEnd) {
   init(Fn, IfNormal, IfException, Params);
 }
 
@@ -217,15 +213,11 @@
 const Function *InvokeInst::getCalledFunction() const {
   if (const Function *F = dyn_cast(Operands[0]))
     return F;
-  if (const ConstantPointerRef *CPR = dyn_cast(Operands[0]))
-    return cast(CPR->getValue());
   return 0;
 }
 Function *InvokeInst::getCalledFunction() {
   if (Function *F = dyn_cast(Operands[0]))
     return F;
-  if (ConstantPointerRef *CPR = dyn_cast(Operands[0]))
-    return cast(CPR->getValue());
   return 0;
 }
 
@@ -233,7 +225,5 @@
   Value *Callee = getCalledValue();
   if (Function *F = dyn_cast(Callee))
     return F;
-  if (ConstantPointerRef *CPR = dyn_cast(Callee))
-    return cast(CPR->getValue());
   return 0;
 }




From llvm at cs.uiuc.edu  Sat Jul 17 19:06:36 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:06:36 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Globals.cpp 
Message-ID: <200407180006.TAA09538@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

Globals.cpp added (r1.1)

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Move these functions from other places
- Provide implementations of Constant class overrides in GlobalValue


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

Index: llvm/lib/VMCore/Globals.cpp
diff -c /dev/null llvm/lib/VMCore/Globals.cpp:1.1
*** /dev/null	Sat Jul 17 19:06:36 2004
--- llvm/lib/VMCore/Globals.cpp	Sat Jul 17 19:06:26 2004
***************
*** 0 ****
--- 1,139 ----
+ //===-- Globals.cpp - Implement the Global object classes -----------------===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by the LLVM research group and is distributed under
+ // the University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // This file implements the GlobalValue & GlobalVariable classes for the VMCore
+ // library.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #include "llvm/DerivedTypes.h"
+ #include "llvm/GlobalVariable.h"
+ #include "llvm/Module.h"
+ #include "llvm/SymbolTable.h"
+ #include "Support/LeakDetector.h"
+ 
+ using namespace llvm;
+ 
+ //===----------------------------------------------------------------------===//
+ //                            GlobalValue Class
+ //===----------------------------------------------------------------------===//
+ 
+ /// This could be named "SafeToDestroyGlobalValue". It just makes sure that 
+ /// there are no non-constant uses of this GlobalValue. If there aren't then
+ /// this and the transitive closure of the constants can be deleted. See the
+ /// destructor for details.
+ namespace {
+ bool removeDeadConstantUsers(Constant* C) {
+   while (!C->use_empty()) {
+     if (Constant *User = dyn_cast(C->use_back())) {
+       if (!removeDeadConstantUsers(User)) 
+         return false; // Constant wasn't dead
+     } else {
+       return false; // Non-constant usage;
+     }
+   }
+   if (!isa(C))
+     C->destroyConstant();
+   return true;
+ }
+ }
+ 
+ /// removeDeadConstantUsers - If there are any dead constant users dangling
+ /// off of this global value, remove them.  This method is useful for clients
+ /// that want to check to see if a global is unused, but don't want to deal
+ /// with potentially dead constants hanging off of the globals.
+ ///
+ /// This function returns true if the global value is now dead.  If all 
+ /// users of this global are not dead, this method may return false and
+ /// leave some of them around.
+ bool GlobalValue::removeDeadConstantUsers() {
+   while(!use_empty()) {
+     if (Constant* User = dyn_cast(use_back())) {
+       if (!::removeDeadConstantUsers(User))
+         return false; // Constant wasn't dead
+     } else {
+       return false; // Non-constant usage;
+     }
+   }
+   return true;
+ }
+ 
+ /// This virtual destructor is responsible for deleting any transitively dead
+ /// Constants that are using the GlobalValue.
+ GlobalValue::~GlobalValue() {
+   // Its an error to attempt destruction with non-constant uses remaining.
+   bool okay_to_destruct = removeDeadConstantUsers();
+   assert(okay_to_destruct && 
+          "Can't destroy GlobalValue with non-constant uses.");
+ }
+ 
+ /// Override destroyConstant to make sure it doesn't get called on 
+ /// GlobalValue's because they shouldn't be treated like other constants.
+ void GlobalValue::destroyConstant() {
+   assert(0 && "You can't GV->destroyConstant()!");
+   abort();
+ }
+ //===----------------------------------------------------------------------===//
+ // GlobalVariable Implementation
+ //===----------------------------------------------------------------------===//
+ 
+ GlobalVariable::GlobalVariable(const Type *Ty, bool constant, LinkageTypes Link,
+                                Constant *Initializer,
+                                const std::string &Name, Module *ParentModule)
+   : GlobalValue(PointerType::get(Ty), Value::GlobalVariableVal, Link, Name),
+     isConstantGlobal(constant) {
+   if (Initializer) Operands.push_back(Use((Value*)Initializer, this));
+ 
+   LeakDetector::addGarbageObject(this);
+ 
+   if (ParentModule)
+     ParentModule->getGlobalList().push_back(this);
+ }
+ 
+ void GlobalVariable::setParent(Module *parent) {
+   if (getParent())
+     LeakDetector::addGarbageObject(this);
+   Parent = parent;
+   if (getParent())
+     LeakDetector::removeGarbageObject(this);
+ }
+ 
+ // Specialize setName to take care of symbol table majik
+ void GlobalVariable::setName(const std::string &name, SymbolTable *ST) {
+   Module *P;
+   assert((ST == 0 || (!getParent() || ST == &getParent()->getSymbolTable())) &&
+          "Invalid symtab argument!");
+   if ((P = getParent()) && hasName()) P->getSymbolTable().remove(this);
+   Value::setName(name);
+   if (P && hasName()) P->getSymbolTable().insert(this);
+ }
+ 
+ void GlobalVariable::replaceUsesOfWithOnConstant(Value *From, Value *To,
+                                                  bool DisableChecking )
+ {
+   // If you call this, then you better know this GVar has a constant
+   // initializer worth replacing. Enforce that here.
+   assert(getNumOperands() == 1 && 
+          "Attempt to replace uses of Constants on a GVar with no initializer");
+ 
+   // And, since you know it has an initializer, the From value better be
+   // the initializer :)
+   assert(getOperand(0) == From &&
+          "Attempt to replace wrong constant initializer in GVar");
+ 
+   // And, you better have a constant for the replacement value
+   assert(isa(To) &&
+          "Attempt to replace GVar initializer with non-constant");
+   
+   // Okay, preconditions out of the way, replace the constant initializer.
+   this->setOperand(0,To);
+ }
+ 
+ // vim: sw=2 ai
+ 




From llvm at cs.uiuc.edu  Sat Jul 17 19:08:21 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:08:21 -0500
Subject: [llvm-commits] CVS: llvm/lib/AsmParser/llvmAsmParser.y 
Message-ID: <200407180008.TAA09559@zion.cs.uiuc.edu>



Changes in directory llvm/lib/AsmParser:

llvmAsmParser.y updated: 1.190 -> 1.191

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage
- Minimize redundant isa usage
- Correct isa for GlobalValue subclass
- Remove tabs
- Fix coments refering to ConstantPointerRef


---
Diffs of the changes:  (+47 -48)

Index: llvm/lib/AsmParser/llvmAsmParser.y
diff -u llvm/lib/AsmParser/llvmAsmParser.y:1.190 llvm/lib/AsmParser/llvmAsmParser.y:1.191
--- llvm/lib/AsmParser/llvmAsmParser.y:1.190	Thu Jul 15 20:18:09 2004
+++ llvm/lib/AsmParser/llvmAsmParser.y	Sat Jul 17 19:08:11 2004
@@ -79,7 +79,7 @@
   // GlobalRefs - This maintains a mapping between 's and forward
   // references to global values.  Global values may be referenced before they
   // are defined, and if so, the temporary object that they represent is held
-  // here.  This is used for forward references of ConstantPointerRefs.
+  // here.  This is used for forward references of GlobalValues.
   //
   typedef std::map, GlobalValue*> GlobalRefsType;
@@ -282,10 +282,10 @@
   case ValID::ConstUIntVal:     // Is it an unsigned const pool reference?
     if (!ConstantUInt::isValueValidForType(Ty, D.UConstPool64)) {
       if (!ConstantSInt::isValueValidForType(Ty, D.ConstPool64)) {
-	ThrowException("Integral constant '" + utostr(D.UConstPool64) +
+        ThrowException("Integral constant '" + utostr(D.UConstPool64) +
                        "' is invalid or out of range!");
       } else {     // This is really a signed reference.  Transmogrify.
-	return ConstantSInt::get(Ty, D.ConstPool64);
+        return ConstantSInt::get(Ty, D.ConstPool64);
       }
     } else {
       return ConstantUInt::get(Ty, D.UConstPool64);
@@ -452,15 +452,15 @@
         // resolver table
         InsertValue(V, *FutureLateResolvers);
       } else {
-	if (DID.Type == ValID::NameVal)
-	  ThrowException("Reference to an invalid definition: '" +DID.getName()+
-			 "' of type '" + V->getType()->getDescription() + "'",
-			 PHI->second.second);
-	else
-	  ThrowException("Reference to an invalid definition: #" +
-			 itostr(DID.Num) + " of type '" + 
-			 V->getType()->getDescription() + "'",
-			 PHI->second.second);
+        if (DID.Type == ValID::NameVal)
+          ThrowException("Reference to an invalid definition: '" +DID.getName()+
+                         "' of type '" + V->getType()->getDescription() + "'",
+                         PHI->second.second);
+        else
+          ThrowException("Reference to an invalid definition: #" +
+                         itostr(DID.Num) + " of type '" + 
+                         V->getType()->getDescription() + "'",
+                         PHI->second.second);
       }
     }
   }
@@ -643,7 +643,7 @@
 
     // Any other kind of (non-equivalent) redefinition is an error.
     ThrowException("Redefinition of type named '" + Name + "' in the '" +
-		   T->getDescription() + "' type plane!");
+                   T->getDescription() + "' type plane!");
   }
 
   return false;
@@ -703,8 +703,8 @@
 
   for (unsigned i = 0; i != UpRefs.size(); ++i) {
     UR_OUT("  UR#" << i << " - TypeContains(" << Ty->getDescription() << ", " 
-	   << UpRefs[i].second->getDescription() << ") = " 
-	   << (TypeContains(Ty, UpRefs[i].second) ? "true" : "false") << "\n");
+           << UpRefs[i].second->getDescription() << ") = " 
+           << (TypeContains(Ty, UpRefs[i].second) ? "true" : "false") << "\n");
     if (TypeContains(Ty, UpRefs[i].LastContainedTy)) {
       // Decrement level of upreference
       unsigned Level = --UpRefs[i].NestingLevel;
@@ -721,7 +721,7 @@
           UR_OUT("  * Type '" << OldName << "' refined upreference to: "
                  << (const void*)Ty << ", " << Ty->getDescription() << "\n");
         }
-	UpRefs.erase(UpRefs.begin()+i);     // Remove from upreference list...
+        UpRefs.erase(UpRefs.begin()+i);     // Remove from upreference list...
         --i;                                // Do not skip the next element...
       }
     }
@@ -1025,7 +1025,7 @@
   | UpRTypesV '(' ArgTypeListI ')' {           // Function derived type?
     std::vector Params;
     mapto($3->begin(), $3->end(), std::back_inserter(Params), 
-	  std::mem_fun_ref(&PATypeHolder::get));
+          std::mem_fun_ref(&PATypeHolder::get));
     bool isVarArg = Params.size() && Params.back() == Type::VoidTy;
     if (isVarArg) Params.pop_back();
 
@@ -1040,7 +1040,7 @@
   | '{' TypeListI '}' {                        // Structure type?
     std::vector Elements;
     mapto($2->begin(), $2->end(), std::back_inserter(Elements), 
-	std::mem_fun_ref(&PATypeHolder::get));
+        std::mem_fun_ref(&PATypeHolder::get));
 
     $$ = new PATypeHolder(HandleUpRefs(StructType::get(Elements)));
     delete $2;
@@ -1093,15 +1093,15 @@
     // Verify that we have the correct size...
     if (NumElements != -1 && NumElements != (int)$3->size())
       ThrowException("Type mismatch: constant sized array initialized with " +
-		     utostr($3->size()) +  " arguments, but has size of " + 
-		     itostr(NumElements) + "!");
+                     utostr($3->size()) +  " arguments, but has size of " + 
+                     itostr(NumElements) + "!");
 
     // Verify all elements are correct type!
     for (unsigned i = 0; i < $3->size(); i++) {
       if (ETy != (*$3)[i]->getType())
-	ThrowException("Element #" + utostr(i) + " is not of type '" + 
-		       ETy->getDescription() +"' as required!\nIt is of type '"+
-		       (*$3)[i]->getType()->getDescription() + "'.");
+        ThrowException("Element #" + utostr(i) + " is not of type '" + 
+                       ETy->getDescription() +"' as required!\nIt is of type '"+
+                       (*$3)[i]->getType()->getDescription() + "'.");
     }
 
     $$ = ConstantArray::get(ATy, *$3);
@@ -1116,7 +1116,7 @@
     int NumElements = ATy->getNumElements();
     if (NumElements != -1 && NumElements != 0) 
       ThrowException("Type mismatch: constant sized array initialized with 0"
-		     " arguments, but has size of " + itostr(NumElements) +"!");
+                     " arguments, but has size of " + itostr(NumElements) +"!");
     $$ = ConstantArray::get(ATy, std::vector());
     delete $1;
   }
@@ -1131,15 +1131,15 @@
     char *EndStr = UnEscapeLexed($3, true);
     if (NumElements != -1 && NumElements != (EndStr-$3))
       ThrowException("Can't build string constant of size " + 
-		     itostr((int)(EndStr-$3)) +
-		     " when array has size " + itostr(NumElements) + "!");
+                     itostr((int)(EndStr-$3)) +
+                     " when array has size " + itostr(NumElements) + "!");
     std::vector Vals;
     if (ETy == Type::SByteTy) {
       for (char *C = $3; C != EndStr; ++C)
-	Vals.push_back(ConstantSInt::get(ETy, *C));
+        Vals.push_back(ConstantSInt::get(ETy, *C));
     } else if (ETy == Type::UByteTy) {
       for (char *C = $3; C != EndStr; ++C)
-	Vals.push_back(ConstantUInt::get(ETy, (unsigned char)*C));
+        Vals.push_back(ConstantUInt::get(ETy, (unsigned char)*C));
     } else {
       free($3);
       ThrowException("Cannot build string arrays of non byte sized elements!");
@@ -1195,7 +1195,7 @@
       ThrowException("Global const reference must be a pointer type!");
 
     // ConstExprs can exist in the body of a function, thus creating
-    // ConstantPointerRefs whenever they refer to a variable.  Because we are in
+    // GlobalValues whenever they refer to a variable.  Because we are in
     // the context of a function, getValNonImprovising will search the functions
     // symbol table instead of the module symbol table for the global symbol,
     // which throws things all off.  To get around this, we just tell
@@ -1218,35 +1218,34 @@
 
       // First check to see if the forward references value is already created!
       PerModuleInfo::GlobalRefsType::iterator I =
-	CurModule.GlobalRefs.find(std::make_pair(PT, $2));
+        CurModule.GlobalRefs.find(std::make_pair(PT, $2));
     
       if (I != CurModule.GlobalRefs.end()) {
-	V = I->second;             // Placeholder already exists, use it...
+        V = I->second;             // Placeholder already exists, use it...
         $2.destroy();
       } else {
         std::string Name;
         if ($2.Type == ValID::NameVal) Name = $2.Name;
 
-	// Create the forward referenced global.
+        // Create the forward referenced global.
         GlobalValue *GV;
         if (const FunctionType *FTy = 
                  dyn_cast(PT->getElementType())) {
           GV = new Function(FTy, GlobalValue::ExternalLinkage, Name,
                             CurModule.CurrentModule);
         } else {
-	  GV = new GlobalVariable(PT->getElementType(), false,
+          GV = new GlobalVariable(PT->getElementType(), false,
                                   GlobalValue::ExternalLinkage, 0,
                                   Name, CurModule.CurrentModule);
         }
 
-	// Keep track of the fact that we have a forward ref to recycle it
-	CurModule.GlobalRefs.insert(std::make_pair(std::make_pair(PT, $2), GV));
-	V = GV;
+        // Keep track of the fact that we have a forward ref to recycle it
+        CurModule.GlobalRefs.insert(std::make_pair(std::make_pair(PT, $2), GV));
+        V = GV;
       }
     }
 
-    GlobalValue *GV = cast(V);
-    $$ = ConstantPointerRef::get(GV);
+    $$ = cast(V);
     delete $1;            // Free the type handle
   }
   | Types ConstExpr {
@@ -1730,12 +1729,12 @@
       std::vector::iterator ArgI = $5->begin(), ArgE = $5->end();
 
       for (; ArgI != ArgE && I != E; ++ArgI, ++I)
-	if ((*ArgI)->getType() != *I)
-	  ThrowException("Parameter " +(*ArgI)->getName()+ " is not of type '" +
-			 (*I)->getDescription() + "'!");
+        if ((*ArgI)->getType() != *I)
+          ThrowException("Parameter " +(*ArgI)->getName()+ " is not of type '" +
+                         (*I)->getDescription() + "'!");
 
       if (I != E || (ArgI != ArgE && !Ty->isVarArg()))
-	ThrowException("Invalid number of parameters detected!");
+        ThrowException("Invalid number of parameters detected!");
 
       $$ = new InvokeInst(V, Normal, Except, *$5);
     }
@@ -1891,7 +1890,7 @@
     $$->op_reserve($2->size()*2);
     while ($2->begin() != $2->end()) {
       if ($2->front().first->getType() != Ty) 
-	ThrowException("All elements of a PHI node must be of the same type!");
+        ThrowException("All elements of a PHI node must be of the same type!");
       cast($$)->addIncoming($2->front().first, $2->front().second);
       $2->pop_front();
     }
@@ -1937,12 +1936,12 @@
       std::vector::iterator ArgI = $5->begin(), ArgE = $5->end();
 
       for (; ArgI != ArgE && I != E; ++ArgI, ++I)
-	if ((*ArgI)->getType() != *I)
-	  ThrowException("Parameter " +(*ArgI)->getName()+ " is not of type '" +
-			 (*I)->getDescription() + "'!");
+        if ((*ArgI)->getType() != *I)
+          ThrowException("Parameter " +(*ArgI)->getName()+ " is not of type '" +
+                         (*I)->getDescription() + "'!");
 
       if (I != E || (ArgI != ArgE && !Ty->isVarArg()))
-	ThrowException("Invalid number of parameters detected!");
+        ThrowException("Invalid number of parameters detected!");
 
       $$ = new CallInst(V, *$5);
     }
@@ -1995,7 +1994,7 @@
   | OptVolatile LOAD Types ValueRef {
     if (!isa($3->get()))
       ThrowException("Can't load from nonpointer type: " +
-		     (*$3)->getDescription());
+                     (*$3)->getDescription());
     $$ = new LoadInst(getVal(*$3, $4), "", $1);
     delete $3;
   }




From llvm at cs.uiuc.edu  Sat Jul 17 19:10:46 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:10:46 -0500
Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Reader/Analyzer.cpp 
Message-ID: <200407180010.TAA09593@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Bytecode/Reader:

Analyzer.cpp updated: 1.10 -> 1.11

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Update for BytecodeHandler interface change resuing from CPRs going away


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

Index: llvm/lib/Bytecode/Reader/Analyzer.cpp
diff -u llvm/lib/Bytecode/Reader/Analyzer.cpp:1.10 llvm/lib/Bytecode/Reader/Analyzer.cpp:1.11
--- llvm/lib/Bytecode/Reader/Analyzer.cpp:1.10	Sat Jul 10 03:04:13 2004
+++ llvm/lib/Bytecode/Reader/Analyzer.cpp	Sat Jul 17 19:10:36 2004
@@ -392,12 +392,10 @@
   }
 
   virtual void handleConstantPointer( const PointerType* PT, 
-      unsigned Slot, GlobalValue* GV, Constant* PtrVal) {
+      unsigned Slot, GlobalValue* GV ) {
     dump << "       PNTR: " << PT->getDescription() 
          << " Slot=" << Slot << " GlobalValue=";
     GV->print(dump);
-    dump << "\n        Value=";
-    PtrVal->print(dump);
     dump << "\n";
     bca.numConstants++;
     bca.numValues++;




From llvm at cs.uiuc.edu  Sat Jul 17 19:12:13 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:12:13 -0500
Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Reader/Reader.cpp 
Message-ID: <200407180012.TAA09612@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Bytecode/Reader:

Reader.cpp updated: 1.115 -> 1.116

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage
- Correct isa for GlobalValue subclass


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

Index: llvm/lib/Bytecode/Reader/Reader.cpp
diff -u llvm/lib/Bytecode/Reader/Reader.cpp:1.115 llvm/lib/Bytecode/Reader/Reader.cpp:1.116
--- llvm/lib/Bytecode/Reader/Reader.cpp:1.115	Wed Jul 14 15:33:13 2004
+++ llvm/lib/Bytecode/Reader/Reader.cpp	Sat Jul 17 19:12:03 2004
@@ -425,12 +425,9 @@
   if (Value *V = getValue(TypeSlot, Slot, false))
     if (Constant *C = dyn_cast(V))
       return C;   // If we already have the value parsed, just return it
-    else if (GlobalValue *GV = dyn_cast(V))
-      // ConstantPointerRef's are an abomination, but at least they don't have
-      // to infest bytecode files.
-      return ConstantPointerRef::get(GV);
     else
-      error("Reference of a value is expected to be a constant!");
+      error("Value for slot " + utostr(Slot) + 
+            " is expected to be a constant!");
 
   const Type *Ty = getType(TypeSlot);
   std::pair Key(Ty, Slot);
@@ -1356,14 +1353,13 @@
     GlobalValue *GV;
     if (Val) {
       if (!(GV = dyn_cast(Val))) 
-        error("Value of ConstantPointerRef not in ValueTable!");
+        error("GlobalValue not in ValueTable!");
     } else {
       error("Forward references are not allowed here.");
     }
     
-    Constant* Result = ConstantPointerRef::get(GV);
-    if (Handler) Handler->handleConstantPointer(PT, Slot, GV, Result);
-    return Result;
+    if (Handler) Handler->handleConstantPointer(PT, Slot, GV );
+    return GV;
   }
 
   default:




From llvm at cs.uiuc.edu  Sat Jul 17 19:13:22 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:13:22 -0500
Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Reader/Reader.h 
Message-ID: <200407180013.TAA09624@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Bytecode/Reader:

Reader.h updated: 1.6 -> 1.7

---
Log message:

User ValueListTy as the type of the ValueList. This avoides the ValueList
from being treated like a Function which can cause the contents of the list
to be come invalidated.


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

Index: llvm/lib/Bytecode/Reader/Reader.h
diff -u llvm/lib/Bytecode/Reader/Reader.h:1.6 llvm/lib/Bytecode/Reader/Reader.h:1.7
--- llvm/lib/Bytecode/Reader/Reader.h:1.6	Sun Jul 11 12:24:05 2004
+++ llvm/lib/Bytecode/Reader/Reader.h	Sat Jul 17 19:13:12 2004
@@ -72,7 +72,7 @@
   /// globals section.
   /// @brief A list of values as a User of those Values.
   struct ValueList : public User {
-    ValueList() : User(Type::VoidTy, Value::FunctionVal) {}
+    ValueList() : User(Type::VoidTy, Value::ValueListVal) {}
 
     // vector compatibility methods
     unsigned size() const { return getNumOperands(); }




From llvm at cs.uiuc.edu  Sat Jul 17 19:16:31 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:16:31 -0500
Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Writer/Writer.cpp 
Message-ID: <200407180016.TAA09658@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Bytecode/Writer:

Writer.cpp updated: 1.69 -> 1.70

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Correct ordering of tests because for GlobalValue isa Constant


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

Index: llvm/lib/Bytecode/Writer/Writer.cpp
diff -u llvm/lib/Bytecode/Writer/Writer.cpp:1.69 llvm/lib/Bytecode/Writer/Writer.cpp:1.70
--- llvm/lib/Bytecode/Writer/Writer.cpp:1.69	Sun Jul  4 06:46:15 2004
+++ llvm/lib/Bytecode/Writer/Writer.cpp	Sat Jul 17 19:16:21 2004
@@ -135,8 +135,8 @@
 
   for (unsigned i = ValNo; i < ValNo+NC; ++i) {
     const Value *V = Plane[i];
-    if (const Constant *CPV = dyn_cast(V)) {
-      outputConstant(CPV);
+    if (const Constant *C = dyn_cast(V)) {
+      outputConstant(C);
     }
   }
 }
@@ -151,13 +151,11 @@
 
   unsigned NumPlanes = Table.getNumPlanes();
 
-  // Output the type plane before any constants!
-  if (isFunction) {
+  if (isFunction)
+    // Output the type plane before any constants!
     outputTypes( Table.getModuleTypeLevel() );
-  }
-  
-  // Output module-level string constants before any other constants.x
-  if (!isFunction)
+  else
+    // Output module-level string constants before any other constants.x
     outputConstantStrings();
 
   for (unsigned pno = 0; pno != NumPlanes; pno++) {
@@ -397,3 +395,5 @@
   }
   Out.flush();
 }
+
+// vim: sw=2 ai




From llvm at cs.uiuc.edu  Sat Jul 17 19:17:20 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:17:20 -0500
Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Writer/SlotCalculator.cpp 
Message-ID: <200407180017.TAA09675@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Bytecode/Writer:

SlotCalculator.cpp updated: 1.59 -> 1.60

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage
- Minimize redundant isa usage
- Correct isa for GlobalValue subclass


---
Diffs of the changes:  (+16 -30)

Index: llvm/lib/Bytecode/Writer/SlotCalculator.cpp
diff -u llvm/lib/Bytecode/Writer/SlotCalculator.cpp:1.59 llvm/lib/Bytecode/Writer/SlotCalculator.cpp:1.60
--- llvm/lib/Bytecode/Writer/SlotCalculator.cpp:1.59	Mon Jul 12 15:29:52 2004
+++ llvm/lib/Bytecode/Writer/SlotCalculator.cpp	Sat Jul 17 19:17:10 2004
@@ -77,8 +77,6 @@
 unsigned SlotCalculator::getGlobalSlot(const Value *V) const {
   assert(!CompactionTable.empty() &&
          "This method can only be used when compaction is enabled!");
-  if (const ConstantPointerRef *CPR = dyn_cast(V))
-    V = CPR->getValue();
   std::map::const_iterator I = NodeMap.find(V);
   assert(I != NodeMap.end() && "Didn't find global slot entry!");
   return I->second;
@@ -169,17 +167,14 @@
       }
   }
   
-  // If we are emitting a bytecode file, scan all of the functions for their
-  // constants, which allows us to emit more compact modules.  This is optional,
-  // and is just used to compactify the constants used by different functions
-  // together.
-  //
-  // This functionality is completely optional for the bytecode writer, but
-  // tends to produce smaller bytecode files.  This should not be used in the
-  // future by clients that want to, for example, build and emit functions on
-  // the fly.  For now, however, it is unconditionally enabled when building
-  // bytecode information.
+  // Scan all of the functions for their constants, which allows us to emit 
+  // more compact modules.  This is optional, and is just used to compactify 
+  // the constants used by different functions together.
   //
+  // This functionality tends to produce smaller bytecode files.  This should 
+  // not be used in the future by clients that want to, for example, build and 
+  // emit functions on the fly.  For now, however, it is unconditionally 
+  // enabled.
   ModuleContainsAllFunctionConstants = true;
 
   SC_DEBUG("Inserting function constants:\n");
@@ -187,7 +182,8 @@
        F != E; ++F) {
     for (const_inst_iterator I = inst_begin(F), E = inst_end(F); I != E; ++I){
       for (unsigned op = 0, e = I->getNumOperands(); op != e; ++op)
-        if (isa(I->getOperand(op)))
+        if (isa(I->getOperand(op)) && 
+            !isa(I->getOperand(op)))
           getOrCreateSlot(I->getOperand(op));
       getOrCreateSlot(I->getType());
       if (const VANextInst *VAN = dyn_cast(&*I))
@@ -265,7 +261,8 @@
        PE = ST->plane_end(); PI != PE; ++PI)
     for (SymbolTable::value_const_iterator VI = PI->second.begin(),
            VE = PI->second.end(); VI != VE; ++VI)
-      if (isa(VI->second))
+      if (isa(VI->second) &&
+          !isa(VI->second))
         getOrCreateSlot(VI->second);
 }
 
@@ -397,8 +394,6 @@
 /// getOrCreateCompactionTableSlot - This method is used to build up the initial
 /// approximation of the compaction table.
 unsigned SlotCalculator::getOrCreateCompactionTableSlot(const Value *V) {
-  if (const ConstantPointerRef *CPR = dyn_cast(V))
-    V = CPR->getValue();
   std::map::iterator I =
     CompactionNodeMap.lower_bound(V);
   if (I != CompactionNodeMap.end() && I->first == V)
@@ -473,8 +468,7 @@
   for (const_inst_iterator I = inst_begin(F), E = inst_end(F); I != E; ++I) {
     getOrCreateCompactionTableSlot(I->getType());
     for (unsigned op = 0, e = I->getNumOperands(); op != e; ++op)
-      if (isa(I->getOperand(op)) ||
-          isa(I->getOperand(op)))
+      if (isa(I->getOperand(op)))
         getOrCreateCompactionTableSlot(I->getOperand(op));
     if (const VANextInst *VAN = dyn_cast(&*I))
       getOrCreateCompactionTableSlot(VAN->getArgType());
@@ -491,7 +485,7 @@
        PE = ST.plane_end(); PI != PE; ++PI)
     for (SymbolTable::value_const_iterator VI = PI->second.begin(),
            VE = PI->second.end(); VI != VE; ++VI)
-      if (isa(VI->second) || isa(VI->second))
+      if (isa(VI->second) && !isa(VI->second))
         getOrCreateCompactionTableSlot(VI->second);
 
   // Now that we have all of the values in the table, and know what types are
@@ -643,10 +637,6 @@
   if (I != NodeMap.end())
     return (int)I->second;
 
-  // Do not number ConstantPointerRef's at all.  They are an abomination.
-  if (const ConstantPointerRef *CPR = dyn_cast(V))
-    return getSlot(CPR->getValue());
-
   return -1;
 }
 
@@ -674,10 +664,6 @@
   int SlotNo = getSlot(V);        // Check to see if it's already in!
   if (SlotNo != -1) return SlotNo;
 
-  // Do not number ConstantPointerRef's at all.  They are an abomination.
-  if (const ConstantPointerRef *CPR = dyn_cast(V))
-    return getOrCreateSlot(CPR->getValue());
-
   if (!isa(V))  // Initializers for globals are handled explicitly
     if (const Constant *C = dyn_cast(V)) {
       assert(CompactionNodeMap.empty() &&
@@ -720,8 +706,8 @@
   // insert the value into the compaction map, not into the global map.
   if (!CompactionNodeMap.empty()) {
     if (D->getType() == Type::VoidTy) return -1;  // Do not insert void values
-    assert(!isa(D) && !isa(D) &&
-           "Types, constants, and globals should be in global SymTab!");
+    assert(!isa(D) &&
+           "Types, constants, and globals should be in global table!");
 
     int Plane = getSlot(D->getType());
     assert(Plane != -1 && CompactionTable.size() > (unsigned)Plane &&
@@ -774,7 +760,7 @@
       if (getSlot(SubTy) == -1) {
         SC_DEBUG("  Inserting subtype: " << SubTy->getDescription() << "\n");
         doInsertType(SubTy);
-        SC_DEBUG("  Inserted subtype: " << SubTy->getDescription());
+        SC_DEBUG("  Inserted subtype: " << SubTy->getDescription() << "\n");
       }
     }
   }




From llvm at cs.uiuc.edu  Sat Jul 17 19:18:40 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:18:40 -0500
Subject: [llvm-commits] CVS: llvm/lib/Analysis/IPA/Andersens.cpp
	CallGraph.cpp FindUsedTypes.cpp GlobalsModRef.cpp 
Message-ID: <200407180018.TAA09720@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Analysis/IPA:

Andersens.cpp updated: 1.4 -> 1.5
CallGraph.cpp updated: 1.37 -> 1.38
FindUsedTypes.cpp updated: 1.28 -> 1.29
GlobalsModRef.cpp updated: 1.1 -> 1.2

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage
- Minimize redundant isa usage
- Correct isa for GlobalValue subclass


---
Diffs of the changes:  (+12 -15)

Index: llvm/lib/Analysis/IPA/Andersens.cpp
diff -u llvm/lib/Analysis/IPA/Andersens.cpp:1.4 llvm/lib/Analysis/IPA/Andersens.cpp:1.5
--- llvm/lib/Analysis/IPA/Andersens.cpp:1.4	Thu Jun 24 23:24:22 2004
+++ llvm/lib/Analysis/IPA/Andersens.cpp	Sat Jul 17 19:18:30 2004
@@ -479,8 +479,8 @@
 
   if (isa(C))
     return &GraphNodes[NullPtr];
-  else if (ConstantPointerRef *CPR = dyn_cast(C))
-    return getNode(CPR->getValue());
+  else if (GlobalValue *GV = dyn_cast(C))
+    return getNode(GV);
   else if (ConstantExpr *CE = dyn_cast(C)) {
     switch (CE->getOpcode()) {
     case Instruction::GetElementPtr:
@@ -507,8 +507,8 @@
 
   if (isa(C))
     return &GraphNodes[NullObject];
-  else if (ConstantPointerRef *CPR = dyn_cast(C))
-    return getObject(CPR->getValue());
+  else if (GlobalValue *GV = dyn_cast(C))
+    return getObject(GV);
   else if (ConstantExpr *CE = dyn_cast(C)) {
     switch (CE->getOpcode()) {
     case Instruction::GetElementPtr:


Index: llvm/lib/Analysis/IPA/CallGraph.cpp
diff -u llvm/lib/Analysis/IPA/CallGraph.cpp:1.37 llvm/lib/Analysis/IPA/CallGraph.cpp:1.38
--- llvm/lib/Analysis/IPA/CallGraph.cpp:1.37	Sun May  2 11:06:18 2004
+++ llvm/lib/Analysis/IPA/CallGraph.cpp	Sat Jul 17 19:18:30 2004
@@ -73,10 +73,8 @@
         getNodeFor(Inst->getParent()->getParent())->addCalledFunction(Node);
       else
         isUsedExternally = true;
-    } else if (ConstantPointerRef *CPR = dyn_cast(*I)) {
-      // THIS IS A DISGUSTING HACK.  Brought to you by the power of
-      // ConstantPointerRefs!
-      for (Value::use_iterator I = CPR->use_begin(), E = CPR->use_end();
+    } else if (GlobalValue *GV = dyn_cast(*I)) {
+      for (Value::use_iterator I = GV->use_begin(), E = GV->use_end();
            I != E; ++I)
         if (Instruction *Inst = dyn_cast(*I)) {
           if (isOnlyADirectCall(F, CallSite::get(Inst)))


Index: llvm/lib/Analysis/IPA/FindUsedTypes.cpp
diff -u llvm/lib/Analysis/IPA/FindUsedTypes.cpp:1.28 llvm/lib/Analysis/IPA/FindUsedTypes.cpp:1.29
--- llvm/lib/Analysis/IPA/FindUsedTypes.cpp:1.28	Wed Jul 14 21:31:46 2004
+++ llvm/lib/Analysis/IPA/FindUsedTypes.cpp	Sat Jul 17 19:18:30 2004
@@ -48,9 +48,10 @@
   
   // If this is a constant, it could be using other types...
   if (const Constant *C = dyn_cast(V)) {
-    for (User::const_op_iterator OI = C->op_begin(), OE = C->op_end();
-         OI != OE; ++OI)
-      IncorporateValue(*OI);
+    if (!isa(C))
+      for (User::const_op_iterator OI = C->op_begin(), OE = C->op_end();
+	   OI != OE; ++OI)
+	IncorporateValue(*OI);
   }
 }
 


Index: llvm/lib/Analysis/IPA/GlobalsModRef.cpp
diff -u llvm/lib/Analysis/IPA/GlobalsModRef.cpp:1.1 llvm/lib/Analysis/IPA/GlobalsModRef.cpp:1.2
--- llvm/lib/Analysis/IPA/GlobalsModRef.cpp:1.1	Mon Jun 28 01:33:13 2004
+++ llvm/lib/Analysis/IPA/GlobalsModRef.cpp	Sat Jul 17 19:18:30 2004
@@ -165,8 +165,8 @@
       } else {
         return true;
       }        
-    } else if (ConstantPointerRef *CPR = dyn_cast(*UI)) {
-      if (AnalyzeUsesOfGlobal(CPR, Readers, Writers)) return true;
+    } else if (GlobalValue *GV = dyn_cast(*UI)) {
+      if (AnalyzeUsesOfGlobal(GV, Readers, Writers)) return true;
     } else {
       return true;
     }
@@ -257,8 +257,6 @@
     if (CE->getOpcode() == Instruction::Cast ||
         CE->getOpcode() == Instruction::GetElementPtr)
       return getUnderlyingObject(CE->getOperand(0));
-  } else if (const ConstantPointerRef *CPR = dyn_cast(V)) {
-    return CPR->getValue();
   }
   return 0;
 }




From llvm at cs.uiuc.edu  Sat Jul 17 19:18:40 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:18:40 -0500
Subject: [llvm-commits] 
	CVS: llvm/lib/Analysis/DataStructure/DataStructureStats.cpp
	Local.cpp Printer.cpp 
Message-ID: <200407180018.TAA09708@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Analysis/DataStructure:

DataStructureStats.cpp updated: 1.11 -> 1.12
Local.cpp updated: 1.107 -> 1.108
Printer.cpp updated: 1.70 -> 1.71

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage
- Minimize redundant isa usage
- Correct isa for GlobalValue subclass


---
Diffs of the changes:  (+10 -15)

Index: llvm/lib/Analysis/DataStructure/DataStructureStats.cpp
diff -u llvm/lib/Analysis/DataStructure/DataStructureStats.cpp:1.11 llvm/lib/Analysis/DataStructure/DataStructureStats.cpp:1.12
--- llvm/lib/Analysis/DataStructure/DataStructureStats.cpp:1.11	Wed Jul  7 01:32:21 2004
+++ llvm/lib/Analysis/DataStructure/DataStructureStats.cpp	Sat Jul 17 19:18:30 2004
@@ -102,7 +102,7 @@
 
 DSNode *DSGraphStats::getNodeForValue(Value *V) {
   const DSGraph *G = TDGraph;
-  if (isa(V) || isa(V))
+  if (isa(V))
     G = TDGraph->getGlobalsGraph();
 
   const DSGraph::ScalarMapTy &ScalarMap = G->getScalarMap();


Index: llvm/lib/Analysis/DataStructure/Local.cpp
diff -u llvm/lib/Analysis/DataStructure/Local.cpp:1.107 llvm/lib/Analysis/DataStructure/Local.cpp:1.108
--- llvm/lib/Analysis/DataStructure/Local.cpp:1.107	Wed Jul  7 01:32:21 2004
+++ llvm/lib/Analysis/DataStructure/Local.cpp	Sat Jul 17 19:18:30 2004
@@ -220,10 +220,13 @@
   // Otherwise we need to create a new node to point to.
   // Check first for constant expressions that must be traversed to
   // extract the actual value.
-  if (Constant *C = dyn_cast(V))
-    if (ConstantPointerRef *CPR = dyn_cast(C)) {
-      return NH = getValueDest(*CPR->getValue());
-    } else if (ConstantExpr *CE = dyn_cast(C)) {
+  DSNode* N;
+  if (GlobalValue* GV = dyn_cast(V)) {
+    // Create a new global node for this global variable...
+    N = createNode(GV->getType()->getElementType());
+    N->addGlobal(GV);
+  } else if (Constant *C = dyn_cast(V)) {
+    if (ConstantExpr *CE = dyn_cast(C)) {
       if (CE->getOpcode() == Instruction::Cast)
         NH = getValueDest(*CE->getOperand(0));
       else if (CE->getOpcode() == Instruction::GetElementPtr) {
@@ -247,13 +250,7 @@
     } else {
       assert(0 && "Unknown constant type!");
     }
-
-  // Otherwise we need to create a new node to point to...
-  DSNode *N;
-  if (GlobalValue *GV = dyn_cast(V)) {
-    // Create a new global node for this global variable...
-    N = createNode(GV->getType()->getElementType());
-    N->addGlobal(GV);
+    N = createNode(); // just create a shadow node
   } else {
     // Otherwise just create a shadow node
     N = createNode();
@@ -491,8 +488,6 @@
 
 void GraphBuilder::visitCallSite(CallSite CS) {
   Value *Callee = CS.getCalledValue();
-  if (ConstantPointerRef *CPR = dyn_cast(Callee))
-    Callee = CPR->getValue();
 
   // Special case handling of certain libc allocation functions here.
   if (Function *F = dyn_cast(Callee))


Index: llvm/lib/Analysis/DataStructure/Printer.cpp
diff -u llvm/lib/Analysis/DataStructure/Printer.cpp:1.70 llvm/lib/Analysis/DataStructure/Printer.cpp:1.71
--- llvm/lib/Analysis/DataStructure/Printer.cpp:1.70	Wed Jul  7 01:32:21 2004
+++ llvm/lib/Analysis/DataStructure/Printer.cpp	Sat Jul 17 19:18:30 2004
@@ -138,7 +138,7 @@
     // Add scalar nodes to the graph...
     const DSGraph::ScalarMapTy &VM = G->getScalarMap();
     for (DSGraph::ScalarMapTy::const_iterator I = VM.begin(); I != VM.end();++I)
-      if (!isa(I->first) && !isa(I->first)) {
+      if (!isa(I->first)) {
         std::stringstream OS;
         WriteAsOperand(OS, I->first, false, true, CurMod);
         GW.emitSimpleNode(I->first, "", OS.str());




From llvm at cs.uiuc.edu  Sat Jul 17 19:18:40 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:18:40 -0500
Subject: [llvm-commits] CVS: llvm/lib/Analysis/BasicAliasAnalysis.cpp
	ScalarEvolution.cpp 
Message-ID: <200407180018.TAA09696@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Analysis:

BasicAliasAnalysis.cpp updated: 1.45 -> 1.46
ScalarEvolution.cpp updated: 1.22 -> 1.23

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage
- Minimize redundant isa usage
- Correct isa for GlobalValue subclass


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

Index: llvm/lib/Analysis/BasicAliasAnalysis.cpp
diff -u llvm/lib/Analysis/BasicAliasAnalysis.cpp:1.45 llvm/lib/Analysis/BasicAliasAnalysis.cpp:1.46
--- llvm/lib/Analysis/BasicAliasAnalysis.cpp:1.45	Wed Jul 14 15:27:12 2004
+++ llvm/lib/Analysis/BasicAliasAnalysis.cpp	Sat Jul 17 19:18:30 2004
@@ -143,8 +143,8 @@
     if (CE->getOpcode() == Instruction::Cast ||
         CE->getOpcode() == Instruction::GetElementPtr)
       return getUnderlyingObject(CE->getOperand(0));
-  } else if (const ConstantPointerRef *CPR = dyn_cast(V)) {
-    return CPR->getValue();
+  } else if (const GlobalValue *GV = dyn_cast(V)) {
+    return GV;
   }
   return 0;
 }
@@ -166,7 +166,7 @@
   V = cast(V)->getOperand(0);
 
   while (const User *G = isGEP(V)) {
-    if (!isa(GEPOps[0]) ||
+    if (!isa(GEPOps[0]) || isa(GEPOps[0]) ||
         !cast(GEPOps[0])->isNullValue())
       break;  // Don't handle folding arbitrary pointer offsets yet...
     GEPOps.erase(GEPOps.begin());   // Drop the zero index
@@ -217,7 +217,7 @@
 //
 AliasAnalysis::ModRefResult
 BasicAliasAnalysis::getModRefInfo(CallSite CS, Value *P, unsigned Size) {
-  if (!isa(P) && !isa(P))
+  if (!isa(P))
     if (const AllocationInst *AI =
                   dyn_cast_or_null(getUnderlyingObject(P))) {
       // Okay, the pointer is to a stack allocated object.  If we can prove that
@@ -246,12 +246,6 @@
     if (CE->getOpcode() == Instruction::Cast)
       V2 = CE->getOperand(0);
 
-  // Strip off constant pointer refs if they exist
-  if (const ConstantPointerRef *CPR = dyn_cast(V1))
-    V1 = CPR->getValue();
-  if (const ConstantPointerRef *CPR = dyn_cast(V2))
-    V2 = CPR->getValue();
-
   // Are we checking for alias of the same value?
   if (V1 == V2) return MustAlias;
 
@@ -380,7 +374,7 @@
           // the arguments provided, except substitute 0's for any variable
           // indexes we find...
           for (unsigned i = 0; i != GEPOperands.size(); ++i)
-            if (!isa(GEPOperands[i]) ||
+            if (!isa(GEPOperands[i]) || isa(GEPOperands[i]) ||
                 isa(GEPOperands[i]))
               GEPOperands[i] =Constant::getNullValue(GEPOperands[i]->getType());
           int64_t Offset = getTargetData().getIndexedOffset(BasePtr->getType(),
@@ -453,7 +447,7 @@
     
     bool AllAreZeros = true;
     for (unsigned i = UnequalOper; i != MaxOperands; ++i)
-      if (!isa(GEP1Ops[i]) ||
+      if (!isa(GEP1Ops[i]) || 
           !cast(GEP1Ops[i])->isNullValue()) {
         AllAreZeros = false;
         break;


Index: llvm/lib/Analysis/ScalarEvolution.cpp
diff -u llvm/lib/Analysis/ScalarEvolution.cpp:1.22 llvm/lib/Analysis/ScalarEvolution.cpp:1.23
--- llvm/lib/Analysis/ScalarEvolution.cpp:1.22	Thu Jun 24 01:51:27 2004
+++ llvm/lib/Analysis/ScalarEvolution.cpp	Sat Jul 17 19:18:30 2004
@@ -1498,9 +1498,9 @@
   case Instruction::Select:
     return ConstantExpr::getSelect(Operands[0], Operands[1], Operands[2]);
   case Instruction::Call:
-    if (ConstantPointerRef *CPR = dyn_cast(Operands[0])) {
+    if (Function *GV = dyn_cast(Operands[0])) {
       Operands.erase(Operands.begin());
-      return ConstantFoldCall(cast(CPR->getValue()), Operands);
+      return ConstantFoldCall(cast(GV), Operands);
     }
 
     return 0;
@@ -1560,9 +1560,9 @@
 /// reason, return null.
 static Constant *EvaluateExpression(Value *V, Constant *PHIVal) {
   if (isa(V)) return PHIVal;
-  if (Constant *C = dyn_cast(V)) return C;
   if (GlobalValue *GV = dyn_cast(V))
-    return ConstantPointerRef::get(GV);
+    return GV;
+  if (Constant *C = dyn_cast(V)) return C;
   Instruction *I = cast(V);
 
   std::vector Operands;
@@ -1718,8 +1718,6 @@
           Value *Op = I->getOperand(i);
           if (Constant *C = dyn_cast(Op)) {
             Operands.push_back(C);
-          } else if (GlobalValue *GV = dyn_cast(Op)) {
-            Operands.push_back(ConstantPointerRef::get(GV));
           } else {
             SCEVHandle OpV = getSCEVAtScope(getSCEV(Op), L);
             if (SCEVConstant *SC = dyn_cast(OpV))




From llvm at cs.uiuc.edu  Sat Jul 17 19:19:55 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:19:55 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/LevelRaise.cpp 
Message-ID: <200407180019.TAA09735@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms:

LevelRaise.cpp updated: 1.98 -> 1.99

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage
- Correct test ordering for GlobalValue subclass


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

Index: llvm/lib/Transforms/LevelRaise.cpp
diff -u llvm/lib/Transforms/LevelRaise.cpp:1.98 llvm/lib/Transforms/LevelRaise.cpp:1.99
--- llvm/lib/Transforms/LevelRaise.cpp:1.98	Wed Jul 14 21:06:06 2004
+++ llvm/lib/Transforms/LevelRaise.cpp	Sat Jul 17 19:19:45 2004
@@ -528,18 +528,12 @@
       Constant *ConstantCallSrc = 0;
       if (Constant *CS = dyn_cast(CI->getCalledValue()))
         ConstantCallSrc = CS;
-      else if (GlobalValue *GV = dyn_cast(CI->getCalledValue()))
-        ConstantCallSrc = ConstantPointerRef::get(GV);
 
       if (ConstantCallSrc)
         NewCast = ConstantExpr::getCast(ConstantCallSrc, NewPFunTy);
       else
         NewCast = new CastInst(CI->getCalledValue(), NewPFunTy,
                                CI->getCalledValue()->getName()+"_c",CI);
-
-      // Strip off unneeded CPR's.
-      if (ConstantPointerRef *CPR = dyn_cast(NewCast))
-        NewCast = CPR->getValue();
 
       // Create a new call instruction...
       CallInst *NewCall = new CallInst(NewCast,




From llvm at cs.uiuc.edu  Sat Jul 17 19:21:24 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:21:24 -0500
Subject: [llvm-commits] 
	CVS: llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp
	EdgeProfiling.cpp EmitFunctions.cpp ProfilingUtils.cpp
	ProfilingUtils.h TraceValues.cpp 
Message-ID: <200407180021.TAA09771@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Instrumentation:

BlockProfiling.cpp updated: 1.8 -> 1.9
EdgeProfiling.cpp updated: 1.2 -> 1.3
EmitFunctions.cpp updated: 1.17 -> 1.18
ProfilingUtils.cpp updated: 1.3 -> 1.4
ProfilingUtils.h updated: 1.2 -> 1.3
TraceValues.cpp updated: 1.66 -> 1.67

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage


---
Diffs of the changes:  (+9 -16)

Index: llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp
diff -u llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp:1.8 llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp:1.9
--- llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp:1.8	Sun Jul  4 07:19:56 2004
+++ llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp	Sat Jul 17 19:21:14 2004
@@ -55,14 +55,12 @@
     new GlobalVariable(ATy, false, GlobalValue::InternalLinkage,
                        Constant::getNullValue(ATy), "FuncProfCounters", &M);
 
-  ConstantPointerRef *CounterCPR = ConstantPointerRef::get(Counters);
-
   // Instrument all of the functions...
   unsigned i = 0;
   for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I) 
     if (!I->isExternal())
       // Insert counter at the start of the function
-      IncrementCounterInBlock(I->begin(), i++, CounterCPR);
+      IncrementCounterInBlock(I->begin(), i++, Counters);
 
   // Add the initialization call to main.
   InsertProfilingInitCall(Main, "llvm_start_func_profiling", Counters);
@@ -96,14 +94,12 @@
     new GlobalVariable(ATy, false, GlobalValue::InternalLinkage,
                        Constant::getNullValue(ATy), "BlockProfCounters", &M);
 
-  ConstantPointerRef *CounterCPR = ConstantPointerRef::get(Counters);
-
   // Instrument all of the blocks...
   unsigned i = 0;
   for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I) 
     for (Function::iterator BB = I->begin(), E = I->end(); BB != E; ++BB)
       // Insert counter at the start of the block
-      IncrementCounterInBlock(BB, i++, CounterCPR);
+      IncrementCounterInBlock(BB, i++, Counters);
 
   // Add the initialization call to main.
   InsertProfilingInitCall(Main, "llvm_start_block_profiling", Counters);


Index: llvm/lib/Transforms/Instrumentation/EdgeProfiling.cpp
diff -u llvm/lib/Transforms/Instrumentation/EdgeProfiling.cpp:1.2 llvm/lib/Transforms/Instrumentation/EdgeProfiling.cpp:1.3
--- llvm/lib/Transforms/Instrumentation/EdgeProfiling.cpp:1.2	Sun Jul  4 07:19:56 2004
+++ llvm/lib/Transforms/Instrumentation/EdgeProfiling.cpp	Sat Jul 17 19:21:14 2004
@@ -60,8 +60,6 @@
     new GlobalVariable(ATy, false, GlobalValue::InternalLinkage,
                        Constant::getNullValue(ATy), "EdgeProfCounters", &M);
 
-  ConstantPointerRef *CounterCPR = ConstantPointerRef::get(Counters);
-
   // Instrument all of the edges...
   unsigned i = 0;
   for (Module::iterator F = M.begin(), E = M.end(); F != E; ++F)
@@ -80,10 +78,10 @@
           // otherwise insert it in the successor block.
           if (TI->getNumSuccessors() == 0) {
             // Insert counter at the start of the block
-            IncrementCounterInBlock(BB, i++, CounterCPR);
+            IncrementCounterInBlock(BB, i++, Counters);
           } else {
             // Insert counter at the start of the block
-            IncrementCounterInBlock(TI->getSuccessor(s), i++, CounterCPR);
+            IncrementCounterInBlock(TI->getSuccessor(s), i++, Counters);
           }
         }
       }


Index: llvm/lib/Transforms/Instrumentation/EmitFunctions.cpp
diff -u llvm/lib/Transforms/Instrumentation/EmitFunctions.cpp:1.17 llvm/lib/Transforms/Instrumentation/EmitFunctions.cpp:1.18
--- llvm/lib/Transforms/Instrumentation/EmitFunctions.cpp:1.17	Mon Mar  8 10:45:53 2004
+++ llvm/lib/Transforms/Instrumentation/EmitFunctions.cpp	Sat Jul 17 19:21:14 2004
@@ -77,7 +77,7 @@
     
       //std::cerr< GEPIndices(2, Constant::getNullValue(Type::IntTy));
   unsigned NumElements = 0;
   if (Array) {
-    ConstantPointerRef *ArrayCPR = ConstantPointerRef::get(Array);
-    Args[2] = ConstantExpr::getGetElementPtr(ArrayCPR, GEPIndices);
+    Args[2] = ConstantExpr::getGetElementPtr(Array, GEPIndices);
     NumElements =
       cast(Array->getType()->getElementType())->getNumElements();
   } else {
@@ -87,7 +86,7 @@
 }
 
 void llvm::IncrementCounterInBlock(BasicBlock *BB, unsigned CounterNum,
-                                   ConstantPointerRef *CounterArray) {
+                                   GlobalValue *CounterArray) {
   // Insert the increment after any alloca or PHI instructions...
   BasicBlock::iterator InsertPos = BB->begin();
   while (isa(InsertPos) || isa(InsertPos))


Index: llvm/lib/Transforms/Instrumentation/ProfilingUtils.h
diff -u llvm/lib/Transforms/Instrumentation/ProfilingUtils.h:1.2 llvm/lib/Transforms/Instrumentation/ProfilingUtils.h:1.3
--- llvm/lib/Transforms/Instrumentation/ProfilingUtils.h:1.2	Mon May  3 17:06:33 2004
+++ llvm/lib/Transforms/Instrumentation/ProfilingUtils.h	Sat Jul 17 19:21:14 2004
@@ -26,7 +26,7 @@
   void InsertProfilingInitCall(Function *MainFn, const char *FnName,
                                GlobalValue *Arr = 0);
   void IncrementCounterInBlock(BasicBlock *BB, unsigned CounterNum,
-                               ConstantPointerRef *CounterArray);
+                               GlobalValue *CounterArray);
 }
 
 #endif


Index: llvm/lib/Transforms/Instrumentation/TraceValues.cpp
diff -u llvm/lib/Transforms/Instrumentation/TraceValues.cpp:1.66 llvm/lib/Transforms/Instrumentation/TraceValues.cpp:1.67
--- llvm/lib/Transforms/Instrumentation/TraceValues.cpp:1.66	Fri Jan  9 00:11:50 2004
+++ llvm/lib/Transforms/Instrumentation/TraceValues.cpp	Sat Jul 17 19:21:14 2004
@@ -243,7 +243,7 @@
   GlobalVariable *fmtVal = getStringRef(Mod, Message+getPrintfCodeFor(V)+"\n");
 
   // Turn the format string into an sbyte *
-  Constant *GEP =ConstantExpr::getGetElementPtr(ConstantPointerRef::get(fmtVal),
+  Constant *GEP=ConstantExpr::getGetElementPtr(fmtVal,
                 std::vector(2,Constant::getNullValue(Type::LongTy)));
   
   // Insert a call to the hash function if this is a pointer value




From llvm at cs.uiuc.edu  Sat Jul 17 19:22:24 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:22:24 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/RaiseAllocations.cpp 
Message-ID: <200407180022.TAA09788@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/IPO:

RaiseAllocations.cpp updated: 1.22 -> 1.23

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage


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

Index: llvm/lib/Transforms/IPO/RaiseAllocations.cpp
diff -u llvm/lib/Transforms/IPO/RaiseAllocations.cpp:1.22 llvm/lib/Transforms/IPO/RaiseAllocations.cpp:1.23
--- llvm/lib/Transforms/IPO/RaiseAllocations.cpp:1.22	Sat Dec  6 19:42:08 2003
+++ llvm/lib/Transforms/IPO/RaiseAllocations.cpp	Sat Jul 17 19:22:14 2004
@@ -158,9 +158,9 @@
           Changed = true;
           ++NumRaised;
         }
-      } else if (ConstantPointerRef *CPR = dyn_cast(U)) {
-        Users.insert(Users.end(), CPR->use_begin(), CPR->use_end());
-        EqPointers.push_back(CPR);
+      } else if (GlobalValue *GV = dyn_cast(U)) {
+        Users.insert(Users.end(), GV->use_begin(), GV->use_end());
+        EqPointers.push_back(GV);
       } else if (ConstantExpr *CE = dyn_cast(U)) {
         if (CE->getOpcode() == Instruction::Cast) {
           Users.insert(Users.end(), CE->use_begin(), CE->use_end());
@@ -207,9 +207,9 @@
           Changed = true;
           ++NumRaised;
         }
-      } else if (ConstantPointerRef *CPR = dyn_cast(U)) {
-        Users.insert(Users.end(), CPR->use_begin(), CPR->use_end());
-        EqPointers.push_back(CPR);
+      } else if (GlobalValue *GV = dyn_cast(U)) {
+        Users.insert(Users.end(), GV->use_begin(), GV->use_end());
+        EqPointers.push_back(GV);
       } else if (ConstantExpr *CE = dyn_cast(U)) {
         if (CE->getOpcode() == Instruction::Cast) {
           Users.insert(Users.end(), CE->use_begin(), CE->use_end());




From llvm at cs.uiuc.edu  Sat Jul 17 19:23:08 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:23:08 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/Inliner.cpp 
Message-ID: <200407180023.TAA09802@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/IPO:

Inliner.cpp updated: 1.16 -> 1.17

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage


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

Index: llvm/lib/Transforms/IPO/Inliner.cpp
diff -u llvm/lib/Transforms/IPO/Inliner.cpp:1.16 llvm/lib/Transforms/IPO/Inliner.cpp:1.17
--- llvm/lib/Transforms/IPO/Inliner.cpp:1.16	Sat Jun 19 23:11:48 2004
+++ llvm/lib/Transforms/IPO/Inliner.cpp	Sat Jul 17 19:22:58 2004
@@ -14,7 +14,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "Inliner.h"
-#include "llvm/Constants.h"   // ConstantPointerRef should die
 #include "llvm/Module.h"
 #include "llvm/iOther.h"
 #include "llvm/iTerminators.h"
@@ -174,9 +173,9 @@
     // If the only remaining use of the function is a dead constant
     // pointer ref, remove it.
     if (F && F->hasOneUse())
-      if (ConstantPointerRef *CPR = dyn_cast(F->use_back()))
-        if (CPR->use_empty()) {
-          CPR->destroyConstant();
+      if (Function *GV = dyn_cast(F->use_back()))
+        if (GV->removeDeadConstantUsers()) {
+	  delete GV;
           if (F->hasInternalLinkage()) {
             // There *MAY* be an edge from the external call node to this
             // function.  If so, remove it.




From llvm at cs.uiuc.edu  Sat Jul 17 19:24:01 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:24:01 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/ArgumentPromotion.cpp 
Message-ID: <200407180024.TAA09814@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/IPO:

ArgumentPromotion.cpp updated: 1.7 -> 1.8

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Excise dead CPR procesing.


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

Index: llvm/lib/Transforms/IPO/ArgumentPromotion.cpp
diff -u llvm/lib/Transforms/IPO/ArgumentPromotion.cpp:1.7 llvm/lib/Transforms/IPO/ArgumentPromotion.cpp:1.8
--- llvm/lib/Transforms/IPO/ArgumentPromotion.cpp:1.7	Sun Jun 20 19:07:58 2004
+++ llvm/lib/Transforms/IPO/ArgumentPromotion.cpp	Sat Jul 17 19:23:51 2004
@@ -86,37 +86,8 @@
 bool ArgPromotion::run(Module &M) {
   bool Changed = false;
   for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I)
-    if (I->hasInternalLinkage()) {
+    if (I->hasInternalLinkage())
       WorkList.insert(I);
-
-      // If there are any constant pointer refs pointing to this function,
-      // eliminate them now if possible.
-      ConstantPointerRef *CPR = 0;
-      for (Value::use_iterator UI = I->use_begin(), E = I->use_end(); UI != E;
-           ++UI)
-        if ((CPR = dyn_cast(*UI)))
-          break;  // Found one!
-      if (CPR) {
-        // See if we can transform all users to use the function directly.
-        while (!CPR->use_empty()) {
-          User *TheUser = CPR->use_back();
-          if (!isa(TheUser) && !isa(TheUser)) {
-            Changed = true;
-            TheUser->replaceUsesOfWith(CPR, I);
-          } else {
-            // We won't be able to eliminate all users.  :(
-            WorkList.erase(I);  // Minor efficiency win.
-            break;
-          }
-        }
-
-        // If we nuked all users of the CPR, kill the CPR now!
-        if (CPR->use_empty()) {
-          CPR->destroyConstant();
-          Changed = true;
-        }
-      }
-    }
   
   while (!WorkList.empty()) {
     Function *F = *WorkList.begin();




From llvm at cs.uiuc.edu  Sat Jul 17 19:24:24 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:24:24 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/FunctionResolution.cpp 
Message-ID: <200407180024.TAA09826@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/IPO:

FunctionResolution.cpp updated: 1.48 -> 1.49

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage


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

Index: llvm/lib/Transforms/IPO/FunctionResolution.cpp
diff -u llvm/lib/Transforms/IPO/FunctionResolution.cpp:1.48 llvm/lib/Transforms/IPO/FunctionResolution.cpp:1.49
--- llvm/lib/Transforms/IPO/FunctionResolution.cpp:1.48	Fri Jun 18 00:50:48 2004
+++ llvm/lib/Transforms/IPO/FunctionResolution.cpp	Sat Jul 17 19:24:14 2004
@@ -101,8 +101,7 @@
       if (!Old->use_empty()) {  // Avoid making the CPR unless we really need it
         Value *Replacement = Concrete;
         if (Concrete->getType() != Old->getType())
-          Replacement = ConstantExpr::getCast(ConstantPointerRef::get(Concrete),
-                                              Old->getType());
+          Replacement = ConstantExpr::getCast(Concrete,Old->getType());
         NumResolved += Old->use_size();
         Old->replaceAllUsesWith(Replacement);
       }
@@ -118,11 +117,10 @@
                                    std::vector &Globals,
                                    GlobalVariable *Concrete) {
   bool Changed = false;
-  Constant *CCPR = ConstantPointerRef::get(Concrete);
 
   for (unsigned i = 0; i != Globals.size(); ++i)
     if (Globals[i] != Concrete) {
-      Constant *Cast = ConstantExpr::getCast(CCPR, Globals[i]->getType());
+      Constant *Cast = ConstantExpr::getCast(Concrete, Globals[i]->getType());
       Globals[i]->replaceAllUsesWith(Cast);
 
       // Since there are no uses of Old anymore, remove it from the module.
@@ -138,8 +136,8 @@
 static bool CallersAllIgnoreReturnValue(Function &F) {
   if (F.getReturnType() == Type::VoidTy) return true;
   for (Value::use_iterator I = F.use_begin(), E = F.use_end(); I != E; ++I) {
-    if (ConstantPointerRef *CPR = dyn_cast(*I)) {
-      for (Value::use_iterator I = CPR->use_begin(), E = CPR->use_end();
+    if (GlobalValue *GV = dyn_cast(*I)) {
+      for (Value::use_iterator I = GV->use_begin(), E = GV->use_end();
            I != E; ++I) {
         CallSite CS = CallSite::get(*I);
         if (!CS.getInstruction() || !CS.getInstruction()->use_empty())




From llvm at cs.uiuc.edu  Sat Jul 17 19:25:14 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:25:14 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/GlobalDCE.cpp 
Message-ID: <200407180025.TAA09846@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/IPO:

GlobalDCE.cpp updated: 1.31 -> 1.32

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage
- Rename methods to get ride of ConstantPointerRef usage


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

Index: llvm/lib/Transforms/IPO/GlobalDCE.cpp
diff -u llvm/lib/Transforms/IPO/GlobalDCE.cpp:1.31 llvm/lib/Transforms/IPO/GlobalDCE.cpp:1.32
--- llvm/lib/Transforms/IPO/GlobalDCE.cpp:1.31	Fri Nov 21 15:54:22 2003
+++ llvm/lib/Transforms/IPO/GlobalDCE.cpp	Sat Jul 17 19:25:04 2004
@@ -26,7 +26,7 @@
 namespace {
   Statistic<> NumFunctions("globaldce","Number of functions removed");
   Statistic<> NumVariables("globaldce","Number of global variables removed");
-  Statistic<> NumCPRs("globaldce", "Number of const pointer refs removed");
+  Statistic<> NumGVs("globaldce", "Number of global values removed");
 
   struct GlobalDCE : public Pass {
     // run - Do the GlobalDCE pass on the specified module, optionally updating
@@ -42,8 +42,8 @@
     void GlobalIsNeeded(GlobalValue *GV);
     void MarkUsedGlobalsAsNeeded(Constant *C);
 
-    bool RemoveUnusedConstantPointerRef(GlobalValue &GV);
-    bool SafeToDestroyConstant(Constant *C);
+    bool SafeToDestroyConstant(Constant* C);
+    bool RemoveUnusedGlobalValue(GlobalValue &GV);
   };
   RegisterOpt X("globaldce", "Dead Global Elimination");
 }
@@ -54,7 +54,7 @@
   bool Changed = false;
   // Loop over the module, adding globals which are obviously necessary.
   for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I) {
-    Changed |= RemoveUnusedConstantPointerRef(*I);
+    Changed |= RemoveUnusedGlobalValue(*I);
     // Functions with external linkage are needed if they have a body
     if ((!I->hasInternalLinkage() && !I->hasLinkOnceLinkage()) &&
         !I->isExternal())
@@ -62,7 +62,7 @@
   }
 
   for (Module::giterator I = M.gbegin(), E = M.gend(); I != E; ++I) {
-    Changed |= RemoveUnusedConstantPointerRef(*I);
+    Changed |= RemoveUnusedGlobalValue(*I);
     // Externally visible & appending globals are needed, if they have an
     // initializer.
     if ((!I->hasInternalLinkage() && !I->hasLinkOnceLinkage()) &&
@@ -97,7 +97,7 @@
     // Now that all interreferences have been dropped, delete the actual objects
     // themselves.
     for (unsigned i = 0, e = DeadFunctions.size(); i != e; ++i) {
-      RemoveUnusedConstantPointerRef(*DeadFunctions[i]);
+      RemoveUnusedGlobalValue(*DeadFunctions[i]);
       M.getFunctionList().erase(DeadFunctions[i]);
     }
     NumFunctions += DeadFunctions.size();
@@ -106,7 +106,7 @@
 
   if (!DeadGlobalVars.empty()) {
     for (unsigned i = 0, e = DeadGlobalVars.size(); i != e; ++i) {
-      RemoveUnusedConstantPointerRef(*DeadGlobalVars[i]);
+      RemoveUnusedGlobalValue(*DeadGlobalVars[i]);
       M.getGlobalList().erase(DeadGlobalVars[i]);
     }
     NumVariables += DeadGlobalVars.size();
@@ -154,8 +154,8 @@
 }
 
 void GlobalDCE::MarkUsedGlobalsAsNeeded(Constant *C) {
-  if (ConstantPointerRef *CPR = dyn_cast(C))
-    GlobalIsNeeded(CPR->getValue());
+  if (GlobalValue *GV = dyn_cast(C))
+    GlobalIsNeeded(GV);
   else {
     // Loop over all of the operands of the constant, adding any globals they
     // use to the list of needed globals.
@@ -164,24 +164,21 @@
   }
 }
 
-// RemoveUnusedConstantPointerRef - Loop over all of the uses of the specified
+// RemoveUnusedGlobalValue - Loop over all of the uses of the specified
 // GlobalValue, looking for the constant pointer ref that may be pointing to it.
 // If found, check to see if the constant pointer ref is safe to destroy, and if
 // so, nuke it.  This will reduce the reference count on the global value, which
 // might make it deader.
 //
-bool GlobalDCE::RemoveUnusedConstantPointerRef(GlobalValue &GV) {
+bool GlobalDCE::RemoveUnusedGlobalValue(GlobalValue &GV) {
   for (Value::use_iterator I = GV.use_begin(), E = GV.use_end(); I != E; ++I)
-    if (ConstantPointerRef *CPR = dyn_cast(*I))
-      if (SafeToDestroyConstant(CPR)) {  // Only if unreferenced...
-        CPR->destroyConstant();
-        ++NumCPRs;
-        return true;
+    if (GlobalValue* User = dyn_cast(*I))
+      if (User->removeDeadConstantUsers()) {  // Only if unreferenced...
+        ++NumGVs;
       }
-
-  return false;
-}
-
+   return false;
+ }
+ 
 // SafeToDestroyConstant - It is safe to destroy a constant iff it is only used
 // by constants itself.  Note that constants cannot be cyclic, so this test is
 // pretty easy to implement recursively.
@@ -193,7 +190,5 @@
     } else {
       return false;
     }
-
   return true;
 }
-




From llvm at cs.uiuc.edu  Sat Jul 17 19:26:07 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:26:07 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/GlobalConstifier.cpp 
Message-ID: <200407180026.TAA09860@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/IPO:

GlobalConstifier.cpp updated: 1.2 -> 1.3

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage


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

Index: llvm/lib/Transforms/IPO/GlobalConstifier.cpp
diff -u llvm/lib/Transforms/IPO/GlobalConstifier.cpp:1.2 llvm/lib/Transforms/IPO/GlobalConstifier.cpp:1.3
--- llvm/lib/Transforms/IPO/GlobalConstifier.cpp:1.2	Fri Feb 27 12:09:25 2004
+++ llvm/lib/Transforms/IPO/GlobalConstifier.cpp	Sat Jul 17 19:25:57 2004
@@ -48,8 +48,8 @@
       if (ConstantExpr *CE = dyn_cast(C)) {
         if (isStoredThrough(CE))
           return true;
-      } else if (ConstantPointerRef *CPR = dyn_cast(C)) {
-        if (isStoredThrough(CPR)) return true;
+      } else if (GlobalValue *GV = dyn_cast(C)) {
+        if (isStoredThrough(GV)) return true;
       } else {
         // Must be an element of a constant array or something.
         return true;




From llvm at cs.uiuc.edu  Sat Jul 17 19:26:47 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:26:47 -0500
Subject: [llvm-commits] 
	CVS: llvm/lib/Transforms/IPO/IPConstantPropagation.cpp
Message-ID: <200407180026.TAA09874@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/IPO:

IPConstantPropagation.cpp updated: 1.5 -> 1.6

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Minimize redundant isa usage


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

Index: llvm/lib/Transforms/IPO/IPConstantPropagation.cpp
diff -u llvm/lib/Transforms/IPO/IPConstantPropagation.cpp:1.5 llvm/lib/Transforms/IPO/IPConstantPropagation.cpp:1.6
--- llvm/lib/Transforms/IPO/IPConstantPropagation.cpp:1.5	Fri Nov 21 15:54:22 2003
+++ llvm/lib/Transforms/IPO/IPConstantPropagation.cpp	Sat Jul 17 19:26:34 2004
@@ -82,9 +82,8 @@
         if (*AI == &F) return false;  // Passes the function into itself
 
         if (!ArgumentConstants[i].second) {
-          if (isa(*AI) || isa(*AI)) {
+          if (isa(*AI)) {
             Constant *C = dyn_cast(*AI);
-            if (!C) C = ConstantPointerRef::get(cast(*AI));
             
             if (!ArgumentConstants[i].first)
               ArgumentConstants[i].first = C;
@@ -114,9 +113,6 @@
     if (!ArgumentConstants[i].second && !AI->use_empty()) {
       assert(ArgumentConstants[i].first && "Unknown constant value!");
       Value *V = ArgumentConstants[i].first;
-      if (ConstantPointerRef *CPR = dyn_cast(V))
-        V = CPR->getValue();
-
       AI->replaceAllUsesWith(V);
       ++NumArgumentsProped;
       MadeChange = true;




From llvm at cs.uiuc.edu  Sat Jul 17 19:27:16 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:27:16 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/InlineSimple.cpp 
Message-ID: <200407180027.TAA09889@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/IPO:

InlineSimple.cpp updated: 1.62 -> 1.63

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Minimize redundant isa usage


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

Index: llvm/lib/Transforms/IPO/InlineSimple.cpp
diff -u llvm/lib/Transforms/IPO/InlineSimple.cpp:1.62 llvm/lib/Transforms/IPO/InlineSimple.cpp:1.63
--- llvm/lib/Transforms/IPO/InlineSimple.cpp:1.62	Thu Apr  8 01:34:31 2004
+++ llvm/lib/Transforms/IPO/InlineSimple.cpp	Sat Jul 17 19:27:06 2004
@@ -78,8 +78,7 @@
       Instruction &Inst = cast(**UI);
       bool AllOperandsConstant = true;
       for (unsigned i = 0, e = Inst.getNumOperands(); i != e; ++i)
-        if (!isa(Inst.getOperand(i)) &&
-            !isa(Inst.getOperand(i)) && Inst.getOperand(i) != V) {
+        if (!isa(Inst.getOperand(i)) && Inst.getOperand(i) != V) {
           AllOperandsConstant = false;
           break;
         }
@@ -205,7 +204,7 @@
     // If this is a constant being passed into the function, use the argument
     // weights calculated for the callee to determine how much will be folded
     // away with this information.
-    } else if (isa(I) || isa(I)) {
+    } else if (isa(I)) {
       if (ArgNo < CalleeFI.ArgumentWeights.size())
         InlineCost -= CalleeFI.ArgumentWeights[ArgNo].ConstantWeight;
     }




From llvm at cs.uiuc.edu  Sat Jul 17 19:28:29 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:28:29 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp 
Message-ID: <200407180028.TAA09904@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

CorrelatedExprs.cpp updated: 1.22 -> 1.23

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Minimize redundant isa usage
- Correct isa for GlobalValue subclass


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

Index: llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp
diff -u llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.22 llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.23
--- llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.22	Wed Jul 14 20:50:47 2004
+++ llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp	Sat Jul 17 19:28:19 2004
@@ -243,7 +243,7 @@
 
     void BuildRankMap(Function &F);
     unsigned getRank(Value *V) const {
-      if (isa(V) || isa(V)) return 0;
+      if (isa(V)) return 0;
       std::map::const_iterator I = RankMap.find(V);
       if (I != RankMap.end()) return I->second;
       return 0; // Must be some other global thing
@@ -476,7 +476,8 @@
 
   ValueInfo &PredicateVI = NewRI.getValueInfo(BI->getCondition());
   if (PredicateVI.getReplacement() &&
-      isa(PredicateVI.getReplacement())) {
+      isa(PredicateVI.getReplacement()) &&
+      !isa(PredicateVI.getReplacement())) {
     ConstantBool *CB = cast(PredicateVI.getReplacement());
 
     // Forward to the successor that corresponds to the branch we will take.




From llvm at cs.uiuc.edu  Sat Jul 17 19:28:57 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:28:57 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/GCSE.cpp 
Message-ID: <200407180028.TAA09918@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

GCSE.cpp updated: 1.40 -> 1.41

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Minimize redundant isa usage


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

Index: llvm/lib/Transforms/Scalar/GCSE.cpp
diff -u llvm/lib/Transforms/Scalar/GCSE.cpp:1.40 llvm/lib/Transforms/Scalar/GCSE.cpp:1.41
--- llvm/lib/Transforms/Scalar/GCSE.cpp:1.40	Sun May 23 16:19:55 2004
+++ llvm/lib/Transforms/Scalar/GCSE.cpp	Sat Jul 17 19:28:47 2004
@@ -78,8 +78,7 @@
       VN.getEqualNumberNodes(AI, EqualValues);
       if (!EqualValues.empty()) {
         for (unsigned i = 0, e = EqualValues.size(); i != e; ++i)
-          if (isa(EqualValues[i]) ||
-              isa(EqualValues[i])) {
+          if (isa(EqualValues[i])) {
             AI->replaceAllUsesWith(EqualValues[i]);
             ++NumArgsRepl;
             Changed = true;
@@ -186,7 +185,7 @@
 
   // If we are not replacing the instruction with a constant, we cannot do
   // anything special.
-  if (!isa(V)) {
+  if (!isa(V) || isa(V)) {
     I->replaceAllUsesWith(V);
 
     if (InvokeInst *II = dyn_cast(I)) {




From llvm at cs.uiuc.edu  Sat Jul 17 19:29:35 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:29:35 -0500
Subject: [llvm-commits] 
	CVS: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200407180029.TAA09930@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.222 -> 1.223

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage
- Minimize redundant isa usage
- Correct isa for GlobalValue subclass


---
Diffs of the changes:  (+13 -16)

Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.222 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.223
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.222	Mon Jul 12 20:49:43 2004
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Sat Jul 17 19:29:25 2004
@@ -2457,11 +2457,10 @@
   if (!isa(CS.getCalledValue())) return false;
   ConstantExpr *CE = cast(CS.getCalledValue());
   if (CE->getOpcode() != Instruction::Cast ||
-      !isa(CE->getOperand(0)))
+      !isa(CE->getOperand(0)))
     return false;
-  ConstantPointerRef *CPR = cast(CE->getOperand(0));
-  if (!isa(CPR->getValue())) return false;
-  Function *Callee = cast(CPR->getValue());
+  if (!isa(CE->getOperand(0))) return false;
+  Function *Callee = cast(CE->getOperand(0));
   Instruction *Caller = CS.getInstruction();
 
   // Okay, this is a cast from a function to a different type.  Unless doing so
@@ -2811,7 +2810,7 @@
 
     if (I == E) {  // If they are all constants...
       Constant *CE =
-        ConstantExpr::getGetElementPtr(ConstantPointerRef::get(GV), Indices);
+        ConstantExpr::getGetElementPtr(GV, Indices);
 
       // Replace all uses of the GEP with the new constexpr...
       return ReplaceInstUsesWith(GEP, CE);
@@ -2978,8 +2977,8 @@
   if (Constant *C = dyn_cast(Op))
     if (C->isNullValue())  // load null -> 0
       return ReplaceInstUsesWith(LI, Constant::getNullValue(LI.getType()));
-    else if (ConstantPointerRef *CPR = dyn_cast(C))
-      Op = CPR->getValue();
+    else if (isa(C))
+      Op = C;
 
   // Instcombine load (constant global) into the value loaded...
   if (GlobalVariable *GV = dyn_cast(Op))
@@ -2989,11 +2988,10 @@
   // Instcombine load (constantexpr_GEP global, 0, ...) into the value loaded...
   if (ConstantExpr *CE = dyn_cast(Op))
     if (CE->getOpcode() == Instruction::GetElementPtr) {
-      if (ConstantPointerRef *G=dyn_cast(CE->getOperand(0)))
-        if (GlobalVariable *GV = dyn_cast(G->getValue()))
-          if (GV->isConstant() && !GV->isExternal())
-            if (Constant *V = GetGEPGlobalInitializer(GV->getInitializer(), CE))
-              return ReplaceInstUsesWith(LI, V);
+      if (GlobalVariable *GV = dyn_cast(CE->getOperand(0)))
+        if (GV->isConstant() && !GV->isExternal())
+          if (Constant *V = GetGEPGlobalInitializer(GV->getInitializer(), CE))
+            return ReplaceInstUsesWith(LI, V);
     } else if (CE->getOpcode() == Instruction::Cast) {
       if (Instruction *Res = InstCombineLoadCast(*this, LI))
         return Res;
@@ -3106,12 +3104,11 @@
     }
 
     // Check to see if any of the operands of this instruction are a
-    // ConstantPointerRef.  Since they sneak in all over the place and inhibit
+    // GlobalValue.  Since they sneak in all over the place and inhibit
     // optimization, we want to strip them out unconditionally!
     for (unsigned i = 0, e = I->getNumOperands(); i != e; ++i)
-      if (ConstantPointerRef *CPR =
-          dyn_cast(I->getOperand(i))) {
-        I->setOperand(i, CPR->getValue());
+      if (isa(I->getOperand(i))) {
+        I->setOperand(i, I->getOperand(i));
         Changed = true;
       }
 




From llvm at cs.uiuc.edu  Sat Jul 17 19:30:07 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:30:07 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/LowerGC.cpp 
Message-ID: <200407180030.TAA09957@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

LowerGC.cpp updated: 1.2 -> 1.3

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Minimize redundant isa usage
- Correct isa for GlobalValue subclass


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

Index: llvm/lib/Transforms/Scalar/LowerGC.cpp
diff -u llvm/lib/Transforms/Scalar/LowerGC.cpp:1.2 llvm/lib/Transforms/Scalar/LowerGC.cpp:1.3
--- llvm/lib/Transforms/Scalar/LowerGC.cpp:1.2	Sun May 23 16:27:29 2004
+++ llvm/lib/Transforms/Scalar/LowerGC.cpp	Sat Jul 17 19:29:57 2004
@@ -140,7 +140,8 @@
 /// not have the specified type, insert a cast.
 static void Coerce(Instruction *I, unsigned OpNum, Type *Ty) {
   if (I->getOperand(OpNum)->getType() != Ty) {
-    if (Constant *C = dyn_cast(I->getOperand(OpNum)))
+    Constant *C = dyn_cast(I->getOperand(OpNum));
+    if (C && !isa(I->getOperand(OpNum)))
       I->setOperand(OpNum, ConstantExpr::getCast(C, Ty));
     else {
       CastInst *C = new CastInst(I->getOperand(OpNum), Ty, "", I);
@@ -252,8 +253,7 @@
     Par[2] = ConstantUInt::get(Type::UIntTy, i);
     Par[3] = One;
     Value *MetaDataPtr = new GetElementPtrInst(AI, Par, "MetaDataPtr", IP);
-    assert(isa(GCRoots[i]->getOperand(2)) || 
-           isa(GCRoots[i]->getOperand(2)));
+    assert(isa(GCRoots[i]->getOperand(2)) && "Must be a constant");
     new StoreInst(GCRoots[i]->getOperand(2), MetaDataPtr, IP);
 
     // Initialize the root pointer to null on entry to the function.




From llvm at cs.uiuc.edu  Sat Jul 17 19:30:35 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:30:35 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/LowerInvoke.cpp 
Message-ID: <200407180030.TAA09970@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

LowerInvoke.cpp updated: 1.16 -> 1.17

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage


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

Index: llvm/lib/Transforms/Scalar/LowerInvoke.cpp
diff -u llvm/lib/Transforms/Scalar/LowerInvoke.cpp:1.16 llvm/lib/Transforms/Scalar/LowerInvoke.cpp:1.17
--- llvm/lib/Transforms/Scalar/LowerInvoke.cpp:1.16	Fri May 28 00:02:13 2004
+++ llvm/lib/Transforms/Scalar/LowerInvoke.cpp	Sat Jul 17 19:30:25 2004
@@ -135,7 +135,7 @@
     if (MsgGV) {
       std::vector GEPIdx(2, Constant::getNullValue(Type::LongTy));
       AbortMessage = 
-        ConstantExpr::getGetElementPtr(ConstantPointerRef::get(MsgGV), GEPIdx);
+        ConstantExpr::getGetElementPtr(MsgGV, GEPIdx);
     }
 
   } else {
@@ -154,7 +154,7 @@
     if (MsgGV) {
       std::vector GEPIdx(2, Constant::getNullValue(Type::LongTy));
       AbortMessage =
-        ConstantExpr::getGetElementPtr(ConstantPointerRef::get(MsgGV), GEPIdx);
+        ConstantExpr::getGetElementPtr(MsgGV, GEPIdx);
     }
   }
 
@@ -191,7 +191,7 @@
                                                  WriteFn->getParent());
       std::vector GEPIdx(2, Constant::getNullValue(Type::LongTy));
       AbortMessage = 
-        ConstantExpr::getGetElementPtr(ConstantPointerRef::get(MsgGV), GEPIdx);
+        ConstantExpr::getGetElementPtr(MsgGV, GEPIdx);
     }
 
     // These are the arguments we WANT...




From llvm at cs.uiuc.edu  Sat Jul 17 19:31:15 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:31:15 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/SCCP.cpp 
Message-ID: <200407180031.TAA09982@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

SCCP.cpp updated: 1.96 -> 1.97

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage
- Correct isa for GlobalValue subclass


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

Index: llvm/lib/Transforms/Scalar/SCCP.cpp
diff -u llvm/lib/Transforms/Scalar/SCCP.cpp:1.96 llvm/lib/Transforms/Scalar/SCCP.cpp:1.97
--- llvm/lib/Transforms/Scalar/SCCP.cpp:1.96	Thu Jul 15 18:36:43 2004
+++ llvm/lib/Transforms/Scalar/SCCP.cpp	Sat Jul 17 19:31:05 2004
@@ -175,13 +175,13 @@
     hash_map::iterator I = ValueState.find(V);
     if (I != ValueState.end()) return I->second;  // Common case, in the map
       
-    if (Constant *CPV = dyn_cast(V)) {  // Constants are constant
+    if (GlobalValue *GV = dyn_cast(V)) {
+      // The address of a global is a constant...
+      ValueState[V].markConstant(GV);
+    } else if (Constant *CPV = dyn_cast(V)) {  // Constants are constant
       ValueState[CPV].markConstant(CPV);
     } else if (isa(V)) {                // Arguments are overdefined
       ValueState[V].markOverdefined();
-    } else if (GlobalValue *GV = dyn_cast(V)) {
-      // The address of a global is a constant...
-      ValueState[V].markConstant(ConstantPointerRef::get(GV));
     }
     // All others are underdefined by default...
     return ValueState[V];
@@ -784,9 +784,6 @@
       return;
     }
       
-    if (ConstantPointerRef *CPR = dyn_cast(Ptr))
-      Ptr = CPR->getValue();
-
     // Transform load (constant global) into the value loaded.
     if (GlobalVariable *GV = dyn_cast(Ptr))
       if (GV->isConstant() && !GV->isExternal()) {
@@ -797,15 +794,13 @@
     // Transform load (constantexpr_GEP global, 0, ...) into the value loaded.
     if (ConstantExpr *CE = dyn_cast(Ptr))
       if (CE->getOpcode() == Instruction::GetElementPtr)
-        if (ConstantPointerRef *G
-            = dyn_cast(CE->getOperand(0)))
-          if (GlobalVariable *GV = dyn_cast(G->getValue()))
-            if (GV->isConstant() && !GV->isExternal())
-              if (Constant *V =
-                  GetGEPGlobalInitializer(GV->getInitializer(), CE)) {
-                markConstant(IV, &I, V);
-                return;
-              }
+	if (GlobalVariable *GV = dyn_cast(CE->getOperand(0)))
+	  if (GV->isConstant() && !GV->isExternal())
+	    if (Constant *V = 
+		GetGEPGlobalInitializer(GV->getInitializer(), CE)) {
+	      markConstant(IV, &I, V);
+	      return;
+	    }
   }
 
   // Otherwise we cannot say for certain what value this load will produce.




From llvm at cs.uiuc.edu  Sat Jul 17 19:32:24 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:32:24 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Utils/SimplifyCFG.cpp 
Message-ID: <200407180032.TAA10001@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Utils:

SimplifyCFG.cpp updated: 1.46 -> 1.47

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Minimize redundant isa usage


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

Index: llvm/lib/Transforms/Utils/SimplifyCFG.cpp
diff -u llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.46 llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.47
--- llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.46	Wed Jul 14 21:06:12 2004
+++ llvm/lib/Transforms/Utils/SimplifyCFG.cpp	Sat Jul 17 19:32:14 2004
@@ -211,8 +211,7 @@
         if (cast(I)->isVolatile())
           return false;
         if (!isa(I->getOperand(0)) &&
-            !isa(I->getOperand(0)) &&
-            !isa(I->getOperand(0)))
+            !isa(I->getOperand(0)))
           return false;
 
         // Finally, we have to check to make sure there are no instructions




From llvm at cs.uiuc.edu  Sat Jul 17 19:32:49 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:32:49 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Utils/ValueMapper.cpp 
Message-ID: <200407180032.TAA10013@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Utils:

ValueMapper.cpp updated: 1.14 -> 1.15

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage


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

Index: llvm/lib/Transforms/Utils/ValueMapper.cpp
diff -u llvm/lib/Transforms/Utils/ValueMapper.cpp:1.14 llvm/lib/Transforms/Utils/ValueMapper.cpp:1.15
--- llvm/lib/Transforms/Utils/ValueMapper.cpp:1.14	Wed Jul 14 21:06:12 2004
+++ llvm/lib/Transforms/Utils/ValueMapper.cpp	Sat Jul 17 19:32:39 2004
@@ -14,6 +14,7 @@
 
 #include "ValueMapper.h"
 #include "llvm/Constants.h"
+#include "llvm/GlobalValue.h"
 #include "llvm/Instruction.h"
 #include 
 
@@ -32,9 +33,8 @@
     if (isa(C) || isa(C) ||
         isa(C) || isa(C))
       return VMSlot = C;           // Primitive constants map directly
-    else if (ConstantPointerRef *CPR = dyn_cast(C)) {
-      GlobalValue *MV = cast(MapValue((Value*)CPR->getValue(),VM));
-      return VMSlot = ConstantPointerRef::get(MV);
+    else if (GlobalValue *GV = dyn_cast(C)) {
+      return VMSlot = GV;
     } else if (ConstantArray *CA = dyn_cast(C)) {
       const std::vector &Vals = CA->getValues();
       for (unsigned i = 0, e = Vals.size(); i != e; ++i) {




From llvm at cs.uiuc.edu  Sat Jul 17 19:33:48 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:33:48 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/InstSelectSimple.cpp
	Printer.cpp X86SimpInstrSelector.cpp 
Message-ID: <200407180033.TAA10042@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

InstSelectSimple.cpp updated: 1.271 -> 1.272
Printer.cpp updated: 1.103 -> 1.104
X86SimpInstrSelector.cpp updated: 1.6 -> 1.7

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage
- Minimize redundant isa usage
- Correct isa for GlobalValue subclass


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

Index: llvm/lib/Target/X86/InstSelectSimple.cpp
diff -u llvm/lib/Target/X86/InstSelectSimple.cpp:1.271 llvm/lib/Target/X86/InstSelectSimple.cpp:1.272
--- llvm/lib/Target/X86/InstSelectSimple.cpp:1.271	Wed Jul 14 21:14:23 2004
+++ llvm/lib/Target/X86/InstSelectSimple.cpp	Sat Jul 17 19:33:38 2004
@@ -394,16 +394,10 @@
                       MachineBasicBlock::iterator IPt) {
   // If this operand is a constant, emit the code to copy the constant into
   // the register here...
-  //
   if (Constant *C = dyn_cast(V)) {
     unsigned Reg = makeAnotherReg(V->getType());
     copyConstantToRegister(MBB, IPt, C, Reg);
     return Reg;
-  } else if (GlobalValue *GV = dyn_cast(V)) {
-    unsigned Reg = makeAnotherReg(V->getType());
-    // Move the address of the global into the register
-    BuildMI(*MBB, IPt, X86::MOV32ri, 1, Reg).addGlobalAddress(GV);
-    return Reg;
   } else if (CastInst *CI = dyn_cast(V)) {
     // Do not emit noop casts at all, unless it's a double -> float cast.
     if (getClassB(CI->getType()) == getClassB(CI->getOperand(0)->getType()) &&
@@ -554,8 +548,8 @@
   } else if (isa(C)) {
     // Copy zero (null pointer) to the register.
     BuildMI(*MBB, IP, X86::MOV32ri, 1, R).addImm(0);
-  } else if (ConstantPointerRef *CPR = dyn_cast(C)) {
-    BuildMI(*MBB, IP, X86::MOV32ri, 1, R).addGlobalAddress(CPR->getValue());
+  } else if (GlobalValue *GV = dyn_cast(C)) {
+    BuildMI(*MBB, IP, X86::MOV32ri, 1, R).addGlobalAddress(GV);
   } else {
     std::cerr << "Offending constant: " << *C << "\n";
     assert(0 && "Type not handled yet!");
@@ -688,8 +682,7 @@
 
           // If this is a constant or GlobalValue, we may have to insert code
           // into the basic block to compute it into a virtual register.
-          if ((isa(Val) && !isa(Val)) ||
-              isa(Val)) {
+          if ((isa(Val) && !isa(Val))) {
             // Simple constants get emitted at the end of the basic block,
             // before any terminator instructions.  We "know" that the code to
             // move a constant into a register will never clobber any flags.
@@ -3635,8 +3628,6 @@
                          Value *Src, User::op_iterator IdxBegin,
                          User::op_iterator IdxEnd, unsigned &BaseReg,
                          unsigned &Scale, unsigned &IndexReg, unsigned &Disp) {
-  if (ConstantPointerRef *CPR = dyn_cast(Src))
-    Src = CPR->getValue();
 
   std::vector GEPOps;
   GEPOps.resize(IdxEnd-IdxBegin+1);
@@ -3660,8 +3651,6 @@
                             Value *Src, User::op_iterator IdxBegin,
                             User::op_iterator IdxEnd, unsigned TargetReg) {
   const TargetData &TD = TM.getTargetData();
-  if (ConstantPointerRef *CPR = dyn_cast(Src))
-    Src = CPR->getValue();
 
   // If this is a getelementptr null, with all constant integer indices, just
   // replace it with TargetReg = 42.


Index: llvm/lib/Target/X86/Printer.cpp
diff -u llvm/lib/Target/X86/Printer.cpp:1.103 llvm/lib/Target/X86/Printer.cpp:1.104
--- llvm/lib/Target/X86/Printer.cpp:1.103	Tue Jun 29 14:43:20 2004
+++ llvm/lib/Target/X86/Printer.cpp	Sat Jul 17 19:33:38 2004
@@ -178,10 +178,10 @@
       O << (unsigned long long)CI->getValue();
   else if (const ConstantUInt *CI = dyn_cast(CV))
     O << CI->getValue();
-  else if (const ConstantPointerRef *CPR = dyn_cast(CV))
+  else if (const GlobalValue *GV = dyn_cast(CV))
     // This is a constant address for a global variable or function.  Use the
     // name of the variable or function as the address value.
-    O << Mang->getValueName(CPR->getValue());
+    O << Mang->getValueName(GV);
   else if (const ConstantExpr *CE = dyn_cast(CV)) {
     const TargetData &TD = TM.getTargetData();
     switch(CE->getOpcode()) {


Index: llvm/lib/Target/X86/X86SimpInstrSelector.cpp
diff -u llvm/lib/Target/X86/X86SimpInstrSelector.cpp:1.6 llvm/lib/Target/X86/X86SimpInstrSelector.cpp:1.7
--- llvm/lib/Target/X86/X86SimpInstrSelector.cpp:1.6	Wed Jul 14 21:14:24 2004
+++ llvm/lib/Target/X86/X86SimpInstrSelector.cpp	Sat Jul 17 19:33:38 2004
@@ -316,13 +316,13 @@
       // If this operand is a constant, emit the code to copy the constant into
       // the register here...
       //
-      if (Constant *C = dyn_cast(V)) {
-        copyConstantToRegister(MBB, IPt, C, Reg);
-        RegMap.erase(V);  // Assign a new name to this constant if ref'd again
-      } else if (GlobalValue *GV = dyn_cast(V)) {
+      if (GlobalValue *GV = dyn_cast(V)) {
         // Move the address of the global into the register
         BuildMI(*MBB, IPt, X86::MOV32ri, 1, Reg).addGlobalAddress(GV);
         RegMap.erase(V);  // Assign a new name to this address if ref'd again
+      } else if (Constant *C = dyn_cast(V)) {
+        copyConstantToRegister(MBB, IPt, C, Reg);
+        RegMap.erase(V);  // Assign a new name to this constant if ref'd again
       }
 
       return Reg;
@@ -480,8 +480,8 @@
   } else if (isa(C)) {
     // Copy zero (null pointer) to the register.
     BuildMI(*MBB, IP, X86::MOV32ri, 1, R).addImm(0);
-  } else if (ConstantPointerRef *CPR = dyn_cast(C)) {
-    BuildMI(*MBB, IP, X86::MOV32ri, 1, R).addGlobalAddress(CPR->getValue());
+  } else if (GlobalValue *GV = dyn_cast(C)) {
+    BuildMI(*MBB, IP, X86::MOV32ri, 1, R).addGlobalAddress(GV);
   } else {
     std::cerr << "Offending constant: " << *C << "\n";
     assert(0 && "Type not handled yet!");
@@ -602,7 +602,7 @@
 
           // If this is a constant or GlobalValue, we may have to insert code
           // into the basic block to compute it into a virtual register.
-          if (isa(Val) || isa(Val)) {
+          if (isa(Val)) {
             // Because we don't want to clobber any values which might be in
             // physical registers with the computation of this constant (which
             // might be arbitrarily complex if it is a constant expression),
@@ -2589,9 +2589,6 @@
                          Value *Src, User::op_iterator IdxBegin,
                          User::op_iterator IdxEnd, unsigned &BaseReg,
                          unsigned &Scale, unsigned &IndexReg, unsigned &Disp) {
-  if (ConstantPointerRef *CPR = dyn_cast(Src))
-    Src = CPR->getValue();
-
   std::vector GEPOps;
   GEPOps.resize(IdxEnd-IdxBegin+1);
   GEPOps[0] = Src;
@@ -2614,8 +2611,6 @@
                             Value *Src, User::op_iterator IdxBegin,
                             User::op_iterator IdxEnd, unsigned TargetReg) {
   const TargetData &TD = TM.getTargetData();
-  if (ConstantPointerRef *CPR = dyn_cast(Src))
-    Src = CPR->getValue();
 
   std::vector GEPOps;
   GEPOps.resize(IdxEnd-IdxBegin+1);




From llvm at cs.uiuc.edu  Sat Jul 17 19:36:54 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:36:54 -0500
Subject: [llvm-commits] 
	CVS: llvm/lib/Target/SparcV9/InternalGlobalMapper.cpp
	SparcV9AsmPrinter.cpp 
Message-ID: <200407180036.TAA10077@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/SparcV9:

InternalGlobalMapper.cpp updated: 1.2 -> 1.3
SparcV9AsmPrinter.cpp updated: 1.115 -> 1.116

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage


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

Index: llvm/lib/Target/SparcV9/InternalGlobalMapper.cpp
diff -u llvm/lib/Target/SparcV9/InternalGlobalMapper.cpp:1.2 llvm/lib/Target/SparcV9/InternalGlobalMapper.cpp:1.3
--- llvm/lib/Target/SparcV9/InternalGlobalMapper.cpp:1.2	Tue Jun  8 15:08:30 2004
+++ llvm/lib/Target/SparcV9/InternalGlobalMapper.cpp	Sat Jul 17 19:36:44 2004
@@ -42,7 +42,7 @@
   // add a null.
   if (GV.hasInternalLinkage () && GV.hasName ())
     Vector.push_back (ConstantExpr::getCast
-      (ConstantPointerRef::get (&GV), PointerType::get (Type::SByteTy)));
+      (&GV, PointerType::get (Type::SByteTy)));
   else
     Vector.push_back (ConstantPointerNull::get (PointerType::get
                                                 (Type::SByteTy)));


Index: llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp:1.115 llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp:1.116
--- llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp:1.115	Thu Jun 17 13:17:08 2004
+++ llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp	Sat Jul 17 19:36:44 2004
@@ -317,11 +317,8 @@
   
   toAsm << "\t" << TypeToDataDirective(CV->getType()) << "\t";
   
-  if (const ConstantPointerRef* CPR = dyn_cast(CV)) {
-    // This is a constant address for a global variable or method.
-    // Use the name of the variable or method as the address value.
-    assert(isa(CPR->getValue()) && "Unexpected non-global");
-    toAsm << getID(CPR->getValue()) << "\n";
+  if (const GlobalValue* GV = dyn_cast(CV)) {
+    toAsm << getID(GV) << "\n";
   } else if (isa(CV)) {
     // Null pointer value
     toAsm << "0\n";
@@ -480,7 +477,9 @@
                                         const TargetMachine& target) {
   std::string S;
   bool failed = false;
-  if (const Constant* CV = dyn_cast(V)) { // symbolic or known
+  if (const GlobalValue* GV = dyn_cast(V)) {
+    S += getID(GV);
+  } else if (const Constant* CV = dyn_cast(V)) { // symbolic or known
     if (const ConstantBool *CB = dyn_cast(CV))
       S += std::string(CB == ConstantBool::True ? "1" : "0");
     else if (const ConstantSInt *CI = dyn_cast(CV))
@@ -491,14 +490,10 @@
       S += ftostr(CFP->getValue());
     else if (isa(CV))
       S += "0";
-    else if (const ConstantPointerRef *CPR = dyn_cast(CV))
-      S += valToExprString(CPR->getValue(), target);
     else if (const ConstantExpr *CE = dyn_cast(CV))
       S += ConstantExprToString(CE, target);
     else
       failed = true;
-  } else if (const GlobalValue* GV = dyn_cast(V)) {
-    S += getID(GV);
   } else
     failed = true;
 




From llvm at cs.uiuc.edu  Sat Jul 17 19:36:54 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:36:54 -0500
Subject: [llvm-commits] 
	CVS: llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp
Message-ID: <200407180036.TAA10084@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/SparcV9/RegAlloc:

PhyRegAlloc.cpp updated: 1.153 -> 1.154

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage


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

Index: llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp
diff -u llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp:1.153 llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp:1.154
--- llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp:1.153	Thu Jul 15 19:07:21 2004
+++ llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp	Sat Jul 17 19:36:44 2004
@@ -1289,7 +1289,7 @@
 
       // Have: { uint, [Size x { uint, int, uint, int }] } *
       // Cast it to: { uint, [0 x { uint, int, uint, int }] } *
-      Constant *CE = ConstantExpr::getCast (ConstantPointerRef::get (GV), PT);
+      Constant *CE = ConstantExpr::getCast (GV, PT);
       allstate.push_back (CE);
     }
   }




From llvm at cs.uiuc.edu  Sat Jul 17 19:37:45 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:37:45 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/SparcV9/LiveVar/ValueSet.cpp 
Message-ID: <200407180037.TAA10096@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/SparcV9/LiveVar:

ValueSet.cpp updated: 1.16 -> 1.17

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Correct isa for GlobalValue subclass


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

Index: llvm/lib/Target/SparcV9/LiveVar/ValueSet.cpp
diff -u llvm/lib/Target/SparcV9/LiveVar/ValueSet.cpp:1.16 llvm/lib/Target/SparcV9/LiveVar/ValueSet.cpp:1.17
--- llvm/lib/Target/SparcV9/LiveVar/ValueSet.cpp:1.16	Tue Nov 11 16:41:32 2003
+++ llvm/lib/Target/SparcV9/LiveVar/ValueSet.cpp	Sat Jul 17 19:37:35 2004
@@ -17,7 +17,7 @@
   const Value &v = V.V;
   if (v.hasName())
     return O << (void*)&v << "(" << v.getName() << ") ";
-  else if (isa(v))
+  else if (isa(v) && !isa(v))
     return O << (void*)&v << "(" << v << ") ";
   else
     return O << (void*)&v << " ";




From llvm at cs.uiuc.edu  Sat Jul 17 19:38:42 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:38:42 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/SparcV9/SparcV9InstrInfo.cpp
	SparcV9PreSelection.cpp 
Message-ID: <200407180038.TAA10112@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/SparcV9:

SparcV9InstrInfo.cpp updated: 1.66 -> 1.67
SparcV9PreSelection.cpp updated: 1.35 -> 1.36

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage
- Minimize redundant isa usage
- Correct isa for GlobalValue subclass


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

Index: llvm/lib/Target/SparcV9/SparcV9InstrInfo.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9InstrInfo.cpp:1.66 llvm/lib/Target/SparcV9/SparcV9InstrInfo.cpp:1.67
--- llvm/lib/Target/SparcV9/SparcV9InstrInfo.cpp:1.66	Thu Jun 10 21:03:48 2004
+++ llvm/lib/Target/SparcV9/SparcV9InstrInfo.cpp	Sat Jul 17 19:38:32 2004
@@ -56,16 +56,14 @@
   if (! destType->isIntegral() && ! isa(destType))
     return C;
 
-  if (! isa(V))
+  if (! isa(V) || isa(V))
     return C;
 
-  // ConstantPointerRef: no conversions needed: get value and return it
-  if (const ConstantPointerRef* CPR = dyn_cast(V)) {
-    // A ConstantPointerRef is just a reference to GlobalValue.
+  // GlobalValue: no conversions needed: get value and return it
+  if (const GlobalValue* GV = dyn_cast(V)) {
     isValidConstant = true;             // may be overwritten by recursive call
-    return (CPR->isNullValue()? 0
-            : ConvertConstantToIntType(target, CPR->getValue(), destType,
-                                       isValidConstant));
+    return GV->isNullValue() ? 0 :
+	   ConvertConstantToIntType(target, GV, destType, isValidConstant);
   }
 
   // ConstantBool: no conversions needed: get value and return it
@@ -284,7 +282,7 @@
                 Value* val, Instruction* tmpReg, Instruction* dest,
                 std::vector& mvec)
 {
-  assert(isa(val) || isa(val) &&
+  assert(isa(val) && 
          "I only know about constant values and global addresses");
   
   MachineInstr* MI;
@@ -467,7 +465,7 @@
                                       std::vector& mvec,
                                       MachineCodeForInstruction& mcfi) const
 {
-  assert(isa(val) || isa(val) &&
+  assert(isa(val) &&
          "I only know about constant values and global addresses");
   
   // Use a "set" instruction for known constants or symbolic constants (labels)
@@ -477,10 +475,6 @@
   // 
   const Type* valType = val->getType();
   
-  // A ConstantPointerRef is just a reference to GlobalValue.
-  while (isa(val))
-    val = cast(val)->getValue();
-
   if (isa(val)) {
       TmpInstruction* tmpReg =
         new TmpInstruction(mcfi, PointerType::get(val->getType()), val);
@@ -688,7 +682,9 @@
   // a global variable (i.e., a constant address), generate a load
   // instruction instead of an add
   // 
-  if (isa(src)) {
+  if (isa(src))
+    loadConstantToReg = true;
+  else if (isa(src)) {
     unsigned int machineRegNum;
     int64_t immedValue;
     MachineOperand::MachineOperandType opType =
@@ -698,8 +694,6 @@
     if (opType == MachineOperand::MO_VirtualRegister)
       loadConstantToReg = true;
   }
-  else if (isa(src))
-    loadConstantToReg = true;
   
   if (loadConstantToReg) { 
     // `src' is constant and cannot fit in immed field for the ADD


Index: llvm/lib/Target/SparcV9/SparcV9PreSelection.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9PreSelection.cpp:1.35 llvm/lib/Target/SparcV9/SparcV9PreSelection.cpp:1.36
--- llvm/lib/Target/SparcV9/SparcV9PreSelection.cpp:1.35	Wed Jun 23 16:41:32 2004
+++ llvm/lib/Target/SparcV9/SparcV9PreSelection.cpp	Sat Jul 17 19:38:32 2004
@@ -85,8 +85,6 @@
 
 // getGlobalAddr(): Put address of a global into a v. register.
 static GetElementPtrInst* getGlobalAddr(Value* ptr, Instruction& insertBefore) {
-  if (isa(ptr))
-    ptr = cast(ptr)->getValue();
 
   return (isa(ptr))
     ? new GetElementPtrInst(ptr,




From llvm at cs.uiuc.edu  Sat Jul 17 19:38:42 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:38:42 -0500
Subject: [llvm-commits] 
	CVS: llvm/lib/Target/SparcV9/InstrSelection/InstrForest.cpp
	InstrSelectionSupport.cpp 
Message-ID: <200407180038.TAA10121@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/SparcV9/InstrSelection:

InstrForest.cpp updated: 1.55 -> 1.56
InstrSelectionSupport.cpp updated: 1.68 -> 1.69

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage
- Minimize redundant isa usage
- Correct isa for GlobalValue subclass


---
Diffs of the changes:  (+16 -13)

Index: llvm/lib/Target/SparcV9/InstrSelection/InstrForest.cpp
diff -u llvm/lib/Target/SparcV9/InstrSelection/InstrForest.cpp:1.55 llvm/lib/Target/SparcV9/InstrSelection/InstrForest.cpp:1.56
--- llvm/lib/Target/SparcV9/InstrSelection/InstrForest.cpp:1.55	Wed Jul 14 21:14:29 2004
+++ llvm/lib/Target/SparcV9/InstrSelection/InstrForest.cpp	Sat Jul 17 19:38:32 2004
@@ -244,8 +244,7 @@
 	&& !instr->isTerminator();
     
       if (includeAddressOperand || isa(operand) ||
-	  isa(operand) || isa(operand) ||
-	  isa(operand))
+	  isa(operand) || isa(operand)) 
       {
         // This operand is a data value
 	
@@ -273,8 +272,11 @@
           // Recursively create a treeNode for it.
           opTreeNode = buildTreeForInstruction((Instruction*)operand);
         } else if (Constant *CPV = dyn_cast(operand)) {
-          // Create a leaf node for a constant
-          opTreeNode = new ConstantNode(CPV);
+          if (isa(CPV))
+            opTreeNode = new VRegNode(operand);
+          else
+            // Create a leaf node for a constant
+            opTreeNode = new ConstantNode(CPV);
         } else {
           // Create a leaf node for the virtual register
           opTreeNode = new VRegNode(operand);


Index: llvm/lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp
diff -u llvm/lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp:1.68 llvm/lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp:1.69
--- llvm/lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp:1.68	Wed Jun  2 00:54:49 2004
+++ llvm/lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp	Sat Jul 17 19:38:32 2004
@@ -22,6 +22,7 @@
 #include "llvm/Constants.h"
 #include "llvm/BasicBlock.h"
 #include "llvm/DerivedTypes.h"
+#include "llvm/GlobalValue.h"
 #include "../SparcV9InstrSelectionSupport.h"
 
 namespace llvm {
@@ -159,13 +160,14 @@
       if (mop.getType() == MachineOperand::MO_VirtualRegister) {
         assert(mop.getVRegValue() != NULL);
         opValue = mop.getVRegValue();
-        if (Constant *opConst = dyn_cast(opValue)) {
-          opType = ChooseRegOrImmed(opConst, opCode, target,
-                                    (immedPos == (int)op), machineRegNum,
-                                    immedValue);
-          if (opType == MachineOperand::MO_VirtualRegister)
-            constantThatMustBeLoaded = true;
-        }
+        if (Constant *opConst = dyn_cast(opValue)) 
+          if (!isa(opConst)) {
+            opType = ChooseRegOrImmed(opConst, opCode, target,
+                                      (immedPos == (int)op), machineRegNum,
+                                      immedValue);
+            if (opType == MachineOperand::MO_VirtualRegister)
+              constantThatMustBeLoaded = true;
+          }
       } else {
         //
         // If the operand is from the constant pool, don't try to change it.
@@ -242,8 +244,7 @@
     argDesc = CallArgsDescriptor::get(minstr);
   
   for (unsigned i=0, N=minstr->getNumImplicitRefs(); i < N; ++i)
-    if (isa(minstr->getImplicitRef(i)) ||
-        isa(minstr->getImplicitRef(i)))
+    if (isa(minstr->getImplicitRef(i)))
       {
         Value* oldVal = minstr->getImplicitRef(i);
         TmpInstruction* tmpReg =




From llvm at cs.uiuc.edu  Sat Jul 17 19:39:58 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:39:58 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/CBackend/Writer.cpp 
Message-ID: <200407180039.TAA10141@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/CBackend:

Writer.cpp updated: 1.189 -> 1.190

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage


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

Index: llvm/lib/Target/CBackend/Writer.cpp
diff -u llvm/lib/Target/CBackend/Writer.cpp:1.189 llvm/lib/Target/CBackend/Writer.cpp:1.190
--- llvm/lib/Target/CBackend/Writer.cpp:1.189	Wed Jul 14 21:14:29 2004
+++ llvm/lib/Target/CBackend/Writer.cpp	Sat Jul 17 19:39:48 2004
@@ -620,8 +620,8 @@
       printType(Out, CPV->getType());
       Out << ")/*NULL*/0)";
       break;
-    } else if (ConstantPointerRef *CPR = dyn_cast(CPV)) {
-      writeOperand(CPR->getValue());
+    } else if (GlobalValue *GV = dyn_cast(CPV)) {
+      writeOperand(GV);
       break;
     }
     // FALL THROUGH
@@ -641,7 +641,8 @@
       return;
     }
   
-  if (Constant *CPV = dyn_cast(Operand)) {
+  Constant* CPV = dyn_cast(Operand);
+  if (CPV && !isa(CPV)) {
     printConstant(CPV); 
   } else {
     Out << Mang->getValueName(Operand);
@@ -1412,9 +1413,6 @@
   // If accessing a global value with no indexing, avoid *(&GV) syndrome
   if (GlobalValue *V = dyn_cast(Ptr)) {
     HasImplicitAddress = true;
-  } else if (ConstantPointerRef *CPR = dyn_cast(Ptr)) {
-    HasImplicitAddress = true;
-    Ptr = CPR->getValue();         // Get to the global...
   } else if (isDirectAlloca(Ptr)) {
     HasImplicitAddress = true;
   }




From llvm at cs.uiuc.edu  Sat Jul 17 19:41:37 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:41:37 -0500
Subject: [llvm-commits] CVS: llvm/lib/ExecutionEngine/ExecutionEngine.cpp 
Message-ID: <200407180041.TAA10168@zion.cs.uiuc.edu>



Changes in directory llvm/lib/ExecutionEngine:

ExecutionEngine.cpp updated: 1.55 -> 1.56

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage
- Correct isa for GlobalValue subclass


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

Index: llvm/lib/ExecutionEngine/ExecutionEngine.cpp
diff -u llvm/lib/ExecutionEngine/ExecutionEngine.cpp:1.55 llvm/lib/ExecutionEngine/ExecutionEngine.cpp:1.56
--- llvm/lib/ExecutionEngine/ExecutionEngine.cpp:1.55	Wed Jul 14 21:47:47 2004
+++ llvm/lib/ExecutionEngine/ExecutionEngine.cpp	Sat Jul 17 19:41:27 2004
@@ -263,19 +263,14 @@
     GET_CONST_VAL(Double , ConstantFP);
 #undef GET_CONST_VAL
   case Type::PointerTyID:
-    if (isa(C)) {
+    if (isa(C))
       Result.PointerVal = 0;
-    } else if (const ConstantPointerRef *CPR = dyn_cast(C)){
-      if (Function *F =
-          const_cast(dyn_cast(CPR->getValue())))
-        Result = PTOGV(getPointerToFunctionOrStub(F));
-      else 
-        Result = PTOGV(getOrEmitGlobalVariable(
-                           cast(CPR->getValue())));
-
-    } else {
+    else if (const Function *F = dyn_cast(C))
+      Result = PTOGV(getPointerToFunctionOrStub(const_cast(F)));
+    else if (const GlobalVariable* GV = dyn_cast(C))
+      Result = PTOGV(getOrEmitGlobalVariable(const_cast(GV)));
+    else
       assert(0 && "Unknown constant pointer type!");
-    }
     break;
   default:
     std::cout << "ERROR: Constant unimp for type: " << *C->getType() << "\n";




From llvm at cs.uiuc.edu  Sat Jul 17 19:42:22 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:42:22 -0500
Subject: [llvm-commits] CVS: llvm/lib/Debugger/ProgramInfo.cpp 
Message-ID: <200407180042.TAA10187@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Debugger:

ProgramInfo.cpp updated: 1.3 -> 1.4

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage


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

Index: llvm/lib/Debugger/ProgramInfo.cpp
diff -u llvm/lib/Debugger/ProgramInfo.cpp:1.3 llvm/lib/Debugger/ProgramInfo.cpp:1.4
--- llvm/lib/Debugger/ProgramInfo.cpp:1.3	Sun Jul  4 07:19:56 2004
+++ llvm/lib/Debugger/ProgramInfo.cpp	Sat Jul 17 19:42:12 2004
@@ -61,8 +61,8 @@
       }
     }
   } else if (Constant *C = dyn_cast(V)) {
-    if (ConstantPointerRef *CPR = dyn_cast(C))
-      return getStringValue(CPR->getValue(), Offset);
+    if (GlobalValue *GV = dyn_cast(C))
+      return getStringValue(GV, Offset);
     else if (ConstantExpr *CE = dyn_cast(C)) {
       if (CE->getOpcode() == Instruction::GetElementPtr) {
         // Turn a gep into the specified offset.
@@ -108,8 +108,6 @@
           if (const ConstantInt *C = dyn_cast(CI->getOperand(3)))
             CurColNo = C->getRawValue();
           const Value *Op = CI->getOperand(4);
-          if (const ConstantPointerRef *CPR = dyn_cast(Op))
-            Op = CPR->getValue();
           
           if ((CurDesc = dyn_cast(Op)) &&
               (LineNo < LastLineNo ||
@@ -192,11 +190,9 @@
     if (ConstantStruct *CS = dyn_cast(Desc->getInitializer()))
       if (CS->getNumOperands() > 2) {
         // Entry #1 is the file descriptor.
-        if (const ConstantPointerRef *CPR =
-            dyn_cast(CS->getOperand(1)))
-          if (const GlobalVariable *GV =
-              dyn_cast(CPR->getValue()))
-            SourceFile = &PI.getSourceFile(GV);
+        if (const GlobalVariable *GV = 
+            dyn_cast(CS->getOperand(1)))
+          SourceFile = &PI.getSourceFile(GV);
 
         // Entry #2 is the function name.
         Name = getStringValue(CS->getOperand(2));
@@ -366,9 +362,9 @@
   if (Desc && Desc->hasInitializer())
     if (ConstantStruct *CS = dyn_cast(Desc->getInitializer()))
       if (CS->getNumOperands() > 0)
-        if (const ConstantPointerRef *CPR =
-            dyn_cast(CS->getOperand(1)))
-          SourceFileDesc = dyn_cast(CPR->getValue());
+        if (const GlobalVariable *GV =
+            dyn_cast(CS->getOperand(1)))
+          SourceFileDesc = GV;
 
   const SourceLanguage &Lang = getSourceFile(SourceFileDesc).getLanguage();
   return *(Result = Lang.createSourceFunctionInfo(Desc, *this));




From llvm at cs.uiuc.edu  Sat Jul 17 19:44:24 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:44:24 -0500
Subject: [llvm-commits] CVS: llvm/tools/analyze/AnalysisWrappers.cpp 
Message-ID: <200407180044.TAA10208@zion.cs.uiuc.edu>



Changes in directory llvm/tools/analyze:

AnalysisWrappers.cpp updated: 1.12 -> 1.13

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Minimize redundant isa usage


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

Index: llvm/tools/analyze/AnalysisWrappers.cpp
diff -u llvm/tools/analyze/AnalysisWrappers.cpp:1.12 llvm/tools/analyze/AnalysisWrappers.cpp:1.13
--- llvm/tools/analyze/AnalysisWrappers.cpp:1.12	Sun Jul  4 07:20:55 2004
+++ llvm/tools/analyze/AnalysisWrappers.cpp	Sat Jul 17 19:44:14 2004
@@ -59,7 +59,7 @@
               if (CS.getInstruction()) {
                 for (CallSite::arg_iterator AI = CS.arg_begin(),
                        E = CS.arg_end(); AI != E; ++AI)
-                  if (isa(*AI) || isa(*AI)) {
+                  if (isa(*AI)) {
                     if (!PrintedFn) {
                       std::cerr << "Function '" << I->getName() << "':\n";
                       PrintedFn = true;




From llvm at cs.uiuc.edu  Sat Jul 17 19:44:47 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:44:47 -0500
Subject: [llvm-commits] CVS: llvm/tools/bugpoint/Miscompilation.cpp 
Message-ID: <200407180044.TAA10223@zion.cs.uiuc.edu>



Changes in directory llvm/tools/bugpoint:

Miscompilation.cpp updated: 1.49 -> 1.50

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
- Replace ConstantPointerRef usage with GlobalValue usage


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

Index: llvm/tools/bugpoint/Miscompilation.cpp
diff -u llvm/tools/bugpoint/Miscompilation.cpp:1.49 llvm/tools/bugpoint/Miscompilation.cpp:1.50
--- llvm/tools/bugpoint/Miscompilation.cpp:1.49	Wed Jun 23 12:31:13 2004
+++ llvm/tools/bugpoint/Miscompilation.cpp	Sat Jul 17 19:44:37 2004
@@ -654,8 +654,7 @@
         // GetElementPtr *funcName, ulong 0, ulong 0
         std::vector GEPargs(2,Constant::getNullValue(Type::IntTy));
         Value *GEP =
-          ConstantExpr::getGetElementPtr(ConstantPointerRef::get(funcName),
-                                         GEPargs);
+          ConstantExpr::getGetElementPtr(funcName, GEPargs);
         std::vector ResolverArgs;
         ResolverArgs.push_back(GEP);
 




From reid at x10sys.com  Sat Jul 17 19:51:49 2004
From: reid at x10sys.com (Reid Spencer)
Date: Sat, 17 Jul 2004 20:51:49 -0400
Subject: [llvm-commits] ConstantPointerRef Changes
Message-ID: 

LLVMers,

The long awaited conclusion of bug 122 (VMCore cleanups) is very near. I 
have just committed all the changes to rid LLVM of the ConstantPointerRef 
abomination. This class no longer exists. Just use GlobalValue, 
GlobalVariable or Function directly.

The changes pass 100% of Feature and Regression tests.

Two minor discrepancies against the Programs tests were detected but these 
were attributed to either the test program (changes committed) or the test 
machine.

What hasn't been tested: SparcV9 BE (thanks, Brian! :)

Hopefully you won't get any grief from these changes, but if you do, please 
contact either Chris or I.

I must also give at least 50% credit for these changes to Chris Lattner. 
Without his almost constant expertise at hand (on the IRC channel), I would 
not have been able to complete these changes this past week.

Best Regards,

Reid.



From llvm at cs.uiuc.edu  Sat Jul 17 19:55:59 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:55:59 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/GlobalValue.h 
Message-ID: <200407180055.TAA10281@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

GlobalValue.h updated: 1.16 -> 1.17

---
Log message:

Fix typeos in comments.


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

Index: llvm/include/llvm/GlobalValue.h
diff -u llvm/include/llvm/GlobalValue.h:1.16 llvm/include/llvm/GlobalValue.h:1.17
--- llvm/include/llvm/GlobalValue.h:1.16	Sat Jul 17 18:28:28 2004
+++ llvm/include/llvm/GlobalValue.h	Sat Jul 17 19:55:49 2004
@@ -45,9 +45,9 @@
   virtual ~GlobalValue();
 
   /// If the usage is empty (except transitively dead constants), then this
-  /// global value can can be safely deleted since the destructor wll 
+  /// global value can can be safely deleted since the destructor will 
   /// delete the dead constants as well.
-  /// @brief Determine if theusage of this global value is empty except 
+  /// @brief Determine if the usage of this global value is empty except 
   /// for transitively dead constants.
   bool use_empty_except_constants();
 




From llvm at cs.uiuc.edu  Sat Jul 17 19:57:08 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 19:57:08 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Value.h 
Message-ID: <200407180057.TAA10299@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

Value.h updated: 1.58 -> 1.59

---
Log message:

Add a missing space to align comments.


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

Index: llvm/include/llvm/Value.h
diff -u llvm/include/llvm/Value.h:1.58 llvm/include/llvm/Value.h:1.59
--- llvm/include/llvm/Value.h:1.58	Sat Jul 17 18:34:47 2004
+++ llvm/include/llvm/Value.h	Sat Jul 17 19:56:58 2004
@@ -128,7 +128,7 @@
     GlobalVariableVal,      // This is an instance of GlobalVariable
     ConstantVal,            // This is an instance of Constant
     InstructionVal,         // This is an instance of Instruction
-    ValueListVal           // This is for bcreader, a special ValTy
+    ValueListVal            // This is for bcreader, a special ValTy
   };
   unsigned getValueType() const {
     return SubclassID;




From llvm at cs.uiuc.edu  Sat Jul 17 20:04:29 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 17 Jul 2004 20:04:29 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/AsmWriter.cpp 
Message-ID: <200407180104.UAA10368@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

AsmWriter.cpp updated: 1.148 -> 1.149

---
Log message:

Shrink some code.


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

Index: llvm/lib/VMCore/AsmWriter.cpp
diff -u llvm/lib/VMCore/AsmWriter.cpp:1.148 llvm/lib/VMCore/AsmWriter.cpp:1.149
--- llvm/lib/VMCore/AsmWriter.cpp:1.148	Sat Jul 17 18:45:23 2004
+++ llvm/lib/VMCore/AsmWriter.cpp	Sat Jul 17 20:04:19 2004
@@ -766,10 +766,7 @@
   if (GV->hasInitializer()) {
     Constant* C = cast(GV->getInitializer());
     assert(C &&  "GlobalVar initializer isn't constant?");
-    if (isa(C))
-      writeOperand(GV->getInitializer(), false, true);
-    else
-      writeOperand(GV->getInitializer(), false, false);
+    writeOperand(GV->getInitializer(), false, isa(C));
   }
 
   printInfoComment(*GV);




From lattner at cs.uiuc.edu  Sun Jul 18 01:57:08 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun, 18 Jul 2004 01:57:08 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/Inliner.cpp 
Message-ID: <200407180657.BAA03444@apoc.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/IPO:

Inliner.cpp updated: 1.17 -> 1.18

---
Log message:

Fix a rather serious bug in previous checkin


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

Index: llvm/lib/Transforms/IPO/Inliner.cpp
diff -u llvm/lib/Transforms/IPO/Inliner.cpp:1.17 llvm/lib/Transforms/IPO/Inliner.cpp:1.18
--- llvm/lib/Transforms/IPO/Inliner.cpp:1.17	Sat Jul 17 19:22:58 2004
+++ llvm/lib/Transforms/IPO/Inliner.cpp	Sun Jul 18 01:56:58 2004
@@ -175,7 +175,6 @@
     if (F && F->hasOneUse())
       if (Function *GV = dyn_cast(F->use_back()))
         if (GV->removeDeadConstantUsers()) {
-	  delete GV;
           if (F->hasInternalLinkage()) {
             // There *MAY* be an edge from the external call node to this
             // function.  If so, remove it.




From lattner at cs.uiuc.edu  Sun Jul 18 02:23:08 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun, 18 Jul 2004 02:23:08 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/GlobalDCE.cpp 
Message-ID: <200407180723.CAA31248@apoc.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/IPO:

GlobalDCE.cpp updated: 1.32 -> 1.33

---
Log message:

Remove useless statistic, fix some slightly broken logic


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

Index: llvm/lib/Transforms/IPO/GlobalDCE.cpp
diff -u llvm/lib/Transforms/IPO/GlobalDCE.cpp:1.32 llvm/lib/Transforms/IPO/GlobalDCE.cpp:1.33
--- llvm/lib/Transforms/IPO/GlobalDCE.cpp:1.32	Sat Jul 17 19:25:04 2004
+++ llvm/lib/Transforms/IPO/GlobalDCE.cpp	Sun Jul 18 02:22:58 2004
@@ -26,7 +26,6 @@
 namespace {
   Statistic<> NumFunctions("globaldce","Number of functions removed");
   Statistic<> NumVariables("globaldce","Number of global variables removed");
-  Statistic<> NumGVs("globaldce", "Number of global values removed");
 
   struct GlobalDCE : public Pass {
     // run - Do the GlobalDCE pass on the specified module, optionally updating
@@ -171,13 +170,10 @@
 // might make it deader.
 //
 bool GlobalDCE::RemoveUnusedGlobalValue(GlobalValue &GV) {
-  for (Value::use_iterator I = GV.use_begin(), E = GV.use_end(); I != E; ++I)
-    if (GlobalValue* User = dyn_cast(*I))
-      if (User->removeDeadConstantUsers()) {  // Only if unreferenced...
-        ++NumGVs;
-      }
-   return false;
- }
+  if (GV.use_empty()) return false;
+  GV.removeDeadConstantUsers();
+  return GV.use_empty();
+}
  
 // SafeToDestroyConstant - It is safe to destroy a constant iff it is only used
 // by constants itself.  Note that constants cannot be cyclic, so this test is




From llvm at cs.uiuc.edu  Sun Jul 18 02:25:24 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sun, 18 Jul 2004 02:25:24 -0500
Subject: [llvm-commits] CVS: llvm/docs/ReleaseNotes.html 
Message-ID: <200407180725.CAA12070@zion.cs.uiuc.edu>



Changes in directory llvm/docs:

ReleaseNotes.html updated: 1.218 -> 1.219

---
Log message:

Bug 122: http://llvm.cs.uiuc.edu/PR122  fixed.


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

Index: llvm/docs/ReleaseNotes.html
diff -u llvm/docs/ReleaseNotes.html:1.218 llvm/docs/ReleaseNotes.html:1.219
--- llvm/docs/ReleaseNotes.html:1.218	Fri Jul 16 21:04:41 2004
+++ llvm/docs/ReleaseNotes.html	Sun Jul 18 02:25:14 2004
@@ -257,6 +257,9 @@
 Fixed: [sparcv9] null
 often spilled to constant pool.
 
+Fixed: [code-cleanup] SymbolTable 
+    class cleanup, Type should not derive from Value, eliminate 
+    ConstantPointerRef class. All three changes have been made.
 
 
 
@@ -762,7 +765,7 @@
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!" />
 
   The LLVM Compiler Infrastructure

-  Last modified: $Date: 2004/07/17 02:04:41 $
+  Last modified: $Date: 2004/07/18 07:25:14 $
 
 
 




From lattner at cs.uiuc.edu  Sun Jul 18 03:13:08 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun, 18 Jul 2004 03:13:08 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Globals.cpp 
Message-ID: <200407180813.DAA07421@apoc.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

Globals.cpp updated: 1.1 -> 1.2

---
Log message:

Fix infinite loop gccld'ing povray


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

Index: llvm/lib/VMCore/Globals.cpp
diff -u llvm/lib/VMCore/Globals.cpp:1.1 llvm/lib/VMCore/Globals.cpp:1.2
--- llvm/lib/VMCore/Globals.cpp:1.1	Sat Jul 17 19:06:26 2004
+++ llvm/lib/VMCore/Globals.cpp	Sun Jul 18 03:12:57 2004
@@ -17,7 +17,6 @@
 #include "llvm/Module.h"
 #include "llvm/SymbolTable.h"
 #include "Support/LeakDetector.h"
-
 using namespace llvm;
 
 //===----------------------------------------------------------------------===//
@@ -28,21 +27,20 @@
 /// there are no non-constant uses of this GlobalValue. If there aren't then
 /// this and the transitive closure of the constants can be deleted. See the
 /// destructor for details.
-namespace {
-bool removeDeadConstantUsers(Constant* C) {
-  while (!C->use_empty()) {
+static bool removeDeadConstantUsers(Constant* C) {
+  if (isa(C)) return false; // Cannot remove this
+
+  while (!C->use_empty())
     if (Constant *User = dyn_cast(C->use_back())) {
       if (!removeDeadConstantUsers(User)) 
         return false; // Constant wasn't dead
     } else {
       return false; // Non-constant usage;
     }
-  }
-  if (!isa(C))
-    C->destroyConstant();
+
+  C->destroyConstant();
   return true;
 }
-}
 
 /// removeDeadConstantUsers - If there are any dead constant users dangling
 /// off of this global value, remove them.  This method is useful for clients




From llvm at cs.uiuc.edu  Sun Jul 18 03:31:30 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sun, 18 Jul 2004 03:31:30 -0500
Subject: [llvm-commits] 
	CVS: llvm/lib/Transforms/IPO/IPConstantPropagation.cpp
Message-ID: <200407180831.DAA11129@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/IPO:

IPConstantPropagation.cpp updated: 1.6 -> 1.7

---
Log message:

Avoid an unnecessary isa.


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

Index: llvm/lib/Transforms/IPO/IPConstantPropagation.cpp
diff -u llvm/lib/Transforms/IPO/IPConstantPropagation.cpp:1.6 llvm/lib/Transforms/IPO/IPConstantPropagation.cpp:1.7
--- llvm/lib/Transforms/IPO/IPConstantPropagation.cpp:1.6	Sat Jul 17 19:26:34 2004
+++ llvm/lib/Transforms/IPO/IPConstantPropagation.cpp	Sun Jul 18 03:31:18 2004
@@ -82,9 +82,7 @@
         if (*AI == &F) return false;  // Passes the function into itself
 
         if (!ArgumentConstants[i].second) {
-          if (isa(*AI)) {
-            Constant *C = dyn_cast(*AI);
-            
+          if (Constant *C = dyn_cast(*AI)) {
             if (!ArgumentConstants[i].first)
               ArgumentConstants[i].first = C;
             else if (ArgumentConstants[i].first != C) {




From llvm at cs.uiuc.edu  Sun Jul 18 03:32:20 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sun, 18 Jul 2004 03:32:20 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/GCSE.cpp 
Message-ID: <200407180832.DAA11294@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

GCSE.cpp updated: 1.41 -> 1.42

---
Log message:

Expand the scope to include global values because they are now constants
too.


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

Index: llvm/lib/Transforms/Scalar/GCSE.cpp
diff -u llvm/lib/Transforms/Scalar/GCSE.cpp:1.41 llvm/lib/Transforms/Scalar/GCSE.cpp:1.42
--- llvm/lib/Transforms/Scalar/GCSE.cpp:1.41	Sat Jul 17 19:28:47 2004
+++ llvm/lib/Transforms/Scalar/GCSE.cpp	Sun Jul 18 03:32:10 2004
@@ -185,7 +185,7 @@
 
   // If we are not replacing the instruction with a constant, we cannot do
   // anything special.
-  if (!isa(V) || isa(V)) {
+  if (!isa(V)) {
     I->replaceAllUsesWith(V);
 
     if (InvokeInst *II = dyn_cast(I)) {




From llvm at cs.uiuc.edu  Sun Jul 18 03:32:53 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sun, 18 Jul 2004 03:32:53 -0500
Subject: [llvm-commits] 
	CVS: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200407180832.DAA11397@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.223 -> 1.224

---
Log message:

Delete a no-op loop.


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

Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.223 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.224
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.223	Sat Jul 17 19:29:25 2004
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Sun Jul 18 03:32:43 2004
@@ -3103,15 +3103,6 @@
       continue;
     }
 
-    // Check to see if any of the operands of this instruction are a
-    // GlobalValue.  Since they sneak in all over the place and inhibit
-    // optimization, we want to strip them out unconditionally!
-    for (unsigned i = 0, e = I->getNumOperands(); i != e; ++i)
-      if (isa(I->getOperand(i))) {
-        I->setOperand(i, I->getOperand(i));
-        Changed = true;
-      }
-
     // Now that we have an instruction, try combining it to simplify it...
     if (Instruction *Result = visit(*I)) {
       ++NumCombined;




From llvm at cs.uiuc.edu  Sun Jul 18 03:34:29 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sun, 18 Jul 2004 03:34:29 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/LowerGC.cpp 
Message-ID: <200407180834.DAA11698@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

LowerGC.cpp updated: 1.3 -> 1.4

---
Log message:

Expand the coercion of constants to include the newly constant Globals.


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

Index: llvm/lib/Transforms/Scalar/LowerGC.cpp
diff -u llvm/lib/Transforms/Scalar/LowerGC.cpp:1.3 llvm/lib/Transforms/Scalar/LowerGC.cpp:1.4
--- llvm/lib/Transforms/Scalar/LowerGC.cpp:1.3	Sat Jul 17 19:29:57 2004
+++ llvm/lib/Transforms/Scalar/LowerGC.cpp	Sun Jul 18 03:34:19 2004
@@ -140,8 +140,7 @@
 /// not have the specified type, insert a cast.
 static void Coerce(Instruction *I, unsigned OpNum, Type *Ty) {
   if (I->getOperand(OpNum)->getType() != Ty) {
-    Constant *C = dyn_cast(I->getOperand(OpNum));
-    if (C && !isa(I->getOperand(OpNum)))
+    if (Constant *C = dyn_cast(I->getOperand(OpNum))) 
       I->setOperand(OpNum, ConstantExpr::getCast(C, Ty));
     else {
       CastInst *C = new CastInst(I->getOperand(OpNum), Ty, "", I);




From llvm at cs.uiuc.edu  Sun Jul 18 03:35:03 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sun, 18 Jul 2004 03:35:03 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/SCCP.cpp 
Message-ID: <200407180835.DAA11810@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

SCCP.cpp updated: 1.97 -> 1.98

---
Log message:

Delete a redundant if branch.


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

Index: llvm/lib/Transforms/Scalar/SCCP.cpp
diff -u llvm/lib/Transforms/Scalar/SCCP.cpp:1.97 llvm/lib/Transforms/Scalar/SCCP.cpp:1.98
--- llvm/lib/Transforms/Scalar/SCCP.cpp:1.97	Sat Jul 17 19:31:05 2004
+++ llvm/lib/Transforms/Scalar/SCCP.cpp	Sun Jul 18 03:34:52 2004
@@ -175,10 +175,7 @@
     hash_map::iterator I = ValueState.find(V);
     if (I != ValueState.end()) return I->second;  // Common case, in the map
       
-    if (GlobalValue *GV = dyn_cast(V)) {
-      // The address of a global is a constant...
-      ValueState[V].markConstant(GV);
-    } else if (Constant *CPV = dyn_cast(V)) {  // Constants are constant
+    if (Constant *CPV = dyn_cast(V)) {  // Constants are constant
       ValueState[CPV].markConstant(CPV);
     } else if (isa(V)) {                // Arguments are overdefined
       ValueState[V].markOverdefined();




From llvm at cs.uiuc.edu  Sun Jul 18 03:41:57 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sun, 18 Jul 2004 03:41:57 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Utils/ValueMapper.cpp 
Message-ID: <200407180841.DAA18401@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Utils:

ValueMapper.cpp updated: 1.15 -> 1.16

---
Log message:

Remove an if statement that would never be reached.


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

Index: llvm/lib/Transforms/Utils/ValueMapper.cpp
diff -u llvm/lib/Transforms/Utils/ValueMapper.cpp:1.15 llvm/lib/Transforms/Utils/ValueMapper.cpp:1.16
--- llvm/lib/Transforms/Utils/ValueMapper.cpp:1.15	Sat Jul 17 19:32:39 2004
+++ llvm/lib/Transforms/Utils/ValueMapper.cpp	Sun Jul 18 03:41:47 2004
@@ -33,9 +33,7 @@
     if (isa(C) || isa(C) ||
         isa(C) || isa(C))
       return VMSlot = C;           // Primitive constants map directly
-    else if (GlobalValue *GV = dyn_cast(C)) {
-      return VMSlot = GV;
-    } else if (ConstantArray *CA = dyn_cast(C)) {
+    else if (ConstantArray *CA = dyn_cast(C)) {
       const std::vector &Vals = CA->getValues();
       for (unsigned i = 0, e = Vals.size(); i != e; ++i) {
         Value *MV = MapValue(Vals[i], VM);




From llvm at cs.uiuc.edu  Sun Jul 18 08:10:41 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sun, 18 Jul 2004 08:10:41 -0500
Subject: [llvm-commits] CVS: llvm/docs/ProgrammersManual.html 
Message-ID: <200407181310.IAA28717@zion.cs.uiuc.edu>



Changes in directory llvm/docs:

ProgrammersManual.html updated: 1.65 -> 1.66

---
Log message:

bug 122: http://llvm.cs.uiuc.edu/PR122 :
Updated to remove references to ConstantPointerRef and reflect the change
in the inheritance hierarchy: GlobalValue now derives from Constant.


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

Index: llvm/docs/ProgrammersManual.html
diff -u llvm/docs/ProgrammersManual.html:1.65 llvm/docs/ProgrammersManual.html:1.66
--- llvm/docs/ProgrammersManual.html:1.65	Thu Jul  8 12:49:37 2004
+++ llvm/docs/ProgrammersManual.html	Sun Jul 18 08:10:31 2004
@@ -89,15 +89,18 @@
 	      The GetElementPtrInst
 		    class
             
-          The GlobalValue class
-            
-	      The BasicBlockclass
-	      The Function class
-	      The GlobalVariable class
-	        
-            
           The Module class
-          The Constant class
+          The Constant class
+	    
+	      The GlobalValue class
+	      
+		The BasicBlockclass
+		The Function class
+		The GlobalVariable class
+		  
+	      
+	    
+	  
           The Type class 
           The Argument class
         
@@ -1258,7 +1261,7 @@
 other globals defined in different translation units.  To control the linking
 process, GlobalValues know their linkage rules. Specifically,
 GlobalValues know whether they have internal or external linkage, as
-defined by the LinkageTypes enumerator.
+defined by the LinkageTypes enumeration.
 
 If a GlobalValue has internal linkage (equivalent to being
 static in C), it is not visible to code outside the current translation
@@ -1353,6 +1356,9 @@
 href="#BasicBlock">BasicBlocks, or Arguments in the function body.
 
+Note that Function is a GlobalValue
+and therefore also a Constant. The value of the function
+is its address (after linking) which is guaranteed to be constant.
 
 
 
@@ -1698,18 +1704,13 @@
 Returns a Vecotr of component constants that makeup this array. 
         
       
-      ConstantPointerRef : This represents a constant pointer value
-that is initialized to point to a global value, which lies at a
-constant fixed address.
-        
-          GlobalValue *getValue(): Returns the global
-value to which this pointer is pointing to. 
-        
+      
GlobalValue : This represents either a global variable or a
+      function. In either case, the value is a constant fixed address
+      (after linking). 
       
     
   
 
-
 
 
 
@@ -2045,7 +2046,7 @@
   Dinakar Dhurjati and
   Chris Lattner

   The LLVM Compiler Infrastructure

-  Last modified: $Date: 2004/07/08 17:49:37 $
+  Last modified: $Date: 2004/07/18 13:10:31 $
 
 
 




From lattner at cs.uiuc.edu  Sun Jul 18 13:20:37 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun, 18 Jul 2004 13:20:37 -0500
Subject: [llvm-commits] CVS: poolalloc/lib/PoolAllocate/PoolAllocate.cpp 
Message-ID: <200407181820.NAA25053@apoc.cs.uiuc.edu>



Changes in directory poolalloc/lib/PoolAllocate:

PoolAllocate.cpp updated: 1.71 -> 1.72

---
Log message:

CPR is dead!!


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

Index: poolalloc/lib/PoolAllocate/PoolAllocate.cpp
diff -u poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.71 poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.72
--- poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.71	Thu Jul 15 19:09:10 2004
+++ poolalloc/lib/PoolAllocate/PoolAllocate.cpp	Sun Jul 18 13:20:27 2004
@@ -133,8 +133,7 @@
     Function *origF = fmI->first;
     Function *cloneF = fmI->second;
 
-    ConstantPointerRef *Ref = ConstantPointerRef::get(cloneF);
-    Constant *expr = ConstantExpr::getCast(Ref, origF->getType());
+    Constant *expr = ConstantExpr::getCast(cloneF, origF->getType());
     origF->replaceAllUsesWith(expr);
   }
   return true;




From lattner at cs.uiuc.edu  Sun Jul 18 13:59:54 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun, 18 Jul 2004 13:59:54 -0500
Subject: [llvm-commits] 
	CVS: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200407181859.NAA28089@apoc.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.224 -> 1.225

---
Log message:

Minor cleanup, no functionality change


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

Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.224 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.225
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.224	Sun Jul 18 03:32:43 2004
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Sun Jul 18 13:59:44 2004
@@ -2456,10 +2456,8 @@
 bool InstCombiner::transformConstExprCastCall(CallSite CS) {
   if (!isa(CS.getCalledValue())) return false;
   ConstantExpr *CE = cast(CS.getCalledValue());
-  if (CE->getOpcode() != Instruction::Cast ||
-      !isa(CE->getOperand(0)))
+  if (CE->getOpcode() != Instruction::Cast || !isa(CE->getOperand(0)))
     return false;
-  if (!isa(CE->getOperand(0))) return false;
   Function *Callee = cast(CE->getOperand(0));
   Instruction *Caller = CS.getInstruction();
 
@@ -2809,8 +2807,7 @@
       Indices.push_back(cast(*I));
 
     if (I == E) {  // If they are all constants...
-      Constant *CE =
-        ConstantExpr::getGetElementPtr(GV, Indices);
+      Constant *CE = ConstantExpr::getGetElementPtr(GV, Indices);
 
       // Replace all uses of the GEP with the new constexpr...
       return ReplaceInstUsesWith(GEP, CE);
@@ -2977,8 +2974,6 @@
   if (Constant *C = dyn_cast(Op))
     if (C->isNullValue())  // load null -> 0
       return ReplaceInstUsesWith(LI, Constant::getNullValue(LI.getType()));
-    else if (isa(C))
-      Op = C;
 
   // Instcombine load (constant global) into the value loaded...
   if (GlobalVariable *GV = dyn_cast(Op))




From lattner at cs.uiuc.edu  Sun Jul 18 14:56:30 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun, 18 Jul 2004 14:56:30 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/GlobalConstifier.cpp 
Message-ID: <200407181956.OAA00858@apoc.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/IPO:

GlobalConstifier.cpp updated: 1.3 -> 1.4

---
Log message:

Strip out and simplify some code.  This also fixes the regression last
night compiling cfrac.  It did not realize that code like this:

int G; int *H = &G;

takes the address of G.



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

Index: llvm/lib/Transforms/IPO/GlobalConstifier.cpp
diff -u llvm/lib/Transforms/IPO/GlobalConstifier.cpp:1.3 llvm/lib/Transforms/IPO/GlobalConstifier.cpp:1.4
--- llvm/lib/Transforms/IPO/GlobalConstifier.cpp:1.3	Sat Jul 17 19:25:57 2004
+++ llvm/lib/Transforms/IPO/GlobalConstifier.cpp	Sun Jul 18 14:56:20 2004
@@ -44,16 +44,9 @@
 ///
 static bool isStoredThrough(Value *V) {
   for (Value::use_iterator UI = V->use_begin(), E = V->use_end(); UI != E; ++UI)
-    if (Constant *C = dyn_cast(*UI)) {
-      if (ConstantExpr *CE = dyn_cast(C)) {
-        if (isStoredThrough(CE))
-          return true;
-      } else if (GlobalValue *GV = dyn_cast(C)) {
-        if (isStoredThrough(GV)) return true;
-      } else {
-        // Must be an element of a constant array or something.
+    if (ConstantExpr *CE = dyn_cast(*UI)) {
+      if (isStoredThrough(CE))
         return true;
-      }
     } else if (Instruction *I = dyn_cast(*UI)) {
       if (I->getOpcode() == Instruction::GetElementPtr) {
         if (isStoredThrough(I)) return true;




From llvm at cs.uiuc.edu  Sun Jul 18 15:15:22 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sun, 18 Jul 2004 15:15:22 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/
Message-ID: <200407182015.PAA31504@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System:


---
Log message:

Directory /var/cvs/llvm/llvm/lib/System added to the repository


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



From llvm at cs.uiuc.edu  Sun Jul 18 15:25:04 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sun, 18 Jul 2004 15:25:04 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/Cygwin/
Message-ID: <200407182025.PAA31767@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/Cygwin:


---
Log message:

Directory /var/cvs/llvm/llvm/lib/System/Cygwin added to the repository


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



From llvm at cs.uiuc.edu  Sun Jul 18 15:25:04 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sun, 18 Jul 2004 15:25:04 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/Darwin/
Message-ID: <200407182025.PAA31772@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/Darwin:


---
Log message:

Directory /var/cvs/llvm/llvm/lib/System/Darwin added to the repository


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



From llvm at cs.uiuc.edu  Sun Jul 18 15:25:04 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sun, 18 Jul 2004 15:25:04 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/SunOS/
Message-ID: <200407182025.PAA31782@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/SunOS:


---
Log message:

Directory /var/cvs/llvm/llvm/lib/System/SunOS added to the repository


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



From llvm at cs.uiuc.edu  Sun Jul 18 15:25:04 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sun, 18 Jul 2004 15:25:04 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/Linux/
Message-ID: <200407182025.PAA31777@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/Linux:


---
Log message:

Directory /var/cvs/llvm/llvm/lib/System/Linux added to the repository


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



From llvm at cs.uiuc.edu  Sun Jul 18 15:25:58 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sun, 18 Jul 2004 15:25:58 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/APR/
Message-ID: <200407182025.PAA31820@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/APR:


---
Log message:

Directory /var/cvs/llvm/llvm/lib/System/APR added to the repository


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



From lattner at cs.uiuc.edu  Sun Jul 18 16:18:13 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun, 18 Jul 2004 16:18:13 -0500
Subject: [llvm-commits] CVS: llvm-gcc/gcc/llvm-types.c 
Message-ID: <200407182118.QAA20820@apoc.cs.uiuc.edu>



Changes in directory llvm-gcc/gcc:

llvm-types.c updated: 1.10 -> 1.11

---
Log message:

robustify code and unbreak llvmgcc build on several targets


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

Index: llvm-gcc/gcc/llvm-types.c
diff -u llvm-gcc/gcc/llvm-types.c:1.10 llvm-gcc/gcc/llvm-types.c:1.11
--- llvm-gcc/gcc/llvm-types.c:1.10	Tue Jul  6 22:13:44 2004
+++ llvm-gcc/gcc/llvm-types.c	Sun Jul 18 16:18:03 2004
@@ -60,13 +60,7 @@
   case ArrayTyID: return llvm_type_get_size(Ty->Elements[0])*Ty->x.Array.Size;
   case StructTyID: return Ty->x.Struct.Size;
   case PointerTyID: /* Target dependant pointer size */
-    switch (ptr_mode) {
-    case SImode: case PSImode: return 4;
-    case DImode: case PDImode: return 8;
-    default:
-      assert(0 && "Unknown mode for pointer type!");
-    }
-    return (TREE_INT_CST_LOW(TYPE_SIZE(ptr_type_node))+7)/8;
+    return POINTER_SIZE/BITS_PER_UNIT;
   default: 
     fprintf(stderr, "ERROR: Type doesn't have size: ");
     llvm_type_dump(Ty);




From lattner at cs.uiuc.edu  Sun Jul 18 16:34:27 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun, 18 Jul 2004 16:34:27 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/Inliner.cpp 
Message-ID: <200407182134.QAA25881@apoc.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/IPO:

Inliner.cpp updated: 1.18 -> 1.19

---
Log message:

Fix a performance regression from the CPR patch, simplify code


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

Index: llvm/lib/Transforms/IPO/Inliner.cpp
diff -u llvm/lib/Transforms/IPO/Inliner.cpp:1.18 llvm/lib/Transforms/IPO/Inliner.cpp:1.19
--- llvm/lib/Transforms/IPO/Inliner.cpp:1.18	Sun Jul 18 01:56:58 2004
+++ llvm/lib/Transforms/IPO/Inliner.cpp	Sun Jul 18 16:34:16 2004
@@ -170,28 +170,20 @@
     CallGraphNode *CGN = I->second;
     Function *F = CGN ? CGN->getFunction() : 0;
 
-    // If the only remaining use of the function is a dead constant
-    // pointer ref, remove it.
-    if (F && F->hasOneUse())
-      if (Function *GV = dyn_cast(F->use_back()))
-        if (GV->removeDeadConstantUsers()) {
-          if (F->hasInternalLinkage()) {
-            // There *MAY* be an edge from the external call node to this
-            // function.  If so, remove it.
-            CallGraphNode *EN = CG.getExternalCallingNode();
-            CallGraphNode::iterator I = std::find(EN->begin(), EN->end(), CGN);
-            if (I != EN->end()) EN->removeCallEdgeTo(CGN);
-          }
-        }
+    // If the only remaining users of the function are dead constants,
+    // remove them.
+    if (F) F->removeDeadConstantUsers();
 
     if (F && (F->hasLinkOnceLinkage() || F->hasInternalLinkage()) &&
         F->use_empty()) {
+
       // Remove any call graph edges from the function to its callees.
       while (CGN->begin() != CGN->end())
         CGN->removeCallEdgeTo(*(CGN->end()-1));
       
       // If the function has external linkage (basically if it's a linkonce
-      // function) remove the edge from the external node to the callee node.
+      // function) remove the edge from the external node to the callee
+      // node.
       if (!F->hasInternalLinkage())
         CG.getExternalCallingNode()->removeCallEdgeTo(CGN);
       




From lattner at cs.uiuc.edu  Sun Jul 18 16:44:24 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun, 18 Jul 2004 16:44:24 -0500
Subject: [llvm-commits] CVS: llvm/docs/ProgrammersManual.html 
Message-ID: <200407182144.QAA01820@apoc.cs.uiuc.edu>



Changes in directory llvm/docs:

ProgrammersManual.html updated: 1.66 -> 1.67

---
Log message:

Doesn't exist


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

Index: llvm/docs/ProgrammersManual.html
diff -u llvm/docs/ProgrammersManual.html:1.66 llvm/docs/ProgrammersManual.html:1.67
--- llvm/docs/ProgrammersManual.html:1.66	Sun Jul 18 08:10:31 2004
+++ llvm/docs/ProgrammersManual.html	Sun Jul 18 16:44:13 2004
@@ -1662,8 +1662,6 @@
 
 
 
-  bool isConstantExpr(): Returns true if it is a
-ConstantExpr
      Important Subclasses of Constant
      
     
@@ -2046,7 +2044,7 @@
   Dinakar Dhurjati and
   Chris Lattner

   The LLVM Compiler Infrastructure

-  Last modified: $Date: 2004/07/18 13:10:31 $
+  Last modified: $Date: 2004/07/18 21:44:13 $
 
 
 




From lattner at cs.uiuc.edu  Sun Jul 18 16:56:34 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun, 18 Jul 2004 16:56:34 -0500
Subject: [llvm-commits] CVS: llvm/lib/Support/CommandLine.cpp 
Message-ID: <200407182156.QAA21016@apoc.cs.uiuc.edu>



Changes in directory llvm/lib/Support:

CommandLine.cpp updated: 1.45 -> 1.46

---
Log message:

Add a workaround for a GCC 3.3.2 bug


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

Index: llvm/lib/Support/CommandLine.cpp
diff -u llvm/lib/Support/CommandLine.cpp:1.45 llvm/lib/Support/CommandLine.cpp:1.46
--- llvm/lib/Support/CommandLine.cpp:1.45	Fri Jul  2 20:21:05 2004
+++ llvm/lib/Support/CommandLine.cpp	Sun Jul 18 16:56:20 2004
@@ -69,7 +69,12 @@
 // 
 static void RemoveArgument(const char *ArgName, Option *Opt) {
   if (CommandLineOptions == 0) return;
-  assert(getOption(ArgName) == Opt && "Arg not in map!");
+#ifndef NDEBUG
+  // This disgusting HACK is brought to you courtesy of GCC 3.3.2, which ICE's
+  // If we pass ArgName directly into getOption here.
+  std::string Tmp = ArgName;
+  assert(getOption(Tmp) == Opt && "Arg not in map!");
+#endif
   CommandLineOptions->erase(ArgName);
   if (CommandLineOptions->empty()) {
     delete CommandLineOptions;




From llvm at cs.uiuc.edu  Sun Jul 18 17:31:38 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sun, 18 Jul 2004 17:31:38 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/Makefile 
Message-ID: <200407182231.RAA03407@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System:

Makefile added (r1.1)

---
Log message:

Initiali Makefile for this library.


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

Index: llvm/lib/System/Makefile
diff -c /dev/null llvm/lib/System/Makefile:1.1
*** /dev/null	Sun Jul 18 17:31:38 2004
--- llvm/lib/System/Makefile	Sun Jul 18 17:31:28 2004
***************
*** 0 ****
--- 1,13 ----
+ ##===- lib/System/Makefile ---------------------------------*- Makefile -*-===##
+ # 
+ #                     The LLVM Compiler Infrastructure
+ #
+ # This file was developed by Reid Spencer and is distributed under the 
+ # University of Illinois Open Source License. See LICENSE.TXT for details.
+ # 
+ ##===----------------------------------------------------------------------===##
+ LEVEL = ../..
+ LIBRARYNAME = system
+ BUILD_ARCHIVE = 1
+ 
+ include $(LEVEL)/Makefile.common




From lattner at cs.uiuc.edu  Sun Jul 18 17:32:32 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun, 18 Jul 2004 17:32:32 -0500
Subject: [llvm-commits] CVS: llvm/docs/GettingStarted.html 
Message-ID: <200407182232.RAA21166@apoc.cs.uiuc.edu>



Changes in directory llvm/docs:

GettingStarted.html updated: 1.62 -> 1.63

---
Log message:

Add note about GCC 3.3.2 being completely broken


---
Diffs of the changes:  (+51 -15)

Index: llvm/docs/GettingStarted.html
diff -u llvm/docs/GettingStarted.html:1.62 llvm/docs/GettingStarted.html:1.63
--- llvm/docs/GettingStarted.html:1.62	Mon Jun 28 12:14:01 2004
+++ llvm/docs/GettingStarted.html	Sun Jul 18 17:32:22 2004
@@ -18,6 +18,7 @@
     
       Hardware
       
Software
+      
Broken versions of GCC
     
 
   Getting Started with LLVM
@@ -144,9 +145,10 @@
 
   
Build the LLVM Suite:
   
-      Set your LLVM_LIB_SEARCH_PATH environment variable.
-      
gmake -k |& tee gnumake.out
-         # this is csh or tcsh syntax
+      
Set your LLVM_LIB_SEARCH_PATH environment variable.
+      gmake -k |& tee gnumake.out
+         # this is csh or tcsh syntax
+      If you get an "internal compiler error (ICE)" see below.
   
 
 
@@ -255,7 +257,7 @@
 
 
   GCC 3.x with C and C++ language
-  support
+  support  (See below for specific version info)
 
   GNU Make
 
@@ -297,26 +299,56 @@
       
 
 
+
 
-The remainder of this guide is meant to get you up and running with
-LLVM and to give you some basic information about the LLVM environment.
-A complete guide to installation is provided in the
-next section.
+
+
+  Broken versions of GCC
+
 
-The later sections of this guide describe the general layout of the the LLVM source tree, a simple example using the LLVM tool chain, and links to find more information about LLVM or to get
-help via e-mail.
+
+
+LLVM is very demanding of the host C++ compiler, and as such tends to expose
+bugs in the compiler.  In particular, several versions of GCC crash when trying
+to compile LLVM.  We routinely use GCC 3.3.3 and GCC 3.4.0 and have had success
+with them.  Other versions of GCC will probably work as well.  GCC versions listed
+here are known to not work.  If you are using one of these versions, please try
+to upgrade your GCC to something more recent.  If you run into a problem with a
+version of GCC not listed here, please let
+us know.  Please use the "gcc -v" command to find out which version
+of GCC you are using.
+
+
+GCC versions prior to 3.0: GCC 2.96.x and before had several
+problems in the STL that effectively prevent it from compiling LLVM.
+
+
+GCC 3.3.2: This version of GCC suffered from a serious bug which causes it to crash in
+the "convert_from_eh_region_ranges_1" GCC function.
 
 
 
+
+
 
 
   Getting Started with LLVM
 
 
 
+
+
+The remainder of this guide is meant to get you up and running with
+LLVM and to give you some basic information about the LLVM environment.
+
+The later sections of this guide describe the general layout of the the LLVM source tree, a simple example using the LLVM tool chain, and links to find more information about LLVM or to get
+help via e-mail.
+
+
 
 
   Terminology and Notation
@@ -671,7 +703,11 @@
 
 gmake
 
-If you have multiple processors in your machine, you may wish to use some of
+
If the build fails, please check here to see if you
+are using a known broken version of GCC to compile LLVM with.
+
+
+If you have multiple processors in your machine, you may wish to use some of
 the parallel build options provided by GNU Make.  For example, you could use the
 command:
 
@@ -1231,7 +1267,7 @@
 
   Chris Lattner

   The LLVM Compiler Infrastructure

-  Last modified: $Date: 2004/06/28 17:14:01 $
+  Last modified: $Date: 2004/07/18 22:32:22 $
 
 
 




From llvm at cs.uiuc.edu  Sun Jul 18 17:33:18 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sun, 18 Jul 2004 17:33:18 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/README.txt 
Message-ID: <200407182233.RAA03473@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System:

README.txt added (r1.1)

---
Log message:

A description of what this library is about, reference to the documentation
and a list of don'ts for the library. All so future maintainers don't
break the important contract this library has with its user: LLVM.


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

Index: llvm/lib/System/README.txt
diff -c /dev/null llvm/lib/System/README.txt:1.1
*** /dev/null	Sun Jul 18 17:33:18 2004
--- llvm/lib/System/README.txt	Sun Jul 18 17:33:08 2004
***************
*** 0 ****
--- 1,23 ----
+ System Utilities Interface
+ ==========================
+ 
+ The design of this library has several key constraints aimed at shielding LLVM
+ from the vagaries of operating system differences. The goal here is to provide
+ interfaces to operating system concepts (files, memory maps, sockets, signals,
+ locking, etc) efficiently and in such a way that the remainder of LLVM is
+ completely operating system agnostic. 
+ 
+ PLEASE READ AND COMPREHEND FULLY THE DOCUMENTATION in 
+ 
+ llvm/docs/SystemLibrary.html 
+ 
+ before making changes to this library.
+ 
+ Briefly, the rules are:
+ 
+ 1. This library may not expose no system-specific header files (STL excepted).
+ 2. This library may not allocate memory (directly).
+ 3. This library may not throw exceptions.
+ 4. This library may not use virtual methods in its classes.
+ 5. This library may not expose system specific types, data or functions through 
+    its interface




From lattner at cs.uiuc.edu  Sun Jul 18 18:43:44 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun, 18 Jul 2004 18:43:44 -0500
Subject: [llvm-commits] CVS: llvm/tools/analyze/AnalysisWrappers.cpp 
Message-ID: <200407182343.SAA32171@apoc.cs.uiuc.edu>



Changes in directory llvm/tools/analyze:

AnalysisWrappers.cpp updated: 1.13 -> 1.14

---
Log message:

Remove this printer


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

Index: llvm/tools/analyze/AnalysisWrappers.cpp
diff -u llvm/tools/analyze/AnalysisWrappers.cpp:1.13 llvm/tools/analyze/AnalysisWrappers.cpp:1.14
--- llvm/tools/analyze/AnalysisWrappers.cpp:1.13	Sat Jul 17 19:44:14 2004
+++ llvm/tools/analyze/AnalysisWrappers.cpp	Sun Jul 18 18:43:34 2004
@@ -19,30 +19,11 @@
 
 #include "llvm/Module.h"
 #include "llvm/Pass.h"
-#include "llvm/Analysis/InstForest.h"
 #include "llvm/Support/CallSite.h"
 #include 
-
 using namespace llvm;
 
 namespace {
-  struct InstForestHelper : public FunctionPass {
-    Function *F;
-    virtual bool runOnFunction(Function &Func) { F = &Func; return false; }
-
-    void print(std::ostream &OS) const {
-      std::cout << InstForest(F);
-    }
-    
-    virtual void getAnalysisUsage(AnalysisUsage &AU) const {
-      AU.setPreservesAll();
-    }
-  };
-
-  RegisterAnalysis P1("instforest", "InstForest Printer");
-}
-
-namespace {
   /// ExternalFunctionsPassedConstants - This pass 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




From lattner at cs.uiuc.edu  Sun Jul 18 18:44:25 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun, 18 Jul 2004 18:44:25 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Analysis/InstForest.h 
Message-ID: <200407182344.SAA01058@apoc.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Analysis:

InstForest.h (r1.26) removed

---
Log message:

Remove dead file


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



From lattner at cs.uiuc.edu  Sun Jul 18 19:55:30 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun, 18 Jul 2004 19:55:30 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/GlobalValue.h 
Message-ID: <200407190055.TAA22263@apoc.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

GlobalValue.h updated: 1.17 -> 1.18

---
Log message:

Change method to return void.  Inline dtor


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

Index: llvm/include/llvm/GlobalValue.h
diff -u llvm/include/llvm/GlobalValue.h:1.17 llvm/include/llvm/GlobalValue.h:1.18
--- llvm/include/llvm/GlobalValue.h:1.17	Sat Jul 17 19:55:49 2004
+++ llvm/include/llvm/GlobalValue.h	Sun Jul 18 19:55:19 2004
@@ -42,7 +42,9 @@
   LinkageTypes Linkage;   // The linkage of this global
   Module *Parent;
 public:
-  virtual ~GlobalValue();
+  ~GlobalValue() {
+    removeDeadConstantUsers();   // remove any dead constants using this.
+  }
 
   /// If the usage is empty (except transitively dead constants), then this
   /// global value can can be safely deleted since the destructor will 
@@ -85,10 +87,10 @@
   /// that want to check to see if a global is unused, but don't want to deal
   /// with potentially dead constants hanging off of the globals.
   ///
-  /// This function returns true if the global value is now dead.  If all 
-  /// users of this global are not dead, this method may return false and
-  /// leave some of them around.
-  bool removeDeadConstantUsers();
+  /// This method tries to make the global dead.  If it detects a user that
+  /// would prevent it from becoming completely dead, it gives up early,
+  /// potentially leaving some dead constant users around.
+  void removeDeadConstantUsers();
 
   // Methods for support type inquiry through isa, cast, and dyn_cast:
   static inline bool classof(const GlobalValue *T) { return true; }




From lattner at cs.uiuc.edu  Sun Jul 18 19:55:45 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun, 18 Jul 2004 19:55:45 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Globals.cpp 
Message-ID: <200407190055.TAA22431@apoc.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

Globals.cpp updated: 1.2 -> 1.3

---
Log message:

Method now returns null, dtor is inlined


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

Index: llvm/lib/VMCore/Globals.cpp
diff -u llvm/lib/VMCore/Globals.cpp:1.2 llvm/lib/VMCore/Globals.cpp:1.3
--- llvm/lib/VMCore/Globals.cpp:1.2	Sun Jul 18 03:12:57 2004
+++ llvm/lib/VMCore/Globals.cpp	Sun Jul 18 19:55:35 2004
@@ -50,25 +50,15 @@
 /// This function returns true if the global value is now dead.  If all 
 /// users of this global are not dead, this method may return false and
 /// leave some of them around.
-bool GlobalValue::removeDeadConstantUsers() {
+void GlobalValue::removeDeadConstantUsers() {
   while(!use_empty()) {
     if (Constant* User = dyn_cast(use_back())) {
       if (!::removeDeadConstantUsers(User))
-        return false; // Constant wasn't dead
+        return; // Constant wasn't dead
     } else {
-      return false; // Non-constant usage;
+      return; // Non-constant usage;
     }
   }
-  return true;
-}
-
-/// This virtual destructor is responsible for deleting any transitively dead
-/// Constants that are using the GlobalValue.
-GlobalValue::~GlobalValue() {
-  // Its an error to attempt destruction with non-constant uses remaining.
-  bool okay_to_destruct = removeDeadConstantUsers();
-  assert(okay_to_destruct && 
-         "Can't destroy GlobalValue with non-constant uses.");
 }
 
 /// Override destroyConstant to make sure it doesn't get called on 




From lattner at cs.uiuc.edu  Sun Jul 18 19:57:50 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun, 18 Jul 2004 19:57:50 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Value.h 
Message-ID: <200407190057.TAA23191@apoc.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

Value.h updated: 1.59 -> 1.60

---
Log message:

Add new enum entries for ConstantAggregateZeroVal/ConstantExprVal and
rename ConstantVal to SimpleConstantVal


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

Index: llvm/include/llvm/Value.h
diff -u llvm/include/llvm/Value.h:1.59 llvm/include/llvm/Value.h:1.60
--- llvm/include/llvm/Value.h:1.59	Sat Jul 17 19:56:58 2004
+++ llvm/include/llvm/Value.h	Sun Jul 18 19:57:40 2004
@@ -122,13 +122,15 @@
   /// (and Instruction must be last).
   ///
   enum ValueTy {
-    ArgumentVal,            // This is an instance of Argument
-    BasicBlockVal,          // This is an instance of BasicBlock
-    FunctionVal,            // This is an instance of Function
-    GlobalVariableVal,      // This is an instance of GlobalVariable
-    ConstantVal,            // This is an instance of Constant
-    InstructionVal,         // This is an instance of Instruction
-    ValueListVal            // This is for bcreader, a special ValTy
+    ArgumentVal,              // This is an instance of Argument
+    BasicBlockVal,            // This is an instance of BasicBlock
+    FunctionVal,              // This is an instance of Function
+    GlobalVariableVal,        // This is an instance of GlobalVariable
+    ConstantExprVal,          // This is an instance of ConstantExpr
+    ConstantAggregateZeroVal, // This is an instance of ConstantAggregateNull
+    SimpleConstantVal,        // This is some other type of Constant
+    InstructionVal,           // This is an instance of Instruction
+    ValueListVal              // This is for bcreader, a special ValTy
   };
   unsigned getValueType() const {
     return SubclassID;
@@ -178,7 +180,9 @@
 // the subtype header files to test to see if the value is a subclass...
 //
 template <> inline bool isa_impl(const Value &Val) { 
-  return Val.getValueType() == Value::ConstantVal ||
+  return Val.getValueType() == Value::ConstantExprVal ||
+         Val.getValueType() == Value::SimpleConstantVal ||
+         Val.getValueType() == Value::ConstantAggregateZeroVal ||
          Val.getValueType() == Value::FunctionVal ||
 	 Val.getValueType() == Value::GlobalVariableVal;
 }




From lattner at cs.uiuc.edu  Sun Jul 18 19:58:12 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun, 18 Jul 2004 19:58:12 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Constant.h 
Message-ID: <200407190058.TAA23205@apoc.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

Constant.h updated: 1.14 -> 1.15

---
Log message:

eliminate isConstantExpr, changes to isa implementation


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

Index: llvm/include/llvm/Constant.h
diff -u llvm/include/llvm/Constant.h:1.14 llvm/include/llvm/Constant.h:1.15
--- llvm/include/llvm/Constant.h:1.14	Sat Jul 17 18:26:12 2004
+++ llvm/include/llvm/Constant.h	Sun Jul 18 19:58:02 2004
@@ -20,7 +20,7 @@
 
 class Constant : public User {
 protected:
-  inline Constant(const Type *Ty, ValueTy vty = Value::ConstantVal, 
+  inline Constant(const Type *Ty, ValueTy vty = Value::SimpleConstantVal, 
 	          const std::string& Name = "" ) 
   : User(Ty, vty, Name) {}
   ~Constant() {}
@@ -40,11 +40,6 @@
 
   virtual void print(std::ostream &O) const;
 
-  /// isConstantExpr - Return true if this is a ConstantExpr
-  ///
-  virtual bool isConstantExpr() const { return false; }
-
-
   /// destroyConstant - Called if some element of this constant is no longer
   /// valid.  At this point only other constants may be on the use_list for this
   /// constant.  Any constants on our Use list must also be destroy'd.  The
@@ -59,7 +54,9 @@
   static inline bool classof(const Constant *) { return true; }
   static inline bool classof(const GlobalValue *) { return true; }
   static inline bool classof(const Value *V) {
-    return V->getValueType() == Value::ConstantVal ||
+    return V->getValueType() == Value::SimpleConstantVal ||
+           V->getValueType() == Value::ConstantExprVal ||
+           V->getValueType() == Value::ConstantAggregateZeroVal ||
 	   V->getValueType() == Value::FunctionVal ||
 	   V->getValueType() == Value::GlobalVariableVal;
   }




From lattner at cs.uiuc.edu  Sun Jul 18 19:58:57 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun, 18 Jul 2004 19:58:57 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Constants.h 
Message-ID: <200407190058.TAA23221@apoc.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

Constants.h updated: 1.50 -> 1.51

---
Log message:

inline classof implementations, eliminate use of virtual methods.  
classof is now MUCH faster than it used to be.


---
Diffs of the changes:  (+33 -41)

Index: llvm/include/llvm/Constants.h
diff -u llvm/include/llvm/Constants.h:1.50 llvm/include/llvm/Constants.h:1.51
--- llvm/include/llvm/Constants.h:1.50	Sat Jul 17 18:26:57 2004
+++ llvm/include/llvm/Constants.h	Sun Jul 18 19:58:47 2004
@@ -16,6 +16,7 @@
 #define LLVM_CONSTANTS_H
 
 #include "llvm/Constant.h"
+#include "llvm/Type.h"
 #include "Support/DataTypes.h"
 
 namespace llvm {
@@ -77,9 +78,9 @@
 
   /// Methods for support type inquiry through isa, cast, and dyn_cast:
   static inline bool classof(const ConstantIntegral *) { return true; }
-  static bool classof(const Constant *CPV);  // defined in Constants.cpp
-  static inline bool classof(const Value *V) {
-    return isa(V) && classof(cast(V));
+  static bool classof(const Value *V) {
+    return V->getValueType() == SimpleConstantVal &&
+           V->getType()->isIntegral();
   }
 };
 
@@ -113,11 +114,8 @@
 
   /// Methods for support type inquiry through isa, cast, and dyn_cast:
   static inline bool classof(const ConstantBool *) { return true; }
-  static bool classof(const Constant *CPV) {
-    return (CPV == True) | (CPV == False);
-  }
-  static inline bool classof(const Value *V) {
-    return isa(V) && classof(cast(V));
+  static bool classof(const Value *V) {
+    return (V == True) | (V == False);
   }
 };
 
@@ -155,9 +153,9 @@
 
   /// Methods for support type inquiry through isa, cast, and dyn_cast:
   static inline bool classof(const ConstantInt *) { return true; }
-  static bool classof(const Constant *CPV);  // defined in Constants.cpp
-  static inline bool classof(const Value *V) {
-    return isa(V) && classof(cast(V));
+  static bool classof(const Value *V) {
+    return V->getValueType() == SimpleConstantVal &&
+           V->getType()->isInteger();
   }
 };
 
@@ -209,9 +207,9 @@
   /// Methods for support type inquiry through isa, cast, and dyn_cast:
   ///
   static inline bool classof(const ConstantSInt *) { return true; }
-  static bool classof(const Constant *CPV);  // defined in Constants.cpp
-  static inline bool classof(const Value *V) {
-    return isa(V) && classof(cast(V));
+  static bool classof(const Value *V) {
+    return V->getValueType() == SimpleConstantVal &&
+           V->getType()->isSigned();
   }
 };
 
@@ -245,9 +243,9 @@
 
   /// Methods for support type inquiry through isa, cast, and dyn_cast:
   static inline bool classof(const ConstantUInt *) { return true; }
-  static bool classof(const Constant *CPV);  // defined in Constants.cpp
-  static inline bool classof(const Value *V) {
-    return isa(V) && classof(cast(V));
+  static bool classof(const Value *V) {
+    return V->getValueType() == SimpleConstantVal &&
+           V->getType()->isUnsigned();
   }
 };
 
@@ -302,9 +300,9 @@
 
   /// Methods for support type inquiry through isa, cast, and dyn_cast:
   static inline bool classof(const ConstantFP *) { return true; }
-  static bool classof(const Constant *CPV);  // defined in Constants.cpp
-  static inline bool classof(const Value *V) {
-    return isa(V) && classof(cast(V));
+  static bool classof(const Value *V) {
+    return V->getValueType() == SimpleConstantVal &&
+           V->getType()->isFloatingPoint();
   }
 };
 
@@ -315,7 +313,8 @@
   friend struct ConstantCreator;
   ConstantAggregateZero(const ConstantAggregateZero &);      // DO NOT IMPLEMENT
 protected:
-  ConstantAggregateZero(const Type *Ty) : Constant(Ty) {}
+  ConstantAggregateZero(const Type *Ty)
+    : Constant(Ty, ConstantAggregateZeroVal) {}
 public:
   /// get() - static factory method for creating a null aggregate.  It is
   /// illegal to call this method with a non-aggregate type.
@@ -331,10 +330,9 @@
 
   /// Methods for support type inquiry through isa, cast, and dyn_cast:
   ///
-  static inline bool classof(const ConstantAggregateZero *) { return true; }
-  static bool classof(const Constant *CPV);
-  static inline bool classof(const Value *V) {
-    return isa(V) && classof(cast(V));
+  static bool classof(const ConstantAggregateZero *) { return true; }
+  static bool classof(const Value *V) {
+    return V->getValueType() == ConstantAggregateZeroVal;
   }
 };
 
@@ -384,9 +382,9 @@
 
   /// Methods for support type inquiry through isa, cast, and dyn_cast:
   static inline bool classof(const ConstantArray *) { return true; }
-  static bool classof(const Constant *CPV);  // defined in Constants.cpp
-  static inline bool classof(const Value *V) {
-    return isa(V) && classof(cast(V));
+  static bool classof(const Value *V) {
+    return V->getValueType() == SimpleConstantVal &&
+           V->getType()->getTypeID() == Type::ArrayTyID;
   }
 };
 
@@ -429,9 +427,9 @@
   
   /// Methods for support type inquiry through isa, cast, and dyn_cast:
   static inline bool classof(const ConstantStruct *) { return true; }
-  static bool classof(const Constant *CPV);  // defined in Constants.cpp
-  static inline bool classof(const Value *V) {
-    return isa(V) && classof(cast(V));
+  static bool classof(const Value *V) {
+    return V->getValueType() == SimpleConstantVal &&
+           V->getType()->getTypeID() == Type::StructTyID;
   }
 };
 
@@ -458,9 +456,9 @@
 
   /// Methods for support type inquiry through isa, cast, and dyn_cast:
   static inline bool classof(const ConstantPointerNull *) { return true; }
-  static bool classof(const Constant *CPV);
-  static inline bool classof(const Value *V) {
-    return isa(V) && classof(cast(V));
+  static bool classof(const Value *V) {
+    return V->getValueType() == SimpleConstantVal &&
+           isa(V->getType());
   }
 };
 
@@ -565,9 +563,6 @@
   /// getOpcodeName - Return a string representation for an opcode.
   const char *getOpcodeName() const;
   
-  /// isConstantExpr - Return true if this is a ConstantExpr
-  virtual bool isConstantExpr() const { return true; }
-
   virtual void destroyConstant();
   virtual void replaceUsesOfWithOnConstant(Value *From, Value *To,
                                            bool DisableChecking = false);
@@ -583,11 +578,8 @@
 
   /// Methods for support type inquiry through isa, cast, and dyn_cast:
   static inline bool classof(const ConstantExpr *) { return true; }
-  static inline bool classof(const Constant *CPV) {
-    return CPV->isConstantExpr();
-  }
   static inline bool classof(const Value *V) {
-    return isa(V) && classof(cast(V));
+    return V->getValueType() == ConstantExprVal;
   }
 };
 




From lattner at cs.uiuc.edu  Sun Jul 18 19:59:21 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun, 18 Jul 2004 19:59:21 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Constants.cpp 
Message-ID: <200407190059.TAA23258@apoc.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

Constants.cpp updated: 1.95 -> 1.96

---
Log message:

classof implementations are now inlined


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

Index: llvm/lib/VMCore/Constants.cpp
diff -u llvm/lib/VMCore/Constants.cpp:1.95 llvm/lib/VMCore/Constants.cpp:1.96
--- llvm/lib/VMCore/Constants.cpp:1.95	Sat Jul 17 18:48:33 2004
+++ llvm/lib/VMCore/Constants.cpp	Sun Jul 18 19:59:10 2004
@@ -269,14 +269,14 @@
 }
 
 ConstantExpr::ConstantExpr(unsigned Opcode, Constant *C, const Type *Ty)
-  : Constant(Ty), iType(Opcode) {
+  : Constant(Ty, ConstantExprVal), iType(Opcode) {
   Operands.reserve(1);
   Operands.push_back(Use(C, this));
 }
 
 // Select instruction creation ctor
 ConstantExpr::ConstantExpr(Constant *C, Constant *V1, Constant *V2)
-  : Constant(V1->getType()), iType(Instruction::Select) {
+  : Constant(V1->getType(), ConstantExprVal), iType(Instruction::Select) {
   Operands.reserve(3);
   Operands.push_back(Use(C, this));
   Operands.push_back(Use(V1, this));
@@ -291,7 +291,8 @@
 }
 
 ConstantExpr::ConstantExpr(unsigned Opcode, Constant *C1, Constant *C2)
-  : Constant(isSetCC(Opcode) ? Type::BoolTy : C1->getType()), iType(Opcode) {
+  : Constant(isSetCC(Opcode) ? Type::BoolTy : C1->getType(), ConstantExprVal),
+    iType(Opcode) {
   Operands.reserve(2);
   Operands.push_back(Use(C1, this));
   Operands.push_back(Use(C2, this));
@@ -299,7 +300,7 @@
 
 ConstantExpr::ConstantExpr(Constant *C, const std::vector &IdxList,
                            const Type *DestTy)
-  : Constant(DestTy), iType(Instruction::GetElementPtr) {
+  : Constant(DestTy, ConstantExprVal), iType(Instruction::GetElementPtr) {
   Operands.reserve(1+IdxList.size());
   Operands.push_back(Use(C, this));
   for (unsigned i = 0, E = IdxList.size(); i != E; ++i)
@@ -383,44 +384,6 @@
 
 
 //===----------------------------------------------------------------------===//
-//                           classof implementations
-
-bool ConstantIntegral::classof(const Constant *CPV) {
-  return CPV->getType()->isIntegral() && !isa(CPV);
-}
-
-bool ConstantInt::classof(const Constant *CPV) {
-  return CPV->getType()->isInteger() && !isa(CPV);
-}
-bool ConstantSInt::classof(const Constant *CPV) {
-  return CPV->getType()->isSigned() && !isa(CPV);
-}
-bool ConstantUInt::classof(const Constant *CPV) {
-  return CPV->getType()->isUnsigned() && !isa(CPV);
-}
-bool ConstantFP::classof(const Constant *CPV) {
-  const Type *Ty = CPV->getType();
-  return ((Ty == Type::FloatTy || Ty == Type::DoubleTy) &&
-          !isa(CPV));
-}
-bool ConstantAggregateZero::classof(const Constant *CPV) {
-  return (isa(CPV->getType()) || isa(CPV->getType())) &&
-         CPV->isNullValue();
-}
-bool ConstantArray::classof(const Constant *CPV) {
-  return isa(CPV->getType()) && !CPV->isNullValue();
-}
-bool ConstantStruct::classof(const Constant *CPV) {
-  return isa(CPV->getType()) && !CPV->isNullValue();
-}
-
-bool ConstantPointerNull::classof(const Constant *CPV) {
-  return !isa(CPV) && isa(CPV->getType()) && !isa(CPV) &&
-         CPV->getNumOperands() == 0;
-}
-
-
-//===----------------------------------------------------------------------===//
 //                      isValueValidForType implementations
 
 bool ConstantSInt::isValueValidForType(const Type *Ty, int64_t Val) {




From lattner at cs.uiuc.edu  Sun Jul 18 21:16:06 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun, 18 Jul 2004 21:16:06 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/LiveIntervals.cpp 
Message-ID: <200407190216.VAA30500@apoc.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

LiveIntervals.cpp updated: 1.89 -> 1.90

---
Log message:

remove the mbbi2mbbMap_, which was just keeping track of mbb order anyway.

Heavily refactor handleVirtualRegisterDef, adding comments and making it more
efficient.  It is also much easier to follow and convince ones self that it is
correct :)

Add -debug output to the joine, showing the result of joining the intervals.



---
Diffs of the changes:  (+72 -53)

Index: llvm/lib/CodeGen/LiveIntervals.cpp
diff -u llvm/lib/CodeGen/LiveIntervals.cpp:1.89 llvm/lib/CodeGen/LiveIntervals.cpp:1.90
--- llvm/lib/CodeGen/LiveIntervals.cpp:1.89	Sat Jul 17 16:51:25 2004
+++ llvm/lib/CodeGen/LiveIntervals.cpp	Sun Jul 18 21:15:56 2004
@@ -60,6 +60,7 @@
     EnableJoining("join-liveintervals",
                   cl::desc("Join compatible live intervals"),
                   cl::init(true));
+
     cl::opt
     EnableVirtVirtJoining("join-liveintervals-virtvirtjoining",
                       cl::desc("Join live intervals for virtreg pairs (buggy)"),
@@ -79,7 +80,6 @@
 
 void LiveIntervals::releaseMemory()
 {
-    mbbi2mbbMap_.clear();
     mi2iMap_.clear();
     i2miMap_.clear();
     r2iMap_.clear();
@@ -99,20 +99,14 @@
     // number MachineInstrs
     unsigned miIndex = 0;
     for (MachineFunction::iterator mbb = mf_->begin(), mbbEnd = mf_->end();
-         mbb != mbbEnd; ++mbb) {
-        unsigned mbbIdx = mbb->getNumber();
-        bool inserted = mbbi2mbbMap_.insert(std::make_pair(mbbIdx,
-                                                           mbb)).second;
-        assert(inserted && "multiple index -> MachineBasicBlock");
-
+         mbb != mbbEnd; ++mbb)
         for (MachineBasicBlock::iterator mi = mbb->begin(), miEnd = mbb->end();
              mi != miEnd; ++mi) {
-            inserted = mi2iMap_.insert(std::make_pair(mi, miIndex)).second;
+            bool inserted = mi2iMap_.insert(std::make_pair(mi, miIndex)).second;
             assert(inserted && "multiple MachineInstr -> index mappings");
             i2miMap_.push_back(mi);
             miIndex += InstrSlots::NUM;
         }
-    }
 
     computeIntervals();
 
@@ -120,6 +114,7 @@
 
     // join intervals if requested
     if (EnableJoining) joinIntervals();
+    //DEBUG(mf_->viewCFG());
 
     numIntervalsAfter += intervals_.size();
 
@@ -290,50 +285,74 @@
     DEBUG(std::cerr << "\t\tregister: "; printRegName(interval.reg));
     LiveVariables::VarInfo& vi = lv_->getVarInfo(interval.reg);
 
-    // Iterate over all of the blocks that the variable is completely
-    // live in, adding [insrtIndex(begin), instrIndex(end)+4) to the
-    // live interval. Obviously we only need to do this once.
+    // Virtual registers may be defined multiple times (due to phi 
+    // elimination).  Much of what we do only has to be done once for the vreg.
+    // We use an empty interval to detect the first time we see a vreg.
     if (interval.empty()) {
-        for (unsigned i = 0, e = vi.AliveBlocks.size(); i != e; ++i) {
-            if (vi.AliveBlocks[i]) {
-                MachineBasicBlock* mbb = mf_->getBlockNumbered(i);
-                if (!mbb->empty()) {
-                    interval.addRange(
-                        getInstructionIndex(&mbb->front()),
-                        getInstructionIndex(&mbb->back()) + InstrSlots::NUM);
-                }
-            }
-        }
-    }
 
-    unsigned baseIndex = getInstructionIndex(mi);
+       // Get the Idx of the defining instructions.
+       unsigned defIndex = getDefIndex(getInstructionIndex(mi));
 
-    bool killedInDefiningBasicBlock = false;
-    for (int i = 0, e = vi.Kills.size(); i != e; ++i) {
-        MachineBasicBlock* killerBlock = vi.Kills[i].first;
-        MachineInstr* killerInstr = vi.Kills[i].second;
-        unsigned start = (mbb == killerBlock ?
-                          getDefIndex(baseIndex) :
-                          getInstructionIndex(&killerBlock->front()));
-        unsigned end = (killerInstr == mi ?
-                         // dead
-                        start + 1 :
-                        // killed
-                        getUseIndex(getInstructionIndex(killerInstr))+1);
-        // we do not want to add invalid ranges. these can happen when
-        // a variable has its latest use and is redefined later on in
-        // the same basic block (common with variables introduced by
-        // PHI elimination)
-        if (start < end) {
-            killedInDefiningBasicBlock |= mbb == killerBlock;
-            interval.addRange(start, end);
-        }
+       // Loop over all of the blocks that the vreg is defined in.  There are
+       // two cases we have to handle here.  The most common case is a vreg
+       // whose lifetime is contained within a basic block.  In this case there
+       // will be a single kill, in MBB, which comes after the definition.
+       if (vi.Kills.size() == 1 && vi.Kills[0].first == mbb) {
+           // FIXME: what about dead vars?
+           unsigned killIdx;
+           if (vi.Kills[0].second != mi)
+               killIdx = getUseIndex(getInstructionIndex(vi.Kills[0].second))+1;
+           else
+               killIdx = defIndex+1;
+
+           // If the kill happens after the definition, we have an intra-block
+           // live range.
+           if (killIdx > defIndex) {
+              assert(vi.AliveBlocks.empty() && 
+                     "Shouldn't be alive across any blocks!");
+              interval.addRange(defIndex, killIdx);
+              return;
+           }
+       }
+
+       // The other case we handle is when a virtual register lives to the end
+       // of the defining block, potentially live across some blocks, then is
+       // live into some number of blocks, but gets killed.  Start by adding a
+       // range that goes from this definition to the end of the defining block.
+       interval.addRange(defIndex, 
+                         getInstructionIndex(&mbb->back()) + InstrSlots::NUM);
+
+       // Iterate over all of the blocks that the variable is completely
+       // live in, adding [insrtIndex(begin), instrIndex(end)+4) to the
+       // live interval.
+       for (unsigned i = 0, e = vi.AliveBlocks.size(); i != e; ++i) {
+           if (vi.AliveBlocks[i]) {
+               MachineBasicBlock* mbb = mf_->getBlockNumbered(i);
+               if (!mbb->empty()) {
+                   interval.addRange(
+                       getInstructionIndex(&mbb->front()),
+                       getInstructionIndex(&mbb->back()) + InstrSlots::NUM);
+               }
+           }
+       }
+
+       // Finally, this virtual register is live from the start of any killing
+       // block to the 'use' slot of the killing instruction.
+       for (unsigned i = 0, e = vi.Kills.size(); i != e; ++i) {
+           std::pair &Kill = vi.Kills[i];
+           interval.addRange(getInstructionIndex(Kill.first->begin()),
+                             getUseIndex(getInstructionIndex(Kill.second))+1);
+       }
+
+    } else {
+       // If this is the second time we see a virtual register definition, it
+       // must be due to phi elimination.  In this case, the defined value will
+       // be live until the end of the basic block it is defined in.
+       unsigned defIndex = getDefIndex(getInstructionIndex(mi));
+       interval.addRange(defIndex, 
+                         getInstructionIndex(&mbb->back()) + InstrSlots::NUM);
     }
 
-    if (!killedInDefiningBasicBlock) {
-        unsigned end = getInstructionIndex(&mbb->back()) + InstrSlots::NUM;
-        interval.addRange(getDefIndex(baseIndex), end);
-    }
     DEBUG(std::cerr << '\n');
 }
 
@@ -426,10 +445,9 @@
     DEBUG(std::cerr << "********** Function: "
           << ((Value*)mf_->getFunction())->getName() << '\n');
 
-    for (MbbIndex2MbbMap::iterator
-             it = mbbi2mbbMap_.begin(), itEnd = mbbi2mbbMap_.end();
-         it != itEnd; ++it) {
-        MachineBasicBlock* mbb = it->second;
+    for (MachineFunction::iterator I = mf_->begin(), E = mf_->end(); 
+         I != E; ++I) {
+        MachineBasicBlock* mbb = I;
         DEBUG(std::cerr << ((Value*)mbb->getBasicBlock())->getName() << ":\n");
 
         for (MachineBasicBlock::iterator mi = mbb->begin(), miEnd = mbb->end();
@@ -688,7 +706,7 @@
 
 void LiveInterval::join(const LiveInterval& other)
 {
-    DEBUG(std::cerr << "\t\tjoining " << *this << " with " << other << '\n');
+    DEBUG(std::cerr << "\t\tjoining " << *this << " with " << other);
     Ranges::iterator cur = ranges.begin();
 
     for (Ranges::const_iterator i = other.ranges.begin(),
@@ -699,6 +717,7 @@
     }
     weight += other.weight;
     ++numJoins;
+    DEBUG(std::cerr << ".  Result = " << *this << "\n");
 }
 
 LiveInterval::Ranges::iterator LiveInterval::




From lattner at cs.uiuc.edu  Sun Jul 18 21:16:09 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun, 18 Jul 2004 21:16:09 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/LiveIntervals.h 
Message-ID: <200407190216.VAA30505@apoc.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

LiveIntervals.h updated: 1.27 -> 1.28

---
Log message:

fill comment to 80 cols

remove map that is not needed



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

Index: llvm/lib/CodeGen/LiveIntervals.h
diff -u llvm/lib/CodeGen/LiveIntervals.h:1.27 llvm/lib/CodeGen/LiveIntervals.h:1.28
--- llvm/lib/CodeGen/LiveIntervals.h:1.27	Mon Jun 21 08:10:56 2004
+++ llvm/lib/CodeGen/LiveIntervals.h	Sun Jul 18 21:13:59 2004
@@ -7,14 +7,13 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// This file implements the LiveInterval analysis pass.  Given some
-// numbering of each the machine instructions (in this implemention
-// depth-first order) an interval [i, j) is said to be a live interval
-// for register v if there is no instruction with number j' > j such
-// that v is live at j' abd there is no instruction with number i' < i
-// such that v is live at i'. In this implementation intervals can
-// have holes, i.e. an interval might look like [1,20), [50,65),
-// [1000,1001)
+// This file implements the LiveInterval analysis pass.  Given some numbering of
+// each the machine instructions (in this implemention depth-first order) an
+// interval [i, j) is said to be a live interval for register v if there is no
+// instruction with number j' > j such that v is live at j' abd there is no
+// instruction with number i' < i such that v is live at i'. In this
+// implementation intervals can have holes, i.e. an interval might look like
+// [1,20), [50,65), [1000,1001).
 //
 //===----------------------------------------------------------------------===//
 
@@ -94,9 +93,6 @@
         MachineBasicBlock::iterator currentInstr_;
         LiveVariables* lv_;
 
-        typedef std::map MbbIndex2MbbMap;
-        MbbIndex2MbbMap mbbi2mbbMap_;
-
         typedef std::map Mi2IndexMap;
         Mi2IndexMap mi2iMap_;
 




From lattner at cs.uiuc.edu  Sun Jul 18 23:47:46 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun, 18 Jul 2004 23:47:46 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/RegAllocLinearScan.cpp 
Message-ID: <200407190447.XAA02205@apoc.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

RegAllocLinearScan.cpp updated: 1.77 -> 1.78

---
Log message:

Add some asserts that the list of intervals returned by addIntervalsForSpills
is sorted.  This is not the case currently, which is causing no end of
problems.


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

Index: llvm/lib/CodeGen/RegAllocLinearScan.cpp
diff -u llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.77 llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.78
--- llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.77	Sun Jul  4 12:23:35 2004
+++ llvm/lib/CodeGen/RegAllocLinearScan.cpp	Sun Jul 18 23:47:36 2004
@@ -386,18 +386,42 @@
         int slot = vrm_->assignVirt2StackSlot(cur->reg);
         std::vector added =
             li_->addIntervalsForSpills(*cur, *vrm_, slot);
-
-        // merge added with unhandled
+        if (added.empty())
+          return;  // Early exit if all spills were folded.
+#ifndef NDEBUG
+        int OldStart = -1;
+#endif
+
+        // Merge added with unhandled.  Note that we know that 
+        // addIntervalsForSpills returns intervals sorted by their starting
+        // point.
         std::vector::iterator addedIt = added.begin();
         std::vector::iterator addedItEnd = added.end();
-        for (IntervalPtrs::iterator i = unhandled_.begin(), e = unhandled_.end();
+        for (IntervalPtrs::iterator i = unhandled_.begin(), e =unhandled_.end();
              i != e && addedIt != addedItEnd; ++i) {
-            if ((*i)->start() > (*addedIt)->start())
+            while ((*i)->start() > (*addedIt)->start() && 
+                   addedIt != addedItEnd) {
+#ifndef NDEBUG
+                // This code only works if addIntervalsForSpills retursn a
+                // sorted interval list.  Assert this is the case now.
+                assert(OldStart <= (int)(*addedIt)->start() && 
+                   "addIntervalsForSpills didn't return sorted interval list!");
+                OldStart = (*addedIt)->start();
+#endif
                 i = unhandled_.insert(i, *(addedIt++));
+            }
         }
-        while (addedIt != addedItEnd)
-            unhandled_.push_back(*(addedIt++));
 
+        while (addedIt != addedItEnd) {
+#ifndef NDEBUG
+                // This code only works if addIntervalsForSpills retursn a
+                // sorted interval list.  Assert this is the case now.
+                assert(OldStart <= (int)(*addedIt)->start() && 
+                   "addIntervalsForSpills didn't return sorted interval list!");
+                OldStart = (*addedIt)->start();
+#endif
+            unhandled_.push_back(*(addedIt++));
+        }
         return;
     }
 





