[gwt-contrib] [google-web-toolkit commit] r5268 - Don't read stack frames from the input, since they aren't required and are incorrect

[codesite-noreply]

Author: j...@google.com
Date: Tue Apr 21 16:30:56 2009
New Revision: 5268

Modified:
     
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/JdtCompilationUnit.java
     
changes/jat/ihm/dev/core/src/com/google/gwt/dev/shell/rewrite/HostedModeClassRewriter.java
     
changes/jat/ihm/dev/core/src/com/google/gwt/dev/shell/rewrite/RewriteRefsToJsoClasses.java

Log:
Don't read stack frames from the input, since they aren't required and are  
incorrect
after rewriting, fix a passing the correct name to further rewrites, and  
improve
a debug message.


Modified:  
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/JdtCompilationUnit.java
==============================================================================
---  
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/JdtCompilationUnit.java   
 
(original)
+++  
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/JdtCompilationUnit.java   
 
Tue Apr 21 16:30:56 2009
@@ -111,8 +111,8 @@
    protected Set<InternalName> computeReferencedTypes() {
      final Set<InternalName> result = new HashSet<InternalName>();
      if (cud == null) {
-      System.err.println(getTypeName()
-          + ".computeReferencedTypes() - cud is null");
+      System.err.println(toString()
+          + " computeReferencedTypes() - cud is null");
      } else {
        cud.traverse(new TypeRefVisitor() {
          @Override

Modified:  
changes/jat/ihm/dev/core/src/com/google/gwt/dev/shell/rewrite/HostedModeClassRewriter.java
==============================================================================
---  
changes/jat/ihm/dev/core/src/com/google/gwt/dev/shell/rewrite/HostedModeClassRewriter.java
       
(original)
+++  
changes/jat/ihm/dev/core/src/com/google/gwt/dev/shell/rewrite/HostedModeClassRewriter.java
       
Tue Apr 21 16:30:56 2009
@@ -219,7 +219,7 @@
        v = new ForceClassVersion15(v);
      }

-    new ClassReader(classBytes).accept(v, 0);
+    new ClassReader(classBytes).accept(v, ClassReader.SKIP_FRAMES);
      byte[] result = writer.toByteArray();
  //    System.err.println("Rewritten output for " + className);
  //    new ClassReader(result).accept(new TraceClassVisitor(null,

Modified:  
changes/jat/ihm/dev/core/src/com/google/gwt/dev/shell/rewrite/RewriteRefsToJsoClasses.java
==============================================================================
---  
changes/jat/ihm/dev/core/src/com/google/gwt/dev/shell/rewrite/RewriteRefsToJsoClasses.java
       
(original)
+++  
changes/jat/ihm/dev/core/src/com/google/gwt/dev/shell/rewrite/RewriteRefsToJsoClasses.java
       
Tue Apr 21 16:30:56 2009
@@ -78,8 +78,8 @@
      }

      @Override
-    public void visitMethodInsn(int opcode, String ownerInternalName,  
String name,
-        String desc) {
+    public void visitMethodInsn(int opcode, String ownerInternalName,
+        String name, String desc) {
        InternalName owner = Name.internalName(ownerInternalName);
        if (jsoDescriptors.contains(owner)) {
          // Find the class that actually declared the method.
@@ -95,9 +95,10 @@
              name += "$";
            }
            // Change the owner to implementation class.
-          ownerInternalName = owner.toString() + "$";
+          owner = owner.append("$");
          }
        }
+      ownerInternalName = owner.toString();
        super.visitMethodInsn(opcode, ownerInternalName, name, desc);
      }


--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---