Clover safeEval method is imcompatible with Groovy's @CompileStatic annotation

When trying to use Clover on a Groovy class that is marked @CompileStatic and it contains a null-safe operator (e.g. Bar bar = foo?.bar), then the groovyc compilation fails with the error:

No such property: bar for class: java.lang.Object

The error is that the generated

$CLV_safeEval${code} method returns an Object instead of the type of the property. This then causes Groovy compiler to fail later.

I've created a sample project that exhibits the problem at https://github.com/johnrengelman/clover-grooyv-compilestatic

Simply run 

./gradlew test