Moved Asm utils out of utils and into core, because utils isn't supposed to have an asm dependency and now due to lacking the jarjar treatment all sorts of VerifyError hell breaks loose if you put both lombok.jar and lombok-utils.jar of 0.10.6 in the classpath while compiling with javac.

1 files changed, 0 insertions, 41 deletions

diff --git a/src/utils/lombok/bytecode/FixedClassWriter.java b/src/utils/lombok/bytecode/FixedClassWriter.java
deleted file mode 100644
index 42d8c4c1..00000000
--- a/src/utils/lombok/bytecode/FixedClassWriter.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2010 The Project Lombok Authors.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.bytecode;
-
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassWriter;
-
-class FixedClassWriter extends ClassWriter {
-	FixedClassWriter(ClassReader classReader, int flags) {
-		super(classReader, flags);
-	}
-	
-	@Override protected String getCommonSuperClass(String type1, String type2) {
-		//By default, ASM will attempt to live-load the class types, which will fail if meddling with classes in an
-		//environment with custom classloaders, such as Equinox. It's just an optimization; returning Object is always legal.
-		try {
-			return super.getCommonSuperClass(type1, type2);
-		} catch (Exception e) {
-			return "java/lang/Object";
-		}
-	}
-}
\ No newline at end of file