diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-02-26 20:19:07 +0100 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-02-26 20:19:07 +0100 |
| commit | 8b95e11f6bf53f6f350ee59a66537b89a04783c2 (patch) | |
| tree | 657b48388e7171cf0d40fdd0b3b12bb8003c5dc5 | |
| parent | 0e08d4984a3cdf67e7532aafb205fd852f57a56e (diff) | |
| parent | 52d60e69d8e05f6957603ced38788c3f4320df86 (diff) | |
| download | scala-8b95e11f6bf53f6f350ee59a66537b89a04783c2.tar.gz scala-8b95e11f6bf53f6f350ee59a66537b89a04783c2.tar.bz2 scala-8b95e11f6bf53f6f350ee59a66537b89a04783c2.zip | |
Merge pull request #3586 from adriaanm/windows-opt-fail-revert
Revert "SI-8315 Better debugging facility for ICode"
| -rw-r--r-- | src/compiler/scala/tools/nsc/Global.scala | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index 6b14461cac..c5d0c8506a 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -1798,8 +1798,10 @@ class Global(var currentSettings: Settings, var reporter: Reporter) private def writeICode() { val printer = new icodes.TextPrinter(null, icodes.linearizer) icodes.classes.values.foreach((cls) => { - val suffix = s"${if (cls.symbol.hasModuleFlag) "$" else ""}_${phase}.icode" - val file = getFile(cls.symbol, suffix) + val moduleSfx = if (cls.symbol.hasModuleFlag) "$" else "" + val phaseSfx = if (settings.debug) phase else "" // only for debugging, appending the full phasename breaks windows build + val file = getFile(cls.symbol, s"$moduleSfx$phaseSfx.icode") + try { val stream = new FileOutputStream(file) printer.setWriter(new PrintWriter(stream, true)) |