Merged revisions 28,38,48,56 via svnmerge from

/trunk

git-svn-id: branches/fixes_2_0@355 -

.gitattributes

@@ -4737,6 +4737,7 @@ tests/tbs/tb0486.pp svneol=native#text/plain
 tests/tbs/tb0487.pp svneol=native#text/plain
 tests/tbs/tb0488.pp svneol=native#text/plain
 tests/tbs/tb0489.pp svneol=native#text/plain
+tests/tbs/tb0490.pp svneol=native#text/plain
 tests/tbs/tb0492.pp svneol=native#text/plain
 tests/tbs/ub0060.pp svneol=native#text/plain
 tests/tbs/ub0069.pp svneol=native#text/plain

compiler/htypechk.pas

@@ -1097,6 +1097,9 @@ implementation
                       (valid_addr in opts) and
                       (hp.resulttype.def.deftype=stringdef) then
                      result:=true
+                 else
+                   if valid_const in opts then
+                     result:=true
                  else
                   CGMessagePos(hp.fileinfo,errmsg);
                  exit;

compiler/nmem.pas

@@ -662,7 +662,7 @@ implementation
             not(is_char(right.resulttype.def)) and
             not(is_boolean(right.resulttype.def)) then
            begin
-             inserttypeconv(right,s32inttype);
+             inserttypeconv(right,sinttype);
            end;
 
          case left.resulttype.def.deftype of

tests/tbs/tb0490.pp

@@ -0,0 +1,17 @@
+type
+  trecord = record
+    l : longint;
+  end;
+
+function test : trecord;
+  begin
+  end;
+
+procedure p(const c);
+  begin
+  end;
+
+begin
+  p(test);
+end.
+