Skip to content

Fix poorly defined behavior when choosing certain function overloads. #844

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

Merged
lgritz merged 8 commits into from
Feb 6, 2018
Merged

Fix poorly defined behavior when choosing certain function overloads. #844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d204ab5
Fix poorly defined behavior when choosing certain function overloads.
marsupial Dec 18, 2017
b6331b5
Disallow float to int argument conversion.
marsupial Jan 21, 2018
6939f66
Error on return type ambiguity.
marsupial Jan 21, 2018
c7d0dc3
Prefer conversion between spatial types over color, and between tripl…
marsupial Jan 21, 2018
9f40157
Add legacy overload checking via OSL_LEGACY_FUNCTION_RESOLUTION env v…
marsupial Jan 21, 2018
5383e64
Update CandidateFunctions documentation.
marsupial Jan 29, 2018
486aee8
Touch up typecheck of type_constructor to help with new overload rules
lgritz Jan 30, 2018
6aca444
Update function overload rules to only warn on ambiguity and select o…
marsupial Feb 1, 2018
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
5 changes: 3 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ TESTSUITE ( and-or-not-synonyms aastep arithmetic array array-derivs array-range
error-dupes exit exponential
fprintf
function-earlyreturn function-simple function-outputelem
function-overloads
geomath getattribute-camera getattribute-shader
getsymbol-nonheap gettextureinfo
group-outputs groupstring
Expand All @@ -266,8 +267,8 @@ TESTSUITE ( and-or-not-synonyms aastep arithmetic array array-derivs array-range
operator-overloading
oslc-comma oslc-D
oslc-err-arrayindex oslc-err-closuremul oslc-err-field
oslc-err-format oslc-err-funcredef oslc-err-intoverflow
oslc-err-noreturn oslc-err-notfunc
oslc-err-format oslc-err-funcoverload oslc-err-funcredef
oslc-err-intoverflow oslc-err-noreturn oslc-err-notfunc
oslc-err-outputparamvararray oslc-err-paramdefault
oslc-err-struct-array-init oslc-err-struct-ctr
oslc-err-struct-dup
Expand Down
11 changes: 0 additions & 11 deletions src/liboslcomp/ast.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,17 +881,6 @@ class ASTfunction_call : public ASTNode
}

private:
/// Typecheck all polymorphic versions, return UNKNOWN if no match was
/// found, or a real type if there was a match. Also, upon matching,
/// re-jigger m_sym to point to the specific polymorphic match.
/// Allow arguments to be coerced (e.g., substituting a vector where
/// a point was expected, or a float where a color was expected) only
/// if coerceargs is true. For return values, allow spatial triples to
/// mutually match if 'equivreturn' is true, and allow any coercive
/// return type if 'expected' is TypeSpec() (i.e., unknown).
TypeSpec typecheck_all_poly (TypeSpec expected, bool coerceargs,
bool equivreturn);

/// Handle all the special cases for built-ins. This includes
/// irregular patterns of which args are read vs written, special
/// checks for printf- and texture-like, etc.
Expand Down
Loading