Menu
▾
▴
[rvm-commits] jikesrvm: WIP on RVM-773 : Removed patches no longer used.
|
From: <jik...@li...> - 2012-07-03 20:23:52
|
details: http://jikesrvm.hg.sourceforge.net/hgweb/jikesrvm/jikesrvm/rev/8f5f73adc75c changeset: 10463:8f5f73adc75c user: Andreas Sewe <se...@st...> date: Mon Jun 11 18:43:56 2012 +0800 description: WIP on RVM-773 : Removed patches no longer used. diffstat: build/components/patches/classpath-cvs.RVM-443.patch | 541 ---------------- build/components/patches/classpath-cvs.RVM-644.patch | 67 - build/components/patches/classpath-cvs.RVM-732.patch | 12 - build/components/patches/classpath-cvs.RVM-881.patch | 10 - build/components/patches/classpath-cvs.RVM-889-01.patch | 60 - build/components/patches/classpath-cvs.RVM-889-02.patch | 19 - 6 files changed, 0 insertions(+), 709 deletions(-) diffs (truncated from 744 to 300 lines): diff -r 53774f750842 -r 8f5f73adc75c build/components/patches/classpath-cvs.RVM-443.patch --- a/build/components/patches/classpath-cvs.RVM-443.patch Tue Jul 03 19:26:45 2012 +1000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,547 +0,0 @@ -Index: java/lang/reflect/Constructor.java -=================================================================== -RCS file: /sources/classpath/classpath/java/lang/reflect/Constructor.java,v -retrieving revision 1.10 -diff -u -r1.10 Constructor.java ---- java/lang/reflect/Constructor.java 23 Jun 2008 20:59:35 -0000 1.10 -+++ java/lang/reflect/Constructor.java 18 Aug 2008 17:14:28 -0000 -@@ -95,7 +95,6 @@ - Constructor(VMConstructor cons) - { - this.cons = cons; -- cons.cons = this; - } - - private Constructor() -@@ -316,7 +315,7 @@ - { - // Inescapable as the VM layer is 1.4 based. - @SuppressWarnings("unchecked") -- T ins = (T) cons.construct(args); -+ T ins = (T) cons.construct(args, this); - return ins; - } - -Index: java/lang/reflect/Field.java -=================================================================== -RCS file: /sources/classpath/classpath/java/lang/reflect/Field.java,v -retrieving revision 1.10 -diff -u -r1.10 Field.java ---- java/lang/reflect/Field.java 23 Jun 2008 20:59:35 -0000 1.10 -+++ java/lang/reflect/Field.java 18 Aug 2008 17:14:28 -0000 -@@ -96,7 +96,6 @@ - Field(VMField f) - { - this.f = f; -- f.f = this; - } - - /** -@@ -257,7 +256,7 @@ - public Object get(Object o) - throws IllegalAccessException - { -- return f.get(o); -+ return f.get(this, o); - } - - /** -@@ -280,7 +279,7 @@ - public boolean getBoolean(Object o) - throws IllegalAccessException - { -- return f.getBoolean(o); -+ return f.getBoolean(this, o); - } - - /** -@@ -303,7 +302,7 @@ - public byte getByte(Object o) - throws IllegalAccessException - { -- return f.getByte(o); -+ return f.getByte(this, o); - } - - /** -@@ -324,7 +323,7 @@ - public char getChar(Object o) - throws IllegalAccessException - { -- return f.getChar(o); -+ return f.getChar(this, o); - } - - /** -@@ -347,7 +346,7 @@ - public short getShort(Object o) - throws IllegalAccessException - { -- return f.getShort(o); -+ return f.getShort(this, o); - } - - /** -@@ -370,7 +369,7 @@ - public int getInt(Object o) - throws IllegalAccessException - { -- return f.getInt(o); -+ return f.getInt(this, o); - } - - /** -@@ -393,7 +392,7 @@ - public long getLong(Object o) - throws IllegalAccessException - { -- return f.getLong(o); -+ return f.getLong(this, o); - } - - /** -@@ -416,7 +415,7 @@ - public float getFloat(Object o) - throws IllegalAccessException - { -- return f.getFloat(o); -+ return f.getFloat(this, o); - } - - /** -@@ -440,7 +439,7 @@ - public double getDouble(Object o) - throws IllegalAccessException - { -- return f.getDouble(o); -+ return f.getDouble(this, o); - } - - /** -@@ -491,7 +490,7 @@ - public void set(Object o, Object value) - throws IllegalAccessException - { -- f.set(o, value); -+ f.set(this, o, value); - } - - /** -@@ -514,7 +513,7 @@ - public void setBoolean(Object o, boolean value) - throws IllegalAccessException - { -- f.setBoolean(o, value); -+ f.setBoolean(this, o, value); - } - - /** -@@ -537,7 +536,7 @@ - public void setByte(Object o, byte value) - throws IllegalAccessException - { -- f.setByte(o, value); -+ f.setByte(this, o, value); - } - - /** -@@ -560,7 +559,7 @@ - public void setChar(Object o, char value) - throws IllegalAccessException - { -- f.setChar(o, value); -+ f.setChar(this, o, value); - } - - /** -@@ -583,7 +582,7 @@ - public void setShort(Object o, short value) - throws IllegalAccessException - { -- f.setShort(o, value); -+ f.setShort(this, o, value); - } - - /** -@@ -606,7 +605,7 @@ - public void setInt(Object o, int value) - throws IllegalAccessException - { -- f.setInt(o, value); -+ f.setInt(this, o, value); - } - - /** -@@ -629,7 +628,7 @@ - public void setLong(Object o, long value) - throws IllegalAccessException - { -- f.setLong(o, value); -+ f.setLong(this, o, value); - } - - /** -@@ -652,7 +651,7 @@ - public void setFloat(Object o, float value) - throws IllegalAccessException - { -- f.setFloat(o, value); -+ f.setFloat(this, o, value); - } - - /** -@@ -675,7 +674,7 @@ - public void setDouble(Object o, double value) - throws IllegalAccessException - { -- f.setDouble(o, value); -+ f.setDouble(this, o, value); - } - - /** -Index: java/lang/reflect/Method.java -=================================================================== -RCS file: /sources/classpath/classpath/java/lang/reflect/Method.java,v -retrieving revision 1.9 -diff -u -r1.9 Method.java ---- java/lang/reflect/Method.java 23 Jun 2008 20:59:35 -0000 1.9 -+++ java/lang/reflect/Method.java 18 Aug 2008 17:14:28 -0000 -@@ -96,7 +96,6 @@ - Method(VMMethod m) - { - this.m = m; -- m.m = this; - } - - /** -@@ -324,7 +323,7 @@ - public Object invoke(Object o, Object... args) - throws IllegalAccessException, InvocationTargetException - { -- return m.invoke(o, args); -+ return m.invoke(o, args, this); - } - - /** -Index: vm/reference/java/lang/reflect/VMConstructor.java -=================================================================== -RCS file: /sources/classpath/classpath/vm/reference/java/lang/reflect/VMConstructor.java,v -retrieving revision 1.4 -diff -u -r1.4 VMConstructor.java ---- vm/reference/java/lang/reflect/VMConstructor.java 6 Mar 2008 20:22:19 -0000 1.4 -+++ vm/reference/java/lang/reflect/VMConstructor.java 18 Aug 2008 17:14:41 -0000 -@@ -47,12 +47,6 @@ - Class clazz; - int slot; - -- /** -- * This field allows us to refer back to the main constructor instance. -- * It is set by the constructor of Constructor. -- */ -- Constructor cons; -- - VMConstructor(Class clazz, int slot) - { - this.clazz = clazz; -@@ -88,7 +82,7 @@ - */ - native Class[] getExceptionTypes(); - -- native Object construct(Object[] args) -+ native Object construct(Object[] args, Constructor cons) - throws InstantiationException, IllegalAccessException, - InvocationTargetException; - -Index: vm/reference/java/lang/reflect/VMField.java -=================================================================== -RCS file: /sources/classpath/classpath/vm/reference/java/lang/reflect/VMField.java,v -retrieving revision 1.5 -diff -u -r1.5 VMField.java ---- vm/reference/java/lang/reflect/VMField.java 16 Mar 2008 20:03:53 -0000 1.5 -+++ vm/reference/java/lang/reflect/VMField.java 18 Aug 2008 17:14:42 -0000 -@@ -46,12 +46,6 @@ - String name; - int slot; - -- /** -- * This field allows us to refer back to the main constructor instance. -- * It is set by the constructor of Field. -- */ -- Field f; -- - VMField(Class clazz, String name, int slot) - { - this.clazz = clazz; -@@ -112,16 +106,16 @@ - * requires an instance - * @throws ExceptionInInitializerError if accessing a static field triggered - * class initialization, which then failed -- * @see #getBoolean(Object) -- * @see #getByte(Object) -- * @see #getChar(Object) -- * @see #getShort(Object) -- * @see #getInt(Object) -- * @see #getLong(Object) -- * @see #getFloat(Object) -- * @see #getDouble(Object) -+ * @see #getBoolean(Field f, Object) -+ * @see #getByte(Field f, Object) -+ * @see #getChar(Field f, Object) -+ * @see #getShort(Field f, Object) -+ * @see #getInt(Field f, Object) -+ * @see #getLong(Field f, Object) -+ * @see #getFloat(Field f, Object) -+ * @see #getDouble(Field f, Object) - */ -- native Object get(Object o) |