Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue #544: integer constant must have integer type #857

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix issue #544: integer constant must have integer type #857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions tools/flang2/flang2exe/llassem_common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ emit_init(DTYPE tdtype, ISZ_T tconval, ISZ_T *addr, ISZ_T *repeat_cnt,
DINIT_REC *item;
area = LLVM_LONGTERM_AREA;
const ISZ_T orig_tconval = tconval;
char *oldcptr;

switch ((int)tdtype) {
case 0: /* alignment record */
Expand Down Expand Up @@ -304,7 +305,7 @@ emit_init(DTYPE tdtype, ISZ_T tconval, ISZ_T *addr, ISZ_T *repeat_cnt,
"first_data:%d i8cnt:%ld ptrcnt:%d\n",
first_data, *i8cnt, *ptrcnt);
}
put_addr((SPTR)tconval, 0, DT_NONE); // ???
put_addr((SPTR)tconval, 0, DT_NONE, NULL); // ???
(*ptrcnt)++;
*addr += size_of(DT_CPTR);
first_data = 0;
Expand Down Expand Up @@ -571,6 +572,7 @@ emit_init(DTYPE tdtype, ISZ_T tconval, ISZ_T *addr, ISZ_T *repeat_cnt,
fprintf(ASMFIL, ", ");
*ptrcnt = *ptrcnt + 1;
*i8cnt = 0;
oldcptr = *cptr;
*cptr = put_next_member(*cptr);

if (DBGBIT(5, 32)) {
Expand All @@ -579,10 +581,10 @@ emit_init(DTYPE tdtype, ISZ_T tconval, ISZ_T *addr, ISZ_T *repeat_cnt,
first_data, *i8cnt, *ptrcnt);
}
if (STYPEG(tconval) != ST_CONST) {
put_addr(SPTR_NULL, tconval, DT_NONE);
put_addr(SPTR_NULL, tconval, DT_NONE, NULL);
} else {
put_addr(SymConval1((SPTR)tconval), CONVAL2G(tconval),
DT_NONE); // ???
DT_NONE, oldcptr); // ???
}
break;

Expand Down Expand Up @@ -992,7 +994,7 @@ gen_ptr_offset_val(int offset, LL_Type *ret_type, char *ptr_nm)
\endverbatim
*/
void
put_addr(SPTR sptr, ISZ_T off, DTYPE dtype)
put_addr(SPTR sptr, ISZ_T off, DTYPE dtype, char *cptr)
{
const char *name, *elem_type;
bool is_static_or_common_block_var, in_fortran;
Expand Down Expand Up @@ -1052,12 +1054,17 @@ put_addr(SPTR sptr, ISZ_T off, DTYPE dtype)
LL_Value *ll_offset = gen_ptr_offset_val(off, ll_type, SNAME(sptr));
fprintf(ASMFIL, "%s", ll_offset->data);
}
} else
} else {
fprintf(ASMFIL, "null");
} else if (off == 0)
}
} else if (off == 0) {
fprintf(ASMFIL, "null");
else
fprintf(ASMFIL, "%ld", (long)off);
}
else {
fprintf(ASMFIL, "inttoptr (i64 %ld to ", (long)off);
put_next_member(cptr);
fprintf(ASMFIL, ")");
}
}

DTYPE
Expand Down
2 changes: 1 addition & 1 deletion tools/flang2/flang2exe/llassem_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ void init_Mcuda_compiled(void);
/**
\brief ...
*/
void put_addr(SPTR sptr, ISZ_T off, DTYPE dtype);
void put_addr(SPTR sptr, ISZ_T off, DTYPE dtype, char *cptr);

/**
\brief ...
Expand Down