Merged revisions 21747-21757 via svnmerge from

https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk

........
  r21747 | odersky | 2010-04-29 15:12:20 +0200 (Thu, 29 Apr 2010) | 1 line

  Tightened variances check. Review by prokopec.
........
  r21748 | prokopec | 2010-04-29 15:21:42 +0200 (Thu, 29 Apr 2010) | 1 line

  removed the dir info of the error messages. no review ........ r21749
| dragos | 2010-04-29 15:45:41 +0200 (Thu, 29 Apr 2010) | 1 line

  Allow inlining for straight-line methods. Closes #3357, #3099. no
review. ........ r21750 | dragos | 2010-04-29 15:45:44 +0200 (Thu, 29
Apr 2010) | 2 lines

  Fixed misaligning due to wide (double|long) parameters in the icode
reader. Improved constant folding through local variables. Closes #3191,
no review. ........ r21751 | dragos | 2010-04-29 15:45:47 +0200 (Thu, 29
Apr 2010) | 1 line

  Reverted change that made partest fail with 'bin/javac: no such file'
when JAVA_HOME was not set (instead of using the javac on the PATH).
Reviewed by extempore, so no review. ........ r21752 | extempore |
2010-04-29 17:16:33 +0200 (Thu, 29 Apr 2010) | 2 lines

  Removes pointless reference queue from the Symbol cache. Closes #3370,
no review. ........ r21753 | extempore | 2010-04-29 17:29:44 +0200 (Thu,
29 Apr 2010) | 3 lines

  Took advantage of the sophisticated abstractions available in ant to
cut and paste the entirety of r21723 a little further down the build
file. No review. ........ r21754 | dragos | 2010-04-29 18:35:09 +0200
(Thu, 29 Apr 2010) | 3 lines

  Regenerated FunctionN, AbstractFunctionN, etc. Changed
AbstractFunction to properly specialize on primitive types (scala.Int,
instead of scala.runtime.Int). Now closures should be indeed
specialized. No review. ........ r21755 | dubochet | 2010-04-29 19:01:22
+0200 (Thu, 29 Apr 2010) | 1 line

  Closes #3310 (very large Scala class is compiled to invalid classfile
because Scala signature can't fit into constant pool). Review by dragos.
........ r21756 | dubochet | 2010-04-29 19:32:03 +0200 (Thu, 29 Apr
2010) | 1 line

  [scaladoc] Closes #3302 (case class with private constructor). No
review. ........ r21757 | phaller | 2010-04-30 00:15:18 +0200 (Fri, 30
Apr 2010) | 1 line

  Deprecated two members of RemoteActor which clearly should not be
in the public API. Removed unnecessary casts. Some more complete doc
comments. No review. ........

1 files changed, 3 insertions, 0 deletions

diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JConstantPool.java b/src/fjbg/ch/epfl/lamp/fjbg/JConstantPool.java
index 4fa048177c..0e6b43f1e2 100644
--- a/src/fjbg/ch/epfl/lamp/fjbg/JConstantPool.java
+++ b/src/fjbg/ch/epfl/lamp/fjbg/JConstantPool.java
@@ -383,6 +383,9 @@ public class JConstantPool {
         public int getSize() { return 1; }
         public void writeContentsTo(DataOutputStream stream) throws IOException {
             if (bytes != null) {
+                if (bytes.length > 65535) {
+                    throw new IOException("String literal of length " + bytes.length + " does not fit in Classfile");
+                }
                 stream.writeShort(bytes.length);
                 stream.write(bytes);
             }