@@ -115,12 +115,11 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
115115 case class Item2 (arrivalPos : Int ,
116116 mirror : asm.tree.ClassNode ,
117117 plain : asm.tree.ClassNode ,
118- bean : asm.tree.ClassNode ,
119118 outFolder : scala.tools.nsc.io.AbstractFile ) {
120119 def isPoison = { arrivalPos == Int .MaxValue }
121120 }
122121
123- private val poison2 = Item2 (Int .MaxValue , null , null , null , null )
122+ private val poison2 = Item2 (Int .MaxValue , null , null , null )
124123 private val q2 = new _root_.java.util.LinkedList [Item2 ]
125124
126125 /* ---------------- q3 ---------------- */
@@ -140,7 +139,6 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
140139 case class Item3 (arrivalPos : Int ,
141140 mirror : SubItem3 ,
142141 plain : SubItem3 ,
143- bean : SubItem3 ,
144142 outFolder : scala.tools.nsc.io.AbstractFile ) {
145143
146144 def isPoison = { arrivalPos == Int .MaxValue }
@@ -152,7 +150,7 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
152150 else 1
153151 }
154152 }
155- private val poison3 = Item3 (Int .MaxValue , null , null , null , null )
153+ private val poison3 = Item3 (Int .MaxValue , null , null , null )
156154 private val q3 = new java.util.PriorityQueue [Item3 ](1000 , i3comparator)
157155
158156 /*
@@ -243,21 +241,12 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
243241 store.visitAttribute(dataAttr)
244242 }
245243
246- // -------------- bean info class, if needed --------------
247- val beanC =
248- if (claszSymbol hasAnnotation int.BeanInfoAttr ) {
249- beanInfoCodeGen.genBeanInfoClass(
250- claszSymbol, cunit,
251- int.symHelper(claszSymbol).fieldSymbols,
252- int.symHelper(claszSymbol).methodSymbols
253- )
254- } else null
255244
256245 // ----------- hand over to pipeline-2
257246
258247 val item2 =
259248 Item2 (arrivalPos,
260- mirrorC, plainC, beanC,
249+ mirrorC, plainC,
261250 outF)
262251
263252 q2 add item2 // at the very end of this method so that no Worker2 thread starts mutating before we're done.
@@ -307,19 +296,17 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
307296 cw.toByteArray
308297 }
309298
310- val Item2 (arrivalPos, mirror, plain, bean, outFolder) = item
299+ val Item2 (arrivalPos, mirror, plain, outFolder) = item
311300
312301 val mirrorC = if (mirror == null ) null else SubItem3 (mirror.name, getByteArray(mirror))
313302 val plainC = SubItem3 (plain.name, getByteArray(plain))
314- val beanC = if (bean == null ) null else SubItem3 (bean.name, getByteArray(bean))
315303
316304 if (AsmUtils .traceSerializedClassEnabled && plain.name.contains(AsmUtils .traceSerializedClassPattern)) {
317305 if (mirrorC != null ) AsmUtils .traceClass(mirrorC.jclassBytes)
318306 AsmUtils .traceClass(plainC.jclassBytes)
319- if (beanC != null ) AsmUtils .traceClass(beanC.jclassBytes)
320307 }
321308
322- q3 add Item3 (arrivalPos, mirrorC, plainC, beanC, outFolder)
309+ q3 add Item3 (arrivalPos, mirrorC, plainC, outFolder)
323310
324311 }
325312
@@ -453,7 +440,6 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
453440 val outFolder = item.outFolder
454441 sendToDisk(item.mirror, outFolder)
455442 sendToDisk(item.plain, outFolder)
456- sendToDisk(item.bean, outFolder)
457443 expected += 1
458444 }
459445 }
0 commit comments