From bbd4a4603a5966912dfb9f38b0ee6ab85cf7b949 Mon Sep 17 00:00:00 2001
From: Nicolas Voirol <voirol.nicolas@gmail.com>
Date: Fri, 18 Sep 2015 12:01:49 +0200
Subject: [PATCH] Fixed lambda extractor for codegen
---
src/main/scala/leon/codegen/CompilationUnit.scala | 2 +-
src/main/scala/leon/evaluators/CodeGenEvaluator.scala | 1 -
src/test/scala/leon/regression/repair/RepairSuite.scala | 4 ++--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/scala/leon/codegen/CompilationUnit.scala b/src/main/scala/leon/codegen/CompilationUnit.scala
index 49fe6328f..c4551d5a4 100644
--- a/src/main/scala/leon/codegen/CompilationUnit.scala
+++ b/src/main/scala/leon/codegen/CompilationUnit.scala
@@ -283,7 +283,7 @@ class CompilationUnit(val ctx: LeonContext,
val l = classToLambda(cls.getName)
val closures = purescala.ExprOps.variablesOf(l).toSeq.sortBy(_.uniqueName)
val closureVals = closures.map { id =>
- val fieldVal = lambda.getClass.getField(id.name).get(lambda)
+ val fieldVal = lambda.getClass.getField(id.uniqueName).get(lambda)
jvmToValue(fieldVal, id.getType)
}
diff --git a/src/main/scala/leon/evaluators/CodeGenEvaluator.scala b/src/main/scala/leon/evaluators/CodeGenEvaluator.scala
index 769748dff..4cc67c3fa 100644
--- a/src/main/scala/leon/evaluators/CodeGenEvaluator.scala
+++ b/src/main/scala/leon/evaluators/CodeGenEvaluator.scala
@@ -67,7 +67,6 @@ class CodeGenEvaluator(ctx: LeonContext, val unit : CompilationUnit) extends Eva
} catch {
case t: Throwable =>
ctx.reporter.warning(expression.getPos, "Error while compiling expression: "+t.getMessage)
- t.printStackTrace()
None
} finally {
ctx.timers.evaluators.codegen.compilation.stop()
diff --git a/src/test/scala/leon/regression/repair/RepairSuite.scala b/src/test/scala/leon/regression/repair/RepairSuite.scala
index c3aafa50e..6e75e4729 100644
--- a/src/test/scala/leon/regression/repair/RepairSuite.scala
+++ b/src/test/scala/leon/regression/repair/RepairSuite.scala
@@ -26,8 +26,8 @@ class RepairSuite extends LeonRegressionSuite {
val path = file.getAbsoluteFile.toString
val name = file.getName
- //val reporter = new TestSilentReporter
- val reporter = new DefaultReporter(Set(utils.DebugSectionRepair))
+ val reporter = new TestSilentReporter
+ //val reporter = new DefaultReporter(Set(utils.DebugSectionRepair))
val ctx = LeonContext(
reporter = reporter,
--
GitLab