Merge branch '2.10.x'

Conflicts:
	src/compiler/scala/tools/nsc/ast/TreeGen.scala
	src/compiler/scala/tools/nsc/settings/AestheticSettings.scala

1 files changed, 7 insertions, 0 deletions

diff --git a/test/files/instrumented/inline-in-constructors/bar_2.scala b/test/files/instrumented/inline-in-constructors/bar_2.scala
new file mode 100644
index 0000000000..418dac5a67
--- /dev/null
+++ b/test/files/instrumented/inline-in-constructors/bar_2.scala
@@ -0,0 +1,7 @@
+package instrumented
+
+/** Class that uses assert compiled in previous compiler run so we check if
+    inlining in constructors works across different compilation runs */
+class Bar(x: Boolean) {
+  MyPredef.assert(x, "not true: " + x)
+}