tadzik/gist:1125058

## gistfile1.txt
diff --git a/src/Perl6/Actions.pm b/src/Perl6/Actions.pm
index 59ad479..150aa71 100644
--- a/src/Perl6/Actions.pm
+++ b/src/Perl6/Actions.pm
@@ -1054,6 +1054,7 @@ class Perl6::Actions is HLL::Actions {
         # Compose.
         $*ST.pkg_compose($*PACKAGE);

+        # Document
         document($*PACKAGE, $*DOC);

         make PAST::Stmts.new(
@@ -1256,6 +1257,8 @@ class Perl6::Actions is HLL::Actions {
         }
         my $code := $*ST.create_code_object($block, 'Sub', $signature,
             $*MULTINESS eq 'proto');
+
+        # Document it
         document($code, $*DOC);

         # Install PAST block so that it gets capture_lex'd correctly and also
@@ -3833,12 +3836,11 @@ class Perl6::Actions is HLL::Actions {
     }

     sub document($what, $with) {
-        if $with {
+        unless %*COMPILING<%?OPTIONS><setting> eq 'NULL' {
             my $true := $*ST.add_constant('Int', 'int', 1)<compile_time_value>;
-            my $doc  :=
-                $*ST.add_constant('Str', 'str', $with)<compile_time_value>;
+            my $doc  := $*ST.add_constant('Str', 'str', $with)<compile_time_value>;
             $*ST.apply_trait('&trait_mod:<is>', $what, $doc, :docs($true));
-}
+        }
     }
 }

diff --git a/src/core/traits.pm b/src/core/traits.pm
index de13409..fbf8f14 100644
--- a/src/core/traits.pm
+++ b/src/core/traits.pm
@@ -55,8 +55,11 @@ multi trait_mod:<is>(Routine:D \$r, :$export!) {
 }

 multi trait_mod:<is>(Any:D $docee, Mu:D $doc, :$docs!) {
-    my $d = $doc; #XXX Bug
-    $docee does role { method WHY() { $d } }
+    $docee does role {
+        has $.WHY;
+        method set_docs($d) { $!WHY = $d }
+    }
+    $docee.set_docs($doc);
 }

 multi trait_mod:<is>(Any:U $docee, Mu:D $doc, :$docs!) {
	diff --git a/src/Perl6/Actions.pm b/src/Perl6/Actions.pm
	index 59ad479..150aa71 100644
	--- a/src/Perl6/Actions.pm
	+++ b/src/Perl6/Actions.pm
	@@ -1054,6 +1054,7 @@ class Perl6::Actions is HLL::Actions {
	# Compose.
	$ST.pkg_compose($PACKAGE);

	+ # Document
	document($PACKAGE, $DOC);

	make PAST::Stmts.new(
	@@ -1256,6 +1257,8 @@ class Perl6::Actions is HLL::Actions {
	}
	my $code := $*ST.create_code_object($block, 'Sub', $signature,
	$*MULTINESS eq 'proto');
	+
	+ # Document it
	document($code, $*DOC);

	# Install PAST block so that it gets capture_lex'd correctly and also
	@@ -3833,12 +3836,11 @@ class Perl6::Actions is HLL::Actions {
	}

	sub document($what, $with) {
	- if $with {
	+ unless %*COMPILING<%?OPTIONS><setting> eq 'NULL' {
	my $true := $*ST.add_constant('Int', 'int', 1)<compile_time_value>;
	- my $doc :=
	- $*ST.add_constant('Str', 'str', $with)<compile_time_value>;
	+ my $doc := $*ST.add_constant('Str', 'str', $with)<compile_time_value>;
	$*ST.apply_trait('&trait_mod:<is>', $what, $doc, :docs($true));
	-}
	+ }
	}
	}

	diff --git a/src/core/traits.pm b/src/core/traits.pm
	index de13409..fbf8f14 100644
	--- a/src/core/traits.pm
	+++ b/src/core/traits.pm
	@@ -55,8 +55,11 @@ multi trait_mod:<is>(Routine:D \$r, :$export!) {
	}

	multi trait_mod:<is>(Any:D $docee, Mu:D $doc, :$docs!) {
	- my $d = $doc; #XXX Bug
	- $docee does role { method WHY() { $d } }
	+ $docee does role {
	+ has $.WHY;
	+ method set_docs($d) { $!WHY = $d }
	+ }
	+ $docee.set_docs($doc);
	}

	multi trait_mod:<is>(Any:U $docee, Mu:D $doc, :$docs!) {