[GR-28844] Fix constant lookup from C.

PullRequest: truffleruby/2342

Author: aardvark179

spec/ruby/optional/capi/fixtures/module.rb

@@ -13,6 +13,10 @@ class A
     autoload :D, File.expand_path('../const_get.rb', __FILE__)
 
     X = 1
+    Q = 1
+    R = 2
+    S = 3
+    T = 5
   end
 
   class B < A

spec/ruby/optional/capi/module_spec.rb

@@ -134,6 +134,10 @@
       @m.rb_const_get(CApiModuleSpecs::A, :X).should == 1
     end
 
+    it "returns a constant defined in the module for multiple constants" do
+      [:Q, :R, :S, :T].each { |x| @m.rb_const_get(CApiModuleSpecs::A, x).should == CApiModuleSpecs::A.const_get(x) }
+    end
+
     it "returns a constant defined at toplevel" do
       @m.rb_const_get(CApiModuleSpecs::A, :Integer).should == Integer
     end

src/main/java/org/truffleruby/language/constants/LookupConstantNode.java

@@ -81,7 +81,7 @@ protected RubyConstant lookupConstantUncached(RubyModule module, String name, bo
         ConstantLookupResult constant = doLookup(module, name);
         boolean isVisible = isVisible(module, constant);
 
-        if (!isValidConstantNameProfile.profile(checkName && isValidConstantName(name))) {
+        if (!isValidConstantNameProfile.profile(isValidName(checkName, name))) {
             throw new RaiseException(getContext(), coreExceptions().nameErrorWrongConstantName(name, this));
         } else if (isVisibleProfile.profile(!isVisible)) {
             throw new RaiseException(getContext(), coreExceptions().nameErrorPrivateConstant(module, name, this));