- expression_t *left = expression->binary.left;
- expression_t *right = expression->binary.right;
-
- if (is_type_pointer(skip_typeref(left->base.type))) {
- return is_address_constant(left) && is_constant_expression(right);
- } else if (is_type_pointer(skip_typeref(right->base.type))) {
- return is_constant_expression(left) && is_address_constant(right);
+ expression_t *const left = expression->binary.left;
+ expression_t *const right = expression->binary.right;
+ type_t *const ltype = skip_typeref(left->base.type);
+ type_t *const rtype = skip_typeref(right->base.type);
+
+ if (is_type_pointer(ltype)) {
+ expression_classification_t const l = is_linker_constant(left);
+ expression_classification_t const r = is_constant_expression(right);
+ return l < r ? l : r;
+ } else if (is_type_pointer(rtype)) {
+ expression_classification_t const l = is_constant_expression(left);
+ expression_classification_t const r = is_linker_constant(right);
+ return l < r ? l : r;
+ } else if (!is_type_valid(ltype) || !is_type_valid(rtype)) {
+ return EXPR_CLASS_ERROR;
+ } else {
+ return EXPR_CLASS_VARIABLE;